This commit is contained in:
Horis
2023-04-30 15:10:25 +08:00
parent 6db517eaa1
commit aa2aa467c8
@@ -64,7 +64,7 @@ class RssArticlesFragment() : VMBaseFragment<RssArticlesViewModel>(R.layout.frag
recyclerView.setEdgeEffectColor(primaryColor) recyclerView.setEdgeEffectColor(primaryColor)
loadMoreView.setOnClickListener { loadMoreView.setOnClickListener {
if (!loadMoreView.isLoading) { if (!loadMoreView.isLoading) {
scrollToBottom() scrollToBottom(true)
} }
} }
recyclerView.layoutManager = if (activityViewModel.isGridLayout) { recyclerView.layoutManager = if (activityViewModel.isGridLayout) {
@@ -111,10 +111,10 @@ class RssArticlesFragment() : VMBaseFragment<RssArticlesViewModel>(R.layout.frag
} }
} }
private fun scrollToBottom() { private fun scrollToBottom(forceLoad: Boolean = false) {
if (viewModel.isLoading) return if (viewModel.isLoading) return
if (loadMoreView.hasMore && adapter.getActualItemCount() > 0) { if ((loadMoreView.hasMore && adapter.getActualItemCount() > 0) || forceLoad) {
loadMoreView.startLoad() loadMoreView.hasMore()
activityViewModel.rssSource?.let { activityViewModel.rssSource?.let {
viewModel.loadMore(it) viewModel.loadMore(it)
} }