Remove usage of BindingCollectionAdapter (part 1)

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

@@ -6,8 +6,8 @@ import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.databinding.filterableListOf
-import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.ktx.concurrentMap
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
@@ -39,11 +39,8 @@ class DenyListViewModel : BaseViewModel() {
         }
 
     val items = filterableListOf<DenyListRvItem>()
-    val itemBinding = itemBindingOf<DenyListRvItem> {
-        it.bindExtra(BR.viewModel, this)
-    }
-    val itemInternalBinding = itemBindingOf<ProcessRvItem> {
-        it.bindExtra(BR.viewModel, this)
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
     }
 
     @SuppressLint("InlinedApi")

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

@@ -7,19 +7,18 @@ 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.LenientRvItem
 import com.topjohnwu.magisk.databinding.RvContainer
+import com.topjohnwu.magisk.databinding.ViewAwareRvItem
 import kotlin.math.max
 
 class ConsoleItem(
     override val item: String
-) : DiffRvItem<ConsoleItem>(), LenientRvItem,
-    RvContainer<String> {
+) : DiffRvItem<ConsoleItem>(), ViewAwareRvItem, RvContainer<String> {
     override val layoutRes = R.layout.item_console_md2
 
     private var parentWidth = -1
 
-    override fun onBindingBound(binding: ViewDataBinding, recyclerView: RecyclerView) {
+    override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) {
         if (parentWidth < 0)
             parentWidth = (recyclerView.parent as View).width
 

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

@@ -14,9 +14,7 @@ import com.topjohnwu.magisk.core.tasks.FlashZip
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
-import com.topjohnwu.magisk.databinding.RvBindingAdapter
 import com.topjohnwu.magisk.databinding.diffListOf
-import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.ktx.reboot
@@ -36,9 +34,7 @@ class FlashViewModel : BaseViewModel() {
     private val _subtitle = MutableLiveData(R.string.flashing)
     val subtitle get() = _subtitle as LiveData<Int>
 
-    val adapter = RvBindingAdapter<ConsoleItem>()
     val items = diffListOf<ConsoleItem>()
-    val itemBinding = itemBindingOf<ConsoleItem>()
     lateinit var args: FlashFragmentArgs
 
     private val logItems = mutableListOf<String>().synchronized()

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt

@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.core.download.Subject.App
 import com.topjohnwu.magisk.core.repository.NetworkService
-import com.topjohnwu.magisk.databinding.itemBindingOf
+import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.events.dialog.EnvFixDialog
@@ -75,8 +75,8 @@ class HomeViewModel(
     var stateManagerProgress = 0
         set(value) = set(value, field, { field = it }, BR.stateManagerProgress)
 
-    val itemBinding = itemBindingOf<IconLink> {
-        it.bindExtra(BR.viewModel, this)
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
     }
 
     companion object {

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

@@ -10,8 +10,8 @@ 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.bindExtra
 import com.topjohnwu.magisk.databinding.diffListOf
-import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.ktx.timeFormatStandard
@@ -34,8 +34,8 @@ class LogViewModel(
     // --- su log
 
     val items = diffListOf<LogRvItem>()
-    val itemBinding = itemBindingOf<LogRvItem> {
-        it.bindExtra(BR.viewModel, this)
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
     }
 
     // --- magisk log

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

@@ -8,8 +8,6 @@ import com.topjohnwu.magisk.arch.BaseFragment
 import com.topjohnwu.magisk.arch.viewModel
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
-import com.topjohnwu.magisk.databinding.RvItem
-import com.topjohnwu.magisk.databinding.adapterOf
 import rikka.recyclerview.addEdgeSpacing
 import rikka.recyclerview.addInvalidateItemDecorationsObserver
 import rikka.recyclerview.addItemSpacing
@@ -34,7 +32,6 @@ class ModuleFragment : BaseFragment<FragmentModuleMd2Binding>() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.moduleList.apply {
-            adapter = adapterOf<RvItem>()
             addEdgeSpacing(top = R.dimen.l_50, bottom = R.dimen.l1)
             addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
             fixEdgeEffect()

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

@@ -11,8 +11,8 @@ 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.RvItem
+import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.databinding.diffListOf
-import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.events.GetContentEvent
 import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.events.dialog.ModuleInstallDialog
@@ -30,8 +30,8 @@ class ModuleViewModel : BaseViewModel() {
     private val itemsInstalled = diffListOf<LocalModuleRvItem>()
 
     val items = MergeObservableList<RvItem>()
-    val itemBinding = itemBindingOf<RvItem> {
-        it.bindExtra(BR.viewModel, this)
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
     }
 
     val data get() = uri

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt

@@ -14,8 +14,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.di.AppContext
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.tasks.HideAPK
-import com.topjohnwu.magisk.databinding.adapterOf
-import com.topjohnwu.magisk.databinding.itemBindingOf
+import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.events.AddHomeIconEvent
 import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.events.dialog.BiometricEvent
@@ -26,9 +25,10 @@ import kotlinx.coroutines.launch
 
 class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Handler {
 
-    val adapter = adapterOf<BaseSettingsItem>()
-    val itemBinding = itemBindingOf<BaseSettingsItem> { it.bindExtra(BR.handler, this) }
     val items = createItems()
+    val extraBindings = bindExtra {
+        it.put(BR.handler, this)
+    }
 
     init {
         viewModelScope.launch {

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

@@ -5,9 +5,7 @@ import android.view.View
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseFragment
 import com.topjohnwu.magisk.arch.viewModel
-import com.topjohnwu.magisk.databinding.AnyDiffRvItem
 import com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
-import com.topjohnwu.magisk.databinding.adapterOf
 import rikka.recyclerview.addEdgeSpacing
 import rikka.recyclerview.addItemSpacing
 import rikka.recyclerview.fixEdgeEffect
@@ -26,7 +24,6 @@ class SuperuserFragment : BaseFragment<FragmentSuperuserMd2Binding>() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.superuserList.apply {
-            adapter = adapterOf<AnyDiffRvItem>()
             addEdgeSpacing(top = R.dimen.l_50, bottom = R.dimen.l1)
             addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
             fixEdgeEffect()

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

@@ -15,8 +15,8 @@ import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.databinding.AnyDiffRvItem
+import com.topjohnwu.magisk.databinding.bindExtra
 import com.topjohnwu.magisk.databinding.diffListOf
-import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.events.dialog.BiometricEvent
 import com.topjohnwu.magisk.events.dialog.SuperuserRevokeDialog
@@ -35,14 +35,14 @@ class SuperuserViewModel(
 
     private val itemNoData = TextItem(R.string.superuser_policy_none)
 
-    private val itemsPolicies = diffListOf<PolicyRvItem>()
     private val itemsHelpers = ObservableArrayList<TextItem>()
+    private val itemsPolicies = diffListOf<PolicyRvItem>()
 
     val items = MergeObservableList<AnyDiffRvItem>()
         .insertList(itemsHelpers)
         .insertList(itemsPolicies)
-    val itemBinding = itemBindingOf<AnyDiffRvItem> {
-        it.bindExtra(BR.listener, this)
+    val extraBindings = bindExtra {
+        it.put(BR.listener, this)
     }
 
     // ---