From 09ab930c5671bff761c945e30d0da05c4bd97ea5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <99822064+revonateB0T@users.noreply.github.com> Date: Fri, 21 Mar 2025 13:04:19 +0800 Subject: [PATCH] Revert "Disable shared element transition for DownloadCard" This reverts commit e5361949df7fa08857ad63aa360ed81cb69499e8. --- .../main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt | 6 ++---- .../com/hippo/ehviewer/ui/tools/SharedElementTransition.kt | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt index 3e9a2a5e2..05b61b4d3 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt @@ -45,7 +45,7 @@ import com.hippo.ehviewer.download.DownloadManager import com.hippo.ehviewer.ui.tools.CrystalCard import com.hippo.ehviewer.ui.tools.GalleryListCardRating import com.hippo.ehviewer.ui.tools.TransitionsVisibilityScope -import com.hippo.ehviewer.ui.tools.noopThumbGenerator +import com.hippo.ehviewer.ui.tools.listThumbGenerator import com.hippo.ehviewer.util.FileUtils private val ids = Tuple9(1, 2, 3, 4, 5, 6, 7, 8, 9) @@ -109,9 +109,7 @@ fun DownloadCard( Row { val thumb = remember { movableContentOf { - // Disabled due to https://github.com/FooIbar/EhViewer/issues/2085 - // with(listThumbGenerator) { - with(noopThumbGenerator) { + with(listThumbGenerator) { EhAsyncCropThumb( key = it, modifier = Modifier.aspectRatio(DEFAULT_RATIO).fillMaxSize(), diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SharedElementTransition.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SharedElementTransition.kt index 536fe9061..8bae823cb 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SharedElementTransition.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/SharedElementTransition.kt @@ -68,7 +68,6 @@ val SETNode.syntheticKey: String val listThumbGenerator = SETNodeGenerator() val detailThumbGenerator = SETNodeGenerator() -val noopThumbGenerator = SETNodeGenerator() fun initSETConnection() { listThumbGenerator connectTo detailThumbGenerator