br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fixed updating lists being to heavy for the UI thread

Browse Source 
Moved list diff recalculation to the computing thread instead
This commit is contained in:
Viktor De Pasquale
2019-04-22 09:30:38 +02:00
parent 3f748b4d2a
commit a181fa0652
3 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+19 -18
View File
@@ -20,6 +20,7 @@ import com.topjohnwu.magisk.ui.base.MagiskViewModel
import com.topjohnwu.magisk.utils.Event
import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.utils.toSingle
import com.topjohnwu.magisk.utils.update
import io.reactivex.Single
import me.tatarka.bindingcollectionadapter2.OnItemBind
@@ -29,7 +30,7 @@ class ModuleViewModel(
val query = KObservableField("")
private val allItems = DiffObservableList(ComparableRvItem.callback)
private val allItems = mutableListOf<ComparableRvItem<*>>()
val itemsInstalled = DiffObservableList(ComparableRvItem.callback)
val itemsRemote = DiffObservableList(ComparableRvItem.callback)
@@ -73,27 +74,27 @@ class ModuleViewModel(
.flattenAsFlowable { it }
.map { RepoRvItem(it) }
.toList()
.doOnSuccess { allItems.update(it) }
.flatMap { queryRaw() }
.applyViewModel(this)
.subscribeK {
allItems.update(it)
query()
}
.subscribeK { itemsRemote.update(it.first, it.second) }
.add()
}
private fun query(query: String = this.query.value) {
allItems.toSingle()
.map { it.filterIsInstance<RepoRvItem>() }
.flattenAsFlowable { it }
.filter {
it.item.name.contains(query, ignoreCase = true) ||
it.item.author.contains(query, ignoreCase = true) ||
it.item.description.contains(query, ignoreCase = true)
}
.toList()
.subscribeK { itemsRemote.update(it) }
.add()
}
private fun query() = queryRaw()
.subscribeK { itemsRemote.update(it.first, it.second) }
.add()
private fun queryRaw(query: String = this.query.value) = allItems.toSingle()
.map { it.filterIsInstance<RepoRvItem>() }
.flattenAsFlowable { it }
.filter {
it.item.name.contains(query, ignoreCase = true) ||
it.item.author.contains(query, ignoreCase = true) ||
it.item.description.contains(query, ignoreCase = true)
}
.toList()
.map { it to itemsRemote.calculateDiff(it) }
private fun <Result> Cursor.toList(transformer: (Cursor) -> Result): List<Result> {
val out = mutableListOf<Result>()