More refactoring

Cleanups, move classes to sane locations, etc.

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

@@ -13,8 +13,8 @@ import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.arch.ReselectionTarget
 import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
+import com.topjohnwu.magisk.events.InstallExternalModuleEvent
 import com.topjohnwu.magisk.ktx.hideKeyboard
-import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
 import com.topjohnwu.magisk.ui.MainActivity
 import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
 import com.topjohnwu.magisk.utils.MotionRevealHelper

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

@@ -0,0 +1,98 @@
+package com.topjohnwu.magisk.ui.module
+
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.model.module.Module
+import com.topjohnwu.magisk.core.model.module.Repo
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.databinding.ObservableItem
+import com.topjohnwu.magisk.utils.set
+
+object InstallModule : ComparableRvItem<InstallModule>() {
+    override val layoutRes = R.layout.item_module_download
+
+    override fun contentSameAs(other: InstallModule) = this == other
+    override fun itemSameAs(other: InstallModule) = this === other
+}
+
+class SectionTitle(
+    val title: Int,
+    _button: Int = 0,
+    _icon: Int = 0
+) : ObservableItem<SectionTitle>() {
+    override val layoutRes = R.layout.item_section_md2
+
+    @get:Bindable
+    var button = _button
+        set(value) = set(value, field, { field = it }, BR.button)
+
+    @get:Bindable
+    var icon = _icon
+        set(value) = set(value, field, { field = it }, BR.icon)
+
+    @get:Bindable
+    var hasButton = _button != 0 && _icon != 0
+        set(value) = set(value, field, { field = it }, BR.hasButton)
+
+    override fun itemSameAs(other: SectionTitle): Boolean = this === other
+    override fun contentSameAs(other: SectionTitle): Boolean = this === other
+}
+
+sealed class RepoItem(val item: Repo) : ObservableItem<RepoItem>() {
+    override val layoutRes: Int = R.layout.item_repo_md2
+
+    @get:Bindable
+    var progress = 0
+        set(value) = set(value, field, { field = it }, BR.progress)
+
+    abstract val isUpdate: Boolean
+
+    override fun contentSameAs(other: RepoItem): Boolean = item == other.item
+    override fun itemSameAs(other: RepoItem): Boolean = item.id == other.item.id
+
+    class Update(item: Repo) : RepoItem(item) {
+        override val isUpdate get() = true
+    }
+
+    class Remote(item: Repo) : RepoItem(item) {
+        override val isUpdate get() = false
+    }
+}
+
+class ModuleItem(val item: Module) : ObservableItem<ModuleItem>() {
+
+    override val layoutRes = R.layout.item_module_md2
+
+    @get:Bindable
+    var repo: Repo? = null
+        set(value) = set(value, field, { field = it }, BR.repo)
+
+    @get:Bindable
+    var isEnabled = item.enable
+        set(value) = set(value, field, { field = it }, BR.enabled) {
+            item.enable = value
+        }
+
+    @get:Bindable
+    var isRemoved = item.remove
+        set(value) = set(value, field, { field = it }, BR.removed) {
+            item.remove = value
+        }
+
+    val isUpdated get() = item.updated
+    val isModified get() = isRemoved || isUpdated
+
+    fun delete(viewModel: ModuleViewModel) {
+        isRemoved = !isRemoved
+        viewModel.updateActiveState()
+    }
+
+    override fun contentSameAs(other: ModuleItem): Boolean = item.version == other.item.version
+            && item.versionCode == other.item.versionCode
+            && item.description == other.item.description
+            && item.name == other.item.name
+
+    override fun itemSameAs(other: ModuleItem): Boolean = item.id == other.item.id
+}
+

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

@@ -14,16 +14,12 @@ import com.topjohnwu.magisk.core.tasks.RepoUpdater
 import com.topjohnwu.magisk.data.database.RepoByNameDao
 import com.topjohnwu.magisk.data.database.RepoByUpdatedDao
 import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.events.InstallExternalModuleEvent
+import com.topjohnwu.magisk.events.OpenChangelogEvent
+import com.topjohnwu.magisk.events.dialog.ModuleInstallDialog
 import com.topjohnwu.magisk.ktx.addOnListChangedCallback
 import com.topjohnwu.magisk.ktx.reboot
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.magisk.model.entity.recycler.InstallModule
-import com.topjohnwu.magisk.model.entity.recycler.ModuleItem
-import com.topjohnwu.magisk.model.entity.recycler.RepoItem
-import com.topjohnwu.magisk.model.entity.recycler.SectionTitle
-import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
-import com.topjohnwu.magisk.model.events.OpenChangelogEvent
-import com.topjohnwu.magisk.model.events.dialog.ModuleInstallDialog
+import com.topjohnwu.magisk.model.internal.DownloadSubject
 import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
 import com.topjohnwu.magisk.utils.set
 import kotlinx.coroutines.Dispatchers