yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Scroll to top after refreshing" (#139)

Browse Source 
* Revert "Fix progress not showing after clicking error tip"

This reverts commit bc914566dd.

* Revert "Try to fix recyclerview disappearing after refresh (#61)"

This reverts commit f9a3c3d266.

* Revert "Scroll to top after refreshing"

This reverts commit b0896ea465.
This commit is contained in:
FooIbar authored and GitHub committed 2023-10-29 14:44:42 +00:00
1 parent f7d45a52a7
commit 93df4e3dd9
2 files changed
+4 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/kotlin/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
+2 -11
View File
@@ -102,7 +102,6 @@ import rikka.core.res.resolveColor
// Note that we do not really follow mvvm structure, just use it as ... storage
class VMStorage : ViewModel() {
var urlBuilder = FavListUrlBuilder(favCat = Settings.recentFavCat)
var shouldScrollToTop = false
private val cloudDataFlow = Pager(PagingConfig(25)) {
object : PagingSource<String, BaseGalleryInfo>() {
override fun getRefreshKey(state: PagingState<String, BaseGalleryInfo>): String? = null
@@ -119,7 +118,6 @@ class VMStorage : ViewModel() {
} else {
urlBuilder.setIndex(key, false)
}
shouldScrollToTop = true
}
}
val r = runSuspendCatching {
@@ -347,10 +345,7 @@ class FavoritesScene : SearchBarScene() {
is LoadState.Loading -> {
showSearchBar()
if (!binding.refreshLayout.isRefreshing) {
// https://github.com/FooIbar/EhViewer/issues/45
// transition.showView(1)
transition.showView(0, false)
binding.refreshLayout.isRefreshing = true
transition.showView(1)
}
}
is LoadState.Error -> {
@@ -364,11 +359,7 @@ 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)
}
}
}
app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+2 -11
View File
@@ -127,7 +127,6 @@ import rikka.core.res.resolveColor
class VMStorage1 : ViewModel() {
var urlBuilder = ListUrlBuilder()
var shouldScrollToTop = false
val dataFlow = Pager(PagingConfig(25)) {
object : PagingSource<String, BaseGalleryInfo>() {
override fun getRefreshKey(state: PagingState<String, BaseGalleryInfo>): String? = null
@@ -158,7 +157,6 @@ class VMStorage1 : ViewModel() {
} else {
urlBuilder.setIndex(key, false)
}
shouldScrollToTop = true
}
}
val r = runSuspendCatching {
@@ -383,10 +381,7 @@ class GalleryListScene : SearchBarScene() {
is LoadState.Loading -> {
showSearchBar()
if (!binding.refreshLayout.isRefreshing) {
// https://github.com/FooIbar/EhViewer/issues/45
// transition.showView(1)
transition.showView(0, false)
binding.refreshLayout.isRefreshing = true
transition.showView(1)
}
}
@@ -412,11 +407,7 @@ 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)
}
}
}