diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/FavoritesFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/FavoritesFragment.kt index de2629bd3..83f1ebab9 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/FavoritesFragment.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/FavoritesFragment.kt @@ -320,6 +320,7 @@ fun FavouritesScreen(navigator: NavController) { }, refreshState = refreshState, onRefresh = { refresh() }, + onLoading = { searchBarOffsetY = 0 }, navigator = navigator, ) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryList.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryList.kt index f10cdb8e9..402d8f804 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryList.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryList.kt @@ -76,6 +76,7 @@ fun GalleryList( thumbItemContent: @Composable (LazyStaggeredGridItemScope.(BaseGalleryInfo) -> Unit) = {}, refreshState: PullToRefreshState? = null, onRefresh: suspend CoroutineScope.() -> Unit = {}, + onLoading: suspend CoroutineScope.() -> Unit = {}, navigator: NavController? = null, ) { val layoutDirection = LocalLayoutDirection.current @@ -149,6 +150,9 @@ fun GalleryList( var refreshing by remember { mutableStateOf(false) } when (val state = data.loadState.refresh) { is LoadState.Loading -> if (!refreshState.isRefreshing) { + LaunchedEffect(Unit) { + onLoading() + } LaunchedEffect(Unit) { if (listMode == 0) { detailListState.scrollToItem(0) 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 b41a6b0d0..6cb20c25d 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 @@ -840,6 +840,7 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: NavController) { urlBuilder.setIndex(null) data.refresh() }, + onLoading = { searchBarOffsetY = 0 }, navigator = navigator, ) }