diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt index 32e5393ff..98ac103ef 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt @@ -49,23 +49,6 @@ data class ListUrlBuilder( var isOnlySearchCovers: Boolean = false, ) : Parcelable { - fun reset() { - mode = MODE_NORMAL - mPrev = null - mNext = null - mJumpTo = null - this.category = EhUtils.NONE - mKeyword = null - advanceSearch = -1 - minRating = -1 - pageFrom = -1 - pageTo = -1 - imagePath = null - isUseSimilarityScan = false - isOnlySearchCovers = false - hash = null - } - fun setIndex(index: String?, isNext: Boolean = true) { mNext = index?.takeIf { isNext } mPrev = index?.takeUnless { isNext } @@ -81,8 +64,7 @@ data class ListUrlBuilder( mKeyword = keyword } - fun set(q: QuickSearch) { - reset() + constructor(q: QuickSearch) : this() { mode = q.mode this.category = q.category mKeyword = q.keyword diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryListFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryListFragment.kt index 6cb20c25d..f6c230f86 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryListFragment.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryListFragment.kt @@ -312,7 +312,7 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: NavController) { ListItem( modifier = Modifier.clickable { Settings.recentToplist = keyword - urlBuilder.keyword = keyword + urlBuilder = ListUrlBuilder(MODE_TOPLIST, mKeyword = keyword) data.refresh() showSearchLayout = false coroutineScope.launch { sheetState.close() } @@ -467,9 +467,9 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: NavController) { ListItem( modifier = Modifier.clickable { if (urlBuilder.mode == MODE_WHATS_HOT) { - navigator.navAnimated(R.id.galleryListScene, ListUrlBuilder().apply { set(item) }.toStartArgs()) + navigator.navAnimated(R.id.galleryListScene, ListUrlBuilder(item).toStartArgs()) } else { - urlBuilder.set(item) + urlBuilder = ListUrlBuilder(item) data.refresh() } showSearchLayout = false