Cleanup more databinding implementation

app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListRvItem.kt

@@ -5,8 +5,8 @@ import android.view.ViewGroup
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.databinding.ComparableRv
-import com.topjohnwu.magisk.databinding.ObservableDiffRvItem
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ObservableRvItem
 import com.topjohnwu.magisk.databinding.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.ktx.startAnimations
@@ -15,7 +15,7 @@ import kotlin.math.roundToInt
 
 class DenyListRvItem(
     val info: AppProcessInfo
-) : ObservableDiffRvItem<DenyListRvItem>(), ComparableRv<DenyListRvItem> {
+) : ObservableRvItem(), DiffItem<DenyListRvItem>, Comparable<DenyListRvItem> {
 
     override val layoutRes get() = R.layout.item_hide_md2
 
@@ -100,7 +100,7 @@ class DenyListRvItem(
 
 class ProcessRvItem(
     val process: ProcessInfo
-) : ObservableDiffRvItem<ProcessRvItem>() {
+) : ObservableRvItem(), DiffItem<ProcessRvItem> {
 
     override val layoutRes get() = R.layout.item_hide_process_md2
 
@@ -122,10 +122,9 @@ class ProcessRvItem(
     val defaultSelection get() =
         process.isIsolated || process.isAppZygote || process.name == process.packageName
 
-    override fun contentSameAs(other: ProcessRvItem) =
-        process.isEnabled == other.process.isEnabled
-
     override fun itemSameAs(other: ProcessRvItem) =
         process.name == other.process.name && process.packageName == other.process.packageName
 
+    override fun contentSameAs(other: ProcessRvItem) =
+        process.isEnabled == other.process.isEnabled
 }

app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListViewModel.kt

@@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.arch.AsyncLoadViewModel
 import com.topjohnwu.magisk.core.di.AppContext
-import com.topjohnwu.magisk.databinding.DiffRvItemFilterList
+import com.topjohnwu.magisk.databinding.FilterableDiffObservableList
 import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.ktx.concurrentMap
@@ -38,7 +38,7 @@ class DenyListViewModel : AsyncLoadViewModel() {
             query()
         }
 
-    val items = DiffRvItemFilterList<DenyListRvItem>(viewModelScope)
+    val items = FilterableDiffObservableList<DenyListRvItem>(viewModelScope)
     val extraBindings = bindExtra {
         it.put(BR.viewModel, this)
     }
@@ -50,7 +50,7 @@ class DenyListViewModel : AsyncLoadViewModel() {
     @SuppressLint("InlinedApi")
     override suspend fun doLoadWork() {
         loading = true
-        val (apps, diff) = withContext(Dispatchers.Default) {
+        withContext(Dispatchers.Default) {
             val pm = AppContext.packageManager
             val denyList = Shell.cmd("magisk --denylist ls").exec().out
                 .map { CmdlineListItem(it) }
@@ -63,9 +63,8 @@ class DenyListViewModel : AsyncLoadViewModel() {
                     .toCollection(ArrayList(size))
             }
             apps.sort()
-            apps to items.calculateDiff(apps)
+            items.update(apps)
         }
-        items.update(apps, diff)
         query()
     }
 

app/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt

@@ -6,14 +6,15 @@ import androidx.core.view.updateLayoutParams
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.databinding.DiffRvItem
-import com.topjohnwu.magisk.databinding.RvContainer
-import com.topjohnwu.magisk.databinding.ViewAwareRvItem
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.databinding.ViewAwareItem
 import kotlin.math.max
 
 class ConsoleItem(
     override val item: String
-) : DiffRvItem<ConsoleItem>(), ViewAwareRvItem, RvContainer<String> {
+) : RvItem(), ViewAwareItem, DiffItem<ConsoleItem>, ItemWrapper<String> {
     override val layoutRes = R.layout.item_console_md2
 
     private var parentWidth = -1

app/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt

@@ -4,18 +4,17 @@ import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.textview.MaterialTextView
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.databinding.ObservableDiffRvItem
-import com.topjohnwu.magisk.databinding.RvContainer
-import com.topjohnwu.magisk.databinding.ViewAwareRvItem
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.ViewAwareItem
 
 class LogRvItem(
     override val item: String
-) : ObservableDiffRvItem<LogRvItem>(), RvContainer<String>, ViewAwareRvItem {
+) : ObservableRvItem(), DiffItem<LogRvItem>, ItemWrapper<String>, ViewAwareItem {
 
     override val layoutRes = R.layout.item_log_textview
 
-    override fun itemSameAs(other: LogRvItem) = item == other.item
-
     override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) {
         val view = binding.root as MaterialTextView
         view.measure(0, 0)

app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt

@@ -11,7 +11,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.repository.LogRepository
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
-import com.topjohnwu.magisk.databinding.DiffRvItemList
+import com.topjohnwu.magisk.databinding.DiffObservableList
 import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.SnackbarEvent
@@ -37,28 +37,26 @@ class LogViewModel(
 
     // --- su log
 
-    val items = DiffRvItemList<SuLogRvItem>()
+    val items = DiffObservableList<SuLogRvItem>()
     val extraBindings = bindExtra {
         it.put(BR.viewModel, this)
     }
 
     // --- magisk log
-    val logs = DiffRvItemList<LogRvItem>()
+    val logs = DiffObservableList<LogRvItem>()
     var magiskLogRaw = " "
 
     override suspend fun doLoadWork() {
         loading = true
-         val (logs, logDiff) = withContext(Dispatchers.Default) {
-            magiskLogRaw = repo.fetchMagiskLogs()
-            val logs = magiskLogRaw.split('\n').map { LogRvItem(it) }
-            logs to this@LogViewModel.logs.calculateDiff(logs)
-        }
-        this.logs.update(logs, logDiff)
 
         val (suLogs, suDiff) = withContext(Dispatchers.Default) {
+            magiskLogRaw = repo.fetchMagiskLogs()
+            val newLogs = magiskLogRaw.split('\n').map { LogRvItem(it) }
+            logs.update(newLogs)
             val suLogs = repo.fetchSuLogs().map { SuLogRvItem(it) }
             suLogs to items.calculateDiff(suLogs)
         }
+
         items.firstOrNull()?.isTop = false
         items.lastOrNull()?.isBottom = false
         items.update(suLogs, suDiff)

app/src/main/java/com/topjohnwu/magisk/ui/log/SuLogRvItem.kt

@@ -4,19 +4,17 @@ import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.model.su.SuLog
-import com.topjohnwu.magisk.databinding.ObservableDiffRvItem
-import com.topjohnwu.magisk.databinding.RvContainer
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ObservableRvItem
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.ktx.timeDateFormat
 import com.topjohnwu.magisk.ktx.toTime
 
-class SuLogRvItem(
-    override val item: SuLog
-) : ObservableDiffRvItem<SuLogRvItem>(), RvContainer<SuLog> {
+class SuLogRvItem(val log: SuLog) : ObservableRvItem(), DiffItem<SuLogRvItem> {
 
     override val layoutRes = R.layout.item_log_access_md2
 
-    val date = item.time.toTime(timeDateFormat)
+    val date = log.time.toTime(timeDateFormat)
 
     @get:Bindable
     var isTop = false
@@ -26,5 +24,5 @@ class SuLogRvItem(
     var isBottom = false
         set(value) = set(value, field, { field = it }, BR.bottom)
 
-    override fun itemSameAs(other: SuLogRvItem) = item.appName == other.item.appName
+    override fun itemSameAs(other: SuLogRvItem) = log.appName == other.log.appName
 }

app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleRvItem.kt

@@ -5,20 +5,21 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.model.module.LocalModule
-import com.topjohnwu.magisk.databinding.DiffRvItem
-import com.topjohnwu.magisk.databinding.ObservableDiffRvItem
-import com.topjohnwu.magisk.databinding.RvContainer
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.RvItem
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.utils.TextHolder
 import com.topjohnwu.magisk.utils.asText
 
-object InstallModule : DiffRvItem<InstallModule>() {
+object InstallModule : RvItem(), DiffItem<InstallModule> {
     override val layoutRes = R.layout.item_module_download
 }
 
 class LocalModuleRvItem(
     override val item: LocalModule
-) : ObservableDiffRvItem<LocalModuleRvItem>(), RvContainer<LocalModule> {
+) : ObservableRvItem(), DiffItem<LocalModuleRvItem>, ItemWrapper<LocalModule> {
 
     override val layoutRes = R.layout.item_module_md2
 

app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt

@@ -10,7 +10,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.base.ContentResultCallback
 import com.topjohnwu.magisk.core.model.module.LocalModule
 import com.topjohnwu.magisk.core.model.module.OnlineModule
-import com.topjohnwu.magisk.databinding.DiffRvItemList
+import com.topjohnwu.magisk.databinding.DiffObservableList
 import com.topjohnwu.magisk.databinding.MergeObservableList
 import com.topjohnwu.magisk.databinding.RvItem
 import com.topjohnwu.magisk.databinding.bindExtra
@@ -26,7 +26,7 @@ class ModuleViewModel : AsyncLoadViewModel() {
 
     val bottomBarBarrierIds = intArrayOf(R.id.module_update, R.id.module_remove)
 
-    private val itemsInstalled = DiffRvItemList<LocalModuleRvItem>()
+    private val itemsInstalled = DiffObservableList<LocalModuleRvItem>()
 
     val items = MergeObservableList<RvItem>()
     val extraBindings = bindExtra {
@@ -57,11 +57,10 @@ class ModuleViewModel : AsyncLoadViewModel() {
     override fun onNetworkChanged(network: Boolean) = startLoading()
 
     private suspend fun loadInstalled() {
-        val installed = LocalModule.installed().map { LocalModuleRvItem(it) }
-        val diff = withContext(Dispatchers.Default) {
-            itemsInstalled.calculateDiff(installed)
+        withContext(Dispatchers.Default) {
+            val installed = LocalModule.installed().map { LocalModuleRvItem(it) }
+            itemsInstalled.update(installed)
         }
-        itemsInstalled.update(installed, diff)
     }
 
     private suspend fun loadUpdateInfo() {

app/src/main/java/com/topjohnwu/magisk/ui/superuser/PolicyRvItem.kt

@@ -5,8 +5,9 @@ import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.model.su.SuPolicy
-import com.topjohnwu.magisk.databinding.ObservableDiffRvItem
-import com.topjohnwu.magisk.databinding.RvContainer
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableRvItem
 import com.topjohnwu.magisk.databinding.set
 
 class PolicyRvItem(
@@ -16,7 +17,7 @@ class PolicyRvItem(
     private val isSharedUid: Boolean,
     val icon: Drawable,
     val appName: String
-) : ObservableDiffRvItem<PolicyRvItem>(), RvContainer<SuPolicy> {
+) : ObservableRvItem(), DiffItem<PolicyRvItem>, ItemWrapper<SuPolicy> {
 
     override val layoutRes = R.layout.item_policy_md2
 

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt

@@ -34,9 +34,9 @@ class SuperuserViewModel(
     private val itemNoData = TextItem(R.string.superuser_policy_none)
 
     private val itemsHelpers = ObservableArrayList<TextItem>()
-    private val itemsPolicies = DiffRvItemList<PolicyRvItem>()
+    private val itemsPolicies = DiffObservableList<PolicyRvItem>()
 
-    val items = MergeObservableList<AnyDiffRvItem>()
+    val items = MergeObservableList<RvItem>()
         .insertList(itemsHelpers)
         .insertList(itemsPolicies)
     val extraBindings = bindExtra {
@@ -54,7 +54,7 @@ class SuperuserViewModel(
             return
         }
         loading = true
-        val (policies, diff) = withContext(Dispatchers.IO) {
+        withContext(Dispatchers.IO) {
             db.deleteOutdated()
             db.delete(AppContext.applicationInfo.uid)
             val policies = ArrayList<PolicyRvItem>()
@@ -91,9 +91,8 @@ class SuperuserViewModel(
                 { it.appName.lowercase(currentLocale) },
                 { it.packageName }
             ))
-            policies to itemsPolicies.calculateDiff(policies)
+            itemsPolicies.update(policies)
         }
-        itemsPolicies.update(policies, diff)
         if (itemsPolicies.isNotEmpty())
             itemsHelpers.clear()
         else if (itemsHelpers.isEmpty())