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) { +fun FileCardList(cardList: List, longClick: (FileDataLog) -> Unit = {}) { if (filePreview.contentEquals("开启") || (filePreview.contentEquals("仅Wifi") && NetworkChangeReceiver.isWifi) @@ -149,9 +149,7 @@ fun FileCardList(cardList: List) { 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) { 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)