Replace old design with redesign (p2)

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt

@@ -5,20 +5,13 @@ import android.view.ViewGroup
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
-import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.startAnimations
 import com.topjohnwu.magisk.extensions.toggle
-import com.topjohnwu.magisk.model.entity.HideAppInfo
-import com.topjohnwu.magisk.model.entity.HideTarget
 import com.topjohnwu.magisk.model.entity.ProcessHideApp
 import com.topjohnwu.magisk.model.entity.StatefulProcess
-import com.topjohnwu.magisk.model.entity.state.IndeterminateState
-import com.topjohnwu.magisk.model.events.HideProcessEvent
 import com.topjohnwu.magisk.model.observer.Observer
 import com.topjohnwu.magisk.redesign.hide.HideViewModel
-import com.topjohnwu.magisk.utils.DiffObservableList
 import com.topjohnwu.magisk.utils.KObservableField
-import com.topjohnwu.magisk.utils.RxBus
 import kotlin.math.roundToInt
 
 class HideItem(val item: ProcessHideApp) : ComparableRvItem<HideItem>() {
@@ -86,81 +79,3 @@ class HideProcessItem(val item: StatefulProcess) : ComparableRvItem<HideProcessI
     override fun itemSameAs(other: HideProcessItem) = item.name == other.item.name
 
 }
-
-class HideRvItem(val item: HideAppInfo, targets: List<HideTarget>) :
-    ComparableRvItem<HideRvItem>() {
-
-    override val layoutRes: Int = R.layout.item_hide_app
-
-    val packageName = item.info.packageName.orEmpty()
-    val items = DiffObservableList(callback).also {
-        val items = item.processes.map {
-            val isHidden = targets.any { target ->
-                packageName == target.packageName && it == target.process
-            }
-            HideProcessRvItem(packageName, it, isHidden)
-        }
-        it.update(items)
-    }
-    val isHiddenState = KObservableField(currentState)
-    val isExpanded = KObservableField(false)
-
-    private val itemsProcess get() = items.filterIsInstance<HideProcessRvItem>()
-
-    private val currentState
-        get() = when (itemsProcess.count { it.isHidden.value }) {
-            items.size -> IndeterminateState.CHECKED
-            in 1 until items.size -> IndeterminateState.INDETERMINATE
-            else -> IndeterminateState.UNCHECKED
-        }
-
-    init {
-        itemsProcess.forEach {
-            it.isHidden.addOnPropertyChangedCallback { isHiddenState.value = currentState }
-        }
-    }
-
-    fun toggle() {
-        val desiredState = when (isHiddenState.value) {
-            IndeterminateState.INDETERMINATE,
-            IndeterminateState.UNCHECKED -> true
-            IndeterminateState.CHECKED -> false
-        }
-        itemsProcess.forEach { it.isHidden.value = desiredState }
-        isHiddenState.value = currentState
-    }
-
-    fun toggleExpansion() {
-        if (items.size <= 1) return
-        isExpanded.toggle()
-    }
-
-    override fun contentSameAs(other: HideRvItem): Boolean = items.all { other.items.contains(it) }
-    override fun itemSameAs(other: HideRvItem): Boolean = item.info == other.item.info
-
-}
-
-class HideProcessRvItem(
-    val packageName: String,
-    val process: String,
-    isHidden: Boolean
-) : ComparableRvItem<HideProcessRvItem>() {
-
-    override val layoutRes: Int = R.layout.item_hide_process
-
-    val isHidden = KObservableField(isHidden)
-
-    private val rxBus: RxBus by inject()
-
-    init {
-        this.isHidden.addOnPropertyChangedCallback {
-            rxBus.post(HideProcessEvent(this@HideProcessRvItem))
-        }
-    }
-
-    fun toggle() = isHidden.toggle()
-
-    override fun contentSameAs(other: HideProcessRvItem): Boolean = itemSameAs(other)
-    override fun itemSameAs(other: HideProcessRvItem): Boolean =
-        packageName == other.packageName && process == other.process
-}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt

@@ -3,79 +3,9 @@ package com.topjohnwu.magisk.model.entity.recycler
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.timeDateFormat
-import com.topjohnwu.magisk.extensions.timeFormatMedium
 import com.topjohnwu.magisk.extensions.toTime
-import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskLog
-import com.topjohnwu.magisk.model.entity.WrappedMagiskLog
-import com.topjohnwu.magisk.utils.DiffObservableList
-import com.topjohnwu.magisk.utils.KObservableField
-
-class LogRvItem : ComparableRvItem<LogRvItem>() {
-    override val layoutRes: Int = R.layout.item_page_log
-
-    val items = DiffObservableList(callback)
-
-    fun update(list: List<LogItemRvItem>) {
-        list.firstOrNull()?.isExpanded?.value = true
-        items.update(list)
-    }
-
-    //two of these will never be present, safe to assume it's unique
-    override fun contentSameAs(other: LogRvItem): Boolean = false
-
-    override fun itemSameAs(other: LogRvItem): Boolean = false
-}
-
-class LogItemRvItem(
-    item: WrappedMagiskLog
-) : ComparableRvItem<LogItemRvItem>() {
-    override val layoutRes: Int = R.layout.item_superuser_log
-
-    val date = item.time.toTime(timeFormatMedium)
-    val items: List<ComparableRvItem<*>> = item.items.map { LogItemEntryRvItem(it) }
-    val isExpanded = KObservableField(false)
-
-    fun toggle() = isExpanded.toggle()
-
-    override fun contentSameAs(other: LogItemRvItem): Boolean {
-        if (items.size != other.items.size) return false
-        return items.all { it in other.items }
-    }
-
-    override fun itemSameAs(other: LogItemRvItem): Boolean = date == other.date
-}
-
-class LogItemEntryRvItem(val item: MagiskLog) : ComparableRvItem<LogItemEntryRvItem>() {
-    override val layoutRes: Int = R.layout.item_superuser_log_entry
-
-    val isExpanded = KObservableField(false)
-
-    fun toggle() = isExpanded.toggle()
-
-    override fun contentSameAs(other: LogItemEntryRvItem) = item == other.item
-
-    override fun itemSameAs(other: LogItemEntryRvItem) = item.appName == other.item.appName
-}
-
-class MagiskLogRvItem : ComparableRvItem<MagiskLogRvItem>() {
-    override val layoutRes: Int = R.layout.item_page_magisk_log
-
-    val items = DiffObservableList(callback)
-
-    fun update(list: List<ConsoleRvItem>) {
-        items.update(list)
-    }
-
-    //two of these will never be present, safe to assume it's unique
-    override fun contentSameAs(other: MagiskLogRvItem): Boolean = false
-
-    override fun itemSameAs(other: MagiskLogRvItem): Boolean = false
-}
-
-// ---
 
 class LogItem(val item: MagiskLog) : ObservableItem<LogItem>() {
 
@@ -106,4 +36,4 @@ class LogItem(val item: MagiskLog) : ObservableItem<LogItem>() {
             item.time == other.item.time &&
             isTop == other.isTop &&
             isBottom == other.isBottom
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt

@@ -1,7 +1,5 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import android.content.res.Resources
-import androidx.annotation.StringRes
 import androidx.databinding.Bindable
 import androidx.databinding.Observable
 import androidx.databinding.PropertyChangeRegistry
@@ -10,77 +8,11 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.module.Module
 import com.topjohnwu.magisk.model.entity.module.Repo
 import com.topjohnwu.magisk.redesign.module.ModuleViewModel
 import com.topjohnwu.magisk.utils.KObservableField
 
-class ModuleRvItem(val item: Module) : ComparableRvItem<ModuleRvItem>() {
-
-    override val layoutRes: Int = R.layout.item_module
-
-    val lastActionNotice = KObservableField("")
-    val isChecked = KObservableField(item.enable)
-    val isDeletable = KObservableField(item.remove)
-
-    init {
-        isChecked.addOnPropertyChangedCallback {
-            when (it) {
-                true -> {
-                    item.enable = true
-                    notice(R.string.disable_file_removed)
-                }
-                false -> {
-                    item.enable = false
-                    notice(R.string.disable_file_created)
-                }
-            }
-        }
-        isDeletable.addOnPropertyChangedCallback {
-            when (it) {
-                true -> {
-                    item.remove = true
-                    notice(R.string.remove_file_created)
-                }
-                false -> {
-                    item.remove = false
-                    notice(R.string.remove_file_deleted)
-                }
-            }
-        }
-        when {
-            item.updated -> notice(R.string.update_file_created)
-            item.remove -> notice(R.string.remove_file_created)
-        }
-    }
-
-    fun toggle() = isChecked.toggle()
-    fun toggleDelete() = isDeletable.toggle()
-
-    private fun notice(@StringRes info: Int) {
-        lastActionNotice.value = get<Resources>().getString(info)
-    }
-
-    override fun contentSameAs(other: ModuleRvItem): 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: ModuleRvItem): Boolean = item.id == other.item.id
-}
-
-class RepoRvItem(val item: Repo) : ComparableRvItem<RepoRvItem>() {
-
-    override val layoutRes: Int = R.layout.item_repo
-
-    override fun contentSameAs(other: RepoRvItem): Boolean = item == other.item
-
-    override fun itemSameAs(other: RepoRvItem): Boolean = item.id == other.item.id
-}
-
 object SafeModeNotice : ComparableRvItem<SafeModeNotice>() {
     override val layoutRes = R.layout.item_safe_mode_notice
 
@@ -227,4 +159,4 @@ abstract class ObservableItem<T> : ComparableRvItem<T>(), Observable {
 
     fun notifyChange(id: Int) = list.notifyChange(this, id)
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt

@@ -3,54 +3,11 @@ package com.topjohnwu.magisk.model.entity.recycler
 import android.graphics.drawable.Drawable
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
-import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
-import com.topjohnwu.magisk.model.events.PolicyEnableEvent
 import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
 import com.topjohnwu.magisk.redesign.superuser.SuperuserViewModel
 import com.topjohnwu.magisk.utils.KObservableField
-import com.topjohnwu.magisk.utils.RxBus
-
-class PolicyRvItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyRvItem>() {
-
-    override val layoutRes = R.layout.item_policy
-
-    val isExpanded = KObservableField(false)
-    val isEnabled = KObservableField(item.policy == MagiskPolicy.ALLOW)
-    val shouldNotify = KObservableField(item.notification)
-    val shouldLog = KObservableField(item.logging)
-
-    fun toggle() = isExpanded.toggle()
-
-    private val rxBus: RxBus by inject()
-
-    private val currentStateItem
-        get() = item.copy(
-            policy = if (isEnabled.value) MagiskPolicy.ALLOW else MagiskPolicy.DENY,
-            notification = shouldNotify.value,
-            logging = shouldLog.value
-        )
-
-    init {
-        isEnabled.addOnPropertyChangedCallback {
-            it ?: return@addOnPropertyChangedCallback
-            rxBus.post(PolicyEnableEvent(this@PolicyRvItem, it))
-        }
-        shouldNotify.addOnPropertyChangedCallback {
-            it ?: return@addOnPropertyChangedCallback
-            rxBus.post(PolicyUpdateEvent.Notification(currentStateItem))
-        }
-        shouldLog.addOnPropertyChangedCallback {
-            it ?: return@addOnPropertyChangedCallback
-            rxBus.post(PolicyUpdateEvent.Log(currentStateItem))
-        }
-    }
-
-    override fun contentSameAs(other: PolicyRvItem): Boolean = itemSameAs(other)
-    override fun itemSameAs(other: PolicyRvItem): Boolean = item.uid == other.item.uid
-}
 
 class PolicyItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyItem>() {
     override val layoutRes = R.layout.item_policy_md2
@@ -93,4 +50,4 @@ class PolicyItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<
     override fun contentSameAs(other: PolicyItem) = itemSameAs(other)
     override fun itemSameAs(other: PolicyItem) = item.uid == other.item.uid
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/events/RxEvents.kt

@@ -1,19 +1,11 @@
 package com.topjohnwu.magisk.model.events
 
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
-import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem
-import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem
-import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem
 import com.topjohnwu.magisk.utils.RxBus
 
-class HideProcessEvent(val item: HideProcessRvItem) : RxBus.Event
-
-class PolicyEnableEvent(val item: PolicyRvItem, val enable: Boolean) : RxBus.Event
 sealed class PolicyUpdateEvent(val item: MagiskPolicy) : RxBus.Event {
     class Notification(item: MagiskPolicy) : PolicyUpdateEvent(item)
     class Log(item: MagiskPolicy) : PolicyUpdateEvent(item)
 }
 
-class ModuleUpdatedEvent(val item: ModuleRvItem) : RxBus.Event
-
-data class SafetyNetResult(val responseCode: Int) : RxBus.Event
+data class SafetyNetResult(val responseCode: Int) : RxBus.Event

app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt

@@ -10,12 +10,11 @@ import com.topjohnwu.magisk.redesign.hide.HideFragment
 import com.topjohnwu.magisk.redesign.home.HomeFragment
 import com.topjohnwu.magisk.redesign.install.InstallFragment
 import com.topjohnwu.magisk.redesign.log.LogFragment
+import com.topjohnwu.magisk.redesign.module.ModuleFragment
 import com.topjohnwu.magisk.redesign.safetynet.SafetynetFragment
 import com.topjohnwu.magisk.redesign.settings.SettingsFragment
 import com.topjohnwu.magisk.redesign.superuser.SuperuserFragment
 import com.topjohnwu.magisk.redesign.theme.ThemeFragment
-import com.topjohnwu.magisk.ui.module.ModulesFragment
-import com.topjohnwu.magisk.ui.module.ReposFragment
 
 object Navigation {
 
@@ -36,14 +35,10 @@ object Navigation {
 
     fun modules() = MagiskNavigationEvent {
         navDirections {
-            destination = ModulesFragment::class
+            destination = ModuleFragment::class
         }
     }
 
-    fun repos() = MagiskNavigationEvent {
-        navDirections { destination = ReposFragment::class }
-    }
-
     fun hide() = MagiskNavigationEvent {
         navDirections {
             destination = HideFragment::class
@@ -77,7 +72,6 @@ object Navigation {
     fun fromSection(section: String) = when (section) {
         "superuser" -> superuser()
         "modules" -> modules()
-        "downloads" -> repos()
         "magiskhide" -> hide()
         "log" -> log()
         "settings" -> settings()