diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt index 2c7ae4df8..2d946593f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt @@ -29,7 +29,7 @@ fun rememberMemorized( @Suppress("UNCHECKED_CAST") val restored = registry?.consumeRestored(finalKey)?.let { remembered.remove(it as String) - } as? T + } as T? restored ?: init() } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt index 93fb75cce..5e18825e3 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt @@ -73,7 +73,7 @@ class GalleryPreviewScreen : Fragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return ComposeView(inflater.context).apply { setMD3Content { - val galleryDetail = rememberSaveable { requireArguments().getParcelableCompat(KEY_GALLERY_DETAIL)!! } + val galleryDetail = remember { requireArguments().getParcelableCompat(KEY_GALLERY_DETAIL)!! } val context = LocalContext.current fun onPreviewCLick(index: Int) = context.navToReader(galleryDetail, index) val toNextPage = rememberSaveable { requireArguments().getBoolean(KEY_NEXT_PAGE) } @@ -106,7 +106,11 @@ class GalleryPreviewScreen : Fragment() { Slider( value = jumpTo, onValueChange = { jumpTo = it }, - modifier = Modifier.height(48.dp).width(0.dp).weight(1F).align(Alignment.CenterVertically), + modifier = Modifier + .height(48.dp) + .width(0.dp) + .weight(1F) + .align(Alignment.CenterVertically), valueRange = 1f..galleryDetail.previewPages.toFloat(), steps = galleryDetail.previewPages - 2, onValueChangeFinished = {