From 5c8a4fc18908e06996d7bfe4174be03b12cb8037 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: Fri, 27 Sep 2024 19:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/donut/mixfile/ui/routes/favorites/Favorites.kt |  5 ++++-
 .../main/java/com/donut/mixfile/ui/routes/home/Home.kt |  5 ++++-
 .../main/java/com/donut/mixfile/util/file/FileCard.kt  | 10 ++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt b/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt
index 8728163..6e9f478 100644
--- a/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt
+++ b/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt
@@ -33,6 +33,7 @@ import com.donut.mixfile.ui.routes.UploadDialogCard
 import com.donut.mixfile.ui.theme.colorScheme
 import com.donut.mixfile.util.cachedMutableOf
 import com.donut.mixfile.util.file.FileCardList
+import com.donut.mixfile.util.file.deleteFavoriteLog
 import com.donut.mixfile.util.file.exportFileList
 import com.donut.mixfile.util.file.favorites
 import com.donut.mixfile.util.file.selectAndUploadFile
@@ -203,6 +204,8 @@ val Favorites = MixNavPage(
             fontWeight = FontWeight.Bold,
             color = colorScheme.primary,
         )
-        FileCardList(cardList = result)
+        FileCardList(cardList = result){
+            deleteFavoriteLog(it)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/donut/mixfile/ui/routes/home/Home.kt b/app/src/main/java/com/donut/mixfile/ui/routes/home/Home.kt
index 16f0ba2..f218d31 100644
--- a/app/src/main/java/com/donut/mixfile/ui/routes/home/Home.kt
+++ b/app/src/main/java/com/donut/mixfile/ui/routes/home/Home.kt
@@ -34,6 +34,7 @@ import com.donut.mixfile.ui.routes.UploadDialogCard
 import com.donut.mixfile.ui.theme.colorScheme
 import com.donut.mixfile.util.copyToClipboard
 import com.donut.mixfile.util.file.FileCardList
+import com.donut.mixfile.util.file.deleteUploadLog
 import com.donut.mixfile.util.file.resolveMixShareInfo
 import com.donut.mixfile.util.file.selectAndUploadFile
 import com.donut.mixfile.util.file.showFileInfoDialog
@@ -144,7 +145,9 @@ val Home = MixNavPage(
                 fontWeight = FontWeight.Bold,
                 color = colorScheme.primary
             )
-            FileCardList(cardList = uploadLogs.reversed())
+            FileCardList(cardList = uploadLogs.reversed()){
+                deleteUploadLog(it)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/donut/mixfile/util/file/FileCard.kt b/app/src/main/java/com/donut/mixfile/util/file/FileCard.kt
index f2ef0ea..d62c83f 100644
--- a/app/src/main/java/com/donut/mixfile/util/file/FileCard.kt
+++ b/app/src/main/java/com/donut/mixfile/util/file/FileCard.kt
@@ -119,7 +119,7 @@ fun PreviewCard(
 }
 
 @Composable
-fun FileCardList(cardList: List<FileDataLog>) {
+fun FileCardList(cardList: List<FileDataLog>, longClick: (FileDataLog) -> Unit = {}) {
 
     if (filePreview.contentEquals("开启") ||
         (filePreview.contentEquals("仅Wifi") && NetworkChangeReceiver.isWifi)
@@ -149,9 +149,7 @@ fun FileCardList(cardList: List<FileDataLog>) {
             verticalArrangement = Arrangement.spacedBy(0.dp)
         ) {
             items(cardList.size) { index ->
-                FileCard(cardList[index]) {
-                    deleteFavoriteLog(cardList[index])
-                }
+                FileCard(cardList[index], longClick = longClick)
             }
         }
     }
@@ -162,7 +160,7 @@ fun FileCardList(cardList: List<FileDataLog>) {
 fun FileCard(
     fileDataLog: FileDataLog,
     showDate: Boolean = true,
-    longClick: () -> Unit = {},
+    longClick: (FileDataLog) -> Unit = {},
 ) {
     LaunchedEffect(updateMark) {
 
@@ -176,7 +174,7 @@ fun FileCard(
             .fillMaxWidth()
             .combinedClickable(
                 onLongClick = {
-                    longClick()
+                    longClick(fileDataLog)
                 }
             ) {
                 tryResolveFile(fileDataLog.shareInfoData)