MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added resetting state of the recyclerview scroll listener

Browse Source 
In some edge-cases the listener can still think that the content is loading.
This commit is contained in:
Viktor De Pasquale 2020-01-06 18:20:01 +01:00
parent ed837ba26f
commit 7342509b2e
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/topjohnwu/magisk/base/viewmodel/TeanityViewModel.kt
View File

@ -20,11 +20,11 @@ abstract class TeanityViewModel : ViewModel() {
}
fun <Event : ViewEvent> Event.publish() {
_viewEvents.value = this
_viewEvents.postValue(this)
}
fun Int.publish() {
_viewEvents.value = SimpleViewEvent(this)
_viewEvents.postValue(SimpleViewEvent(this))
}
fun Disposable.add() {

8
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt
View File

@ -13,6 +13,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
import com.topjohnwu.magisk.model.events.ViewEvent
import com.topjohnwu.magisk.redesign.MainActivity
import com.topjohnwu.magisk.redesign.ReselectionTarget
import com.topjohnwu.magisk.redesign.compat.CompatFragment
@ -93,6 +94,13 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
// ---
override fun onEventDispatched(event: ViewEvent) = when (event) {
is EndlessRecyclerScrollListener.ResetState -> listeners.forEach { it.resetState() }
else -> super.onEventDispatched(event)
}
// ---
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.menu_module_md2, menu)
}

4
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
View File

@ -20,6 +20,7 @@ import com.topjohnwu.magisk.model.events.OpenChangelogEvent
import com.topjohnwu.magisk.model.events.dialog.ModuleInstallDialog
import com.topjohnwu.magisk.redesign.compat.*
import com.topjohnwu.magisk.tasks.RepoUpdater
import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.magisk.utils.currentLocale
import io.reactivex.Completable
@ -175,6 +176,9 @@ class ModuleViewModel(
if (remoteJob?.isDisposed?.not() == true) {
return
}
if (itemsRemote.isEmpty()) {
EndlessRecyclerScrollListener.ResetState().publish()
}
remoteJob = Single.fromCallable { itemsRemote.size }
.flatMap { loadRemoteInternal(offset = it) }
.subscribeK(onError = Timber::e) {

3
app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
View File

@ -4,6 +4,7 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.topjohnwu.magisk.model.events.ViewEvent
class EndlessRecyclerScrollListener(
private val layoutManager: RecyclerView.LayoutManager,
@ -110,4 +111,6 @@ class EndlessRecyclerScrollListener(
previousTotalItemCount = 0
loading = true
}
class ResetState : ViewEvent()
}