diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt index 80291e3d2..134d164f0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt @@ -346,7 +346,9 @@ class FavoritesScene : SearchBarScene() { is LoadState.Loading -> { showSearchBar() if (!binding.refreshLayout.isRefreshing) { - transition.showView(1) + // https://github.com/FooIbar/EhViewer/issues/45 + // transition.showView(1) + binding.refreshLayout.isRefreshing = true } } is LoadState.Error -> { @@ -361,11 +363,11 @@ class FavoritesScene : SearchBarScene() { binding.tip.text = empty transition.showView(2) } else { + transition.showView(0, false) if (vm.shouldScrollToTop) { vm.shouldScrollToTop = false binding.recyclerView.scrollToPosition(0) } - transition.showView(0) } } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index 4f4f06c58..8d22840dc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -379,7 +379,9 @@ class GalleryListScene : SearchBarScene() { is LoadState.Loading -> { showSearchBar() if (!binding.refreshLayout.isRefreshing) { - transition.showView(1) + // https://github.com/FooIbar/EhViewer/issues/45 + // transition.showView(1) + binding.refreshLayout.isRefreshing = true } } is LoadState.Error -> { @@ -404,11 +406,11 @@ class GalleryListScene : SearchBarScene() { binding.tip.text = empty transition.showView(2) } else { + transition.showView(0, false) if (vm.shouldScrollToTop) { vm.shouldScrollToTop = false binding.recyclerView.scrollToPosition(0) } - transition.showView(0) } } }