Reorganize app source code

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIActivity.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIComponent.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.view.View
 import androidx.core.graphics.Insets

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIFragment.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.os.Bundle
 import android.view.KeyEvent

app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.Manifest
 import androidx.annotation.CallSuper

app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import androidx.databinding.ViewDataBinding
 import com.topjohnwu.magisk.databinding.ComparableRvItem

app/src/main/java/com/topjohnwu/magisk/arch/Queryable.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.os.Handler
 import androidx.core.os.postDelayed

app/src/main/java/com/topjohnwu/magisk/arch/ViewEvent.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.content.Context
 import androidx.fragment.app.Fragment

app/src/main/java/com/topjohnwu/magisk/core/Config.kt

@@ -10,14 +10,14 @@ import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.core.magiskdb.SettingsDao
 import com.topjohnwu.magisk.core.magiskdb.StringDao
 import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.utils.refreshLocale
+import com.topjohnwu.magisk.data.preference.PreferenceModel
 import com.topjohnwu.magisk.data.repository.DBConfig
 import com.topjohnwu.magisk.di.Protected
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.inject
-import com.topjohnwu.magisk.model.preference.PreferenceModel
 import com.topjohnwu.magisk.ui.theme.Theme
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.io.SuFile
 import com.topjohnwu.superuser.io.SuFileInputStream

app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt

@@ -7,10 +7,10 @@ import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
-import com.topjohnwu.magisk.core.view.Shortcuts
 import com.topjohnwu.magisk.ktx.reboot
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
+import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch

app/src/main/java/com/topjohnwu/magisk/core/Info.kt

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.core
 import androidx.databinding.ObservableBoolean
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.core.model.UpdateInfo
-import com.topjohnwu.magisk.core.net.NetworkObserver
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.utils.CachedValue
+import com.topjohnwu.magisk.utils.net.NetworkObserver
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
 import com.topjohnwu.superuser.internal.UiThreadHandler

app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt

@@ -5,11 +5,11 @@ import android.content.Context
 import android.os.Bundle
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.magisk.core.view.Shortcuts
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.model.navigation.Navigation
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope

app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt

@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.core
 import android.content.Context
 import androidx.work.*
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.data.repository.MagiskRepository
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt

@@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.core.wrap
 import com.topjohnwu.magisk.ktx.set
-import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
 import kotlin.random.Random
 
 typealias RequestCallback = BaseActivity.(Int, Intent?) -> Unit

app/src/main/java/com/topjohnwu/magisk/core/base/PermissionRequestBuilder.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.permissions
+package com.topjohnwu.magisk.core.base
 
 typealias SimpleCallback = () -> Unit
 typealias PermissionRationaleCallback = (List<String>) -> Unit

app/src/main/java/com/topjohnwu/magisk/core/download/NotificationService.kt

@@ -4,7 +4,7 @@ import android.app.Notification
 import android.content.Intent
 import android.os.IBinder
 import com.topjohnwu.magisk.core.base.BaseService
-import com.topjohnwu.magisk.core.view.Notifications
+import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel

app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt

@@ -7,13 +7,13 @@ import androidx.lifecycle.MutableLiveData
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.ForegroundTracker
 import com.topjohnwu.magisk.core.utils.ProgressInputStream
-import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.ktx.checkSum
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module
+import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.launch
 import okhttp3.ResponseBody
 import org.koin.android.ext.android.inject

app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt

@@ -13,7 +13,6 @@ import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.core.model.toPolicy
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.wrap
 import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.ktx.get
@@ -21,6 +20,7 @@ import com.topjohnwu.magisk.ktx.startActivity
 import com.topjohnwu.magisk.ktx.startActivityWithRoot
 import com.topjohnwu.magisk.model.entity.toLog
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch

app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt

@@ -12,13 +12,13 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.di.Protected
 import com.topjohnwu.magisk.ktx.readUri
 import com.topjohnwu.magisk.ktx.reboot
 import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.signing.SignBoot
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils

app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt

@@ -8,10 +8,11 @@ import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.signing.JarMap
 import com.topjohnwu.signing.SignApk
 import com.topjohnwu.superuser.Shell

app/src/main/java/com/topjohnwu/magisk/data/preference/BooleanProperty.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import androidx.core.content.edit
 import com.topjohnwu.magisk.ktx.trimEmptyToNull

app/src/main/java/com/topjohnwu/magisk/data/preference/FloatProperty.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import androidx.core.content.edit
 import com.topjohnwu.magisk.ktx.trimEmptyToNull

app/src/main/java/com/topjohnwu/magisk/data/preference/IntProperty.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import androidx.core.content.edit
 import com.topjohnwu.magisk.ktx.trimEmptyToNull

app/src/main/java/com/topjohnwu/magisk/data/preference/LongProperty.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import androidx.core.content.edit
 import com.topjohnwu.magisk.ktx.trimEmptyToNull

app/src/main/java/com/topjohnwu/magisk/data/preference/PreferenceModel.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import android.content.Context
 import android.content.SharedPreferences

app/src/main/java/com/topjohnwu/magisk/data/preference/Property.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import android.content.SharedPreferences
 

app/src/main/java/com/topjohnwu/magisk/data/preference/StringProperty.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import androidx.core.content.edit
 import com.topjohnwu.magisk.ktx.trimEmptyToNull

app/src/main/java/com/topjohnwu/magisk/data/preference/StringSetProperty.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.preference
+package com.topjohnwu.magisk.data.preference
 
 import androidx.core.content.edit
 import com.topjohnwu.magisk.ktx.trimEmptyToNull

app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt

@@ -1,40 +0,0 @@
-package com.topjohnwu.magisk.databinding
-
-import android.view.View
-import android.widget.TextView
-import androidx.core.view.isGone
-import androidx.core.view.isInvisible
-import androidx.databinding.BindingAdapter
-import com.topjohnwu.magisk.ktx.coroutineScope
-import com.topjohnwu.magisk.ktx.get
-import io.noties.markwon.Markwon
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-@BindingAdapter("gone")
-fun setGone(view: View, gone: Boolean) {
-    view.isGone = gone
-}
-
-@BindingAdapter("invisible")
-fun setInvisible(view: View, invisible: Boolean) {
-    view.isInvisible = invisible
-}
-
-@BindingAdapter("goneUnless")
-fun setGoneUnless(view: View, goneUnless: Boolean) {
-    setGone(view, goneUnless.not())
-}
-
-@BindingAdapter("invisibleUnless")
-fun setInvisibleUnless(view: View, invisibleUnless: Boolean) {
-    setInvisible(view, invisibleUnless.not())
-}
-
-@BindingAdapter("markdownText")
-fun setMarkdownText(tv: TextView, text: CharSequence) {
-    tv.coroutineScope.launch(Dispatchers.IO) {
-        val markwon = get<Markwon>()
-        markwon.setMarkdown(tv, text.toString())
-    }
-}

app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.databinding
 
 import android.animation.ValueAnimator
 import android.graphics.Paint
@@ -9,6 +9,8 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
 import androidx.core.view.updateLayoutParams
 import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
@@ -20,12 +22,42 @@ import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
 import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.ktx.coroutineScope
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.widget.IndeterminateCheckBox
+import io.noties.markwon.Markwon
 import kotlinx.coroutines.*
 import kotlin.math.roundToInt
 
+@BindingAdapter("gone")
+fun setGone(view: View, gone: Boolean) {
+    view.isGone = gone
+}
+
+@BindingAdapter("invisible")
+fun setInvisible(view: View, invisible: Boolean) {
+    view.isInvisible = invisible
+}
+
+@BindingAdapter("goneUnless")
+fun setGoneUnless(view: View, goneUnless: Boolean) {
+    setGone(view, goneUnless.not())
+}
+
+@BindingAdapter("invisibleUnless")
+fun setInvisibleUnless(view: View, invisibleUnless: Boolean) {
+    setInvisible(view, invisibleUnless.not())
+}
+
+@BindingAdapter("markdownText")
+fun setMarkdownText(tv: TextView, text: CharSequence) {
+    tv.coroutineScope.launch(Dispatchers.IO) {
+        val markwon = get<Markwon>()
+        markwon.setMarkdown(tv, text.toString())
+    }
+}
 
 @BindingAdapter("onNavigationClick")
 fun setOnNavigationClickedListener(view: Toolbar, listener: View.OnClickListener) {

app/src/main/java/com/topjohnwu/magisk/databinding/RvBindingAdapter.kt

@@ -1,12 +1,11 @@
-package com.topjohnwu.magisk.model.binding
+package com.topjohnwu.magisk.databinding
 
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
-import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
 import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
 
-class BindingAdapter <T : ComparableRvItem<*>> : BindingRecyclerViewAdapter<T>() {
+class RvBindingAdapter<T : RvItem> : BindingRecyclerViewAdapter<T>() {
 
     private var recyclerView: RecyclerView? = null
 

app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt

@@ -5,12 +5,12 @@ import android.os.Build
 import com.squareup.moshi.Moshi
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.utils.MarkwonImagePlugin
 import com.topjohnwu.magisk.data.network.GithubApiServices
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.ktx.precomputedText
 import com.topjohnwu.magisk.net.Networking
 import com.topjohnwu.magisk.net.NoSSLv3SocketFactory
+import com.topjohnwu.magisk.utils.MarkwonImagePlugin
 import io.noties.markwon.Markwon
 import io.noties.markwon.html.HtmlPlugin
 import okhttp3.Dns

app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt

@@ -47,9 +47,9 @@ import com.topjohnwu.magisk.FileProvider
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.ResMgr
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.utils.DynamicClassLoader
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

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

@@ -6,10 +6,10 @@ import android.content.Intent
 import androidx.annotation.RequiresPermission
 import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.MainDirections
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
-import com.topjohnwu.magisk.ui.base.ViewEvent
 
 class InstallExternalModuleEvent : ViewEvent(), ActivityExecutor {
 

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

@@ -7,8 +7,8 @@ import androidx.annotation.AttrRes
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.ui.base.ContextExecutor
+import com.topjohnwu.magisk.arch.ContextExecutor
-import com.topjohnwu.magisk.ui.base.ViewEvent
+import com.topjohnwu.magisk.arch.ViewEvent
 
 data class OpenInappLinkEvent(
     private val link: String

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

@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.model.events
 import android.content.Context
 import androidx.annotation.StringRes
 import com.google.android.material.snackbar.Snackbar
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.BaseUIActivity
+import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.ktx.snackbar
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
-import com.topjohnwu.magisk.ui.base.BaseUIActivity
-import com.topjohnwu.magisk.ui.base.ViewEvent
 
 class SnackbarEvent private constructor(
     @StringRes private val messageRes: Int,

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

@@ -4,6 +4,10 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.ContextExecutor
+import com.topjohnwu.magisk.arch.ViewEvent
+import com.topjohnwu.magisk.arch.ViewEventWithScope
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.model.module.Repo
@@ -11,10 +15,6 @@ import com.topjohnwu.magisk.core.utils.SafetyNetHelper
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.ktx.DynamicClassLoader
 import com.topjohnwu.magisk.ktx.writeTo
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
-import com.topjohnwu.magisk.ui.base.ContextExecutor
-import com.topjohnwu.magisk.ui.base.ViewEvent
-import com.topjohnwu.magisk.ui.base.ViewEventWithScope
 import com.topjohnwu.magisk.ui.safetynet.SafetyNetResult
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.MarkDownWindow

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

@@ -1,9 +1,9 @@
 package com.topjohnwu.magisk.model.events.dialog
 
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
-import com.topjohnwu.magisk.ui.base.ViewEvent
 
 class BiometricDialog(
     builder: Builder.() -> Unit

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

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.model.events.dialog
 import android.app.Activity
 import androidx.appcompat.app.AppCompatDelegate
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.ActivityExecutor
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
 import com.topjohnwu.magisk.view.MagiskDialog
 import java.lang.ref.WeakReference
 

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

@@ -1,8 +1,8 @@
 package com.topjohnwu.magisk.model.events.dialog
 
 import android.content.Context
-import com.topjohnwu.magisk.ui.base.ContextExecutor
+import com.topjohnwu.magisk.arch.ContextExecutor
-import com.topjohnwu.magisk.ui.base.ViewEvent
+import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.view.MagiskDialog
 
 abstract class DialogEvent : ViewEvent(), ContextExecutor {

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

@@ -4,9 +4,9 @@ import android.widget.Toast
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.superuser.Shell
 

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

@@ -1,10 +1,10 @@
 package com.topjohnwu.magisk.model.navigation
 
 import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.BaseUIActivity
+import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
-import com.topjohnwu.magisk.ui.base.BaseUIActivity
-import com.topjohnwu.magisk.ui.base.ViewEvent
 
 class NavigationWrapper(
     private val directions: NavDirections

app/src/main/java/com/topjohnwu/magisk/model/observer/Observer.kt

@@ -1,31 +0,0 @@
-package com.topjohnwu.magisk.model.observer
-
-import androidx.databinding.Observable
-import androidx.databinding.ObservableField
-import java.io.Serializable
-
-
-class Observer<T>(vararg dependencies: Observable, private val observer: () -> T) :
-    ObservableField<T>(*dependencies), Serializable {
-
-    val value: T get() = observer()
-
-    @Deprecated(
-        message = "Use KObservableField.value syntax from code",
-        replaceWith = ReplaceWith("value")
-    )
-    override fun get(): T {
-        return value
-    }
-
-    @Deprecated(
-        message = "Observer cannot be set",
-        level = DeprecationLevel.HIDDEN
-    )
-    override fun set(newValue: T) {
-    }
-
-    override fun toString(): String {
-        return "Observer(value=$value)"
-    }
-}

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -13,13 +13,13 @@ import androidx.navigation.NavDirections
 import com.google.android.material.card.MaterialCardView
 import com.topjohnwu.magisk.MainDirections
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIActivity
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.ReselectionTarget
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
 import com.topjohnwu.magisk.ktx.startAnimations
-import com.topjohnwu.magisk.ui.base.BaseUIActivity
-import com.topjohnwu.magisk.ui.base.BaseViewModel
-import com.topjohnwu.magisk.ui.base.ReselectionTarget
 import com.topjohnwu.magisk.ui.home.HomeFragmentDirections
 import com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
 import com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior

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

@@ -9,12 +9,12 @@ import android.view.*
 import androidx.core.net.toUri
 import androidx.navigation.NavDeepLinkBuilder
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIActivity
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.cmp
 import com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
 import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.base.BaseUIActivity
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.io.File

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

@@ -7,19 +7,19 @@ import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.diffListOf
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.tasks.FlashZip
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
-import com.topjohnwu.magisk.core.view.Notifications
+import com.topjohnwu.magisk.databinding.RvBindingAdapter
 import com.topjohnwu.magisk.ktx.*
-import com.topjohnwu.magisk.model.binding.BindingAdapter
 import com.topjohnwu.magisk.model.entity.recycler.ConsoleItem
 import com.topjohnwu.magisk.model.events.SnackbarEvent
-import com.topjohnwu.magisk.ui.base.BaseViewModel
-import com.topjohnwu.magisk.ui.base.diffListOf
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import com.topjohnwu.magisk.utils.set
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.superuser.CallbackList
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
@@ -40,7 +40,7 @@ class FlashViewModel(
     var behaviorText = resources.getString(R.string.flashing)
         set(value) = set(value, field, { field = it }, BR.behaviorText)
 
-    val adapter = BindingAdapter<ConsoleItem>()
+    val adapter = RvBindingAdapter<ConsoleItem>()
     val items = diffListOf<ConsoleItem>()
     val itemBinding = itemBindingOf<ConsoleItem>()
 

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt

@@ -10,9 +10,9 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
 import com.topjohnwu.magisk.ktx.hideKeyboard
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel
 

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt

@@ -4,6 +4,10 @@ import android.content.pm.ApplicationInfo
 import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.Queryable
+import com.topjohnwu.magisk.arch.filterableListOf
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.data.repository.MagiskRepository
@@ -13,10 +17,6 @@ import com.topjohnwu.magisk.model.entity.HideTarget
 import com.topjohnwu.magisk.model.entity.StatefulProcess
 import com.topjohnwu.magisk.model.entity.recycler.HideItem
 import com.topjohnwu.magisk.model.entity.recycler.HideProcessItem
-import com.topjohnwu.magisk.ui.base.BaseViewModel
-import com.topjohnwu.magisk.ui.base.Queryable
-import com.topjohnwu.magisk.ui.base.filterableListOf
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import com.topjohnwu.magisk.utils.set
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

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

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.home
 import android.os.Bundle
 import android.view.*
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
 import com.topjohnwu.magisk.model.events.RebootEvent
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.superuser.Shell
 import org.koin.androidx.viewmodel.ext.android.viewModel
 

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

@@ -5,6 +5,10 @@ import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.ViewEvent
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.base.BaseActivity
@@ -21,10 +25,6 @@ import com.topjohnwu.magisk.model.events.OpenInappLinkEvent
 import com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
 import com.topjohnwu.magisk.model.events.dialog.ManagerInstallDialog
 import com.topjohnwu.magisk.model.events.dialog.UninstallDialog
-import com.topjohnwu.magisk.ui.base.ActivityExecutor
-import com.topjohnwu.magisk.ui.base.BaseViewModel
-import com.topjohnwu.magisk.ui.base.ViewEvent
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch

app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.install
 import android.content.Intent
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
 import com.topjohnwu.magisk.model.events.RequestFileEvent
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class InstallFragment : BaseUIFragment<InstallViewModel, FragmentInstallMd2Binding>() {

app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt

@@ -6,16 +6,16 @@ import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.RemoteFileService
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.repository.StringRepository
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.events.RequestFileEvent
 import com.topjohnwu.magisk.model.events.dialog.SecondSlotWarningDialog
-import com.topjohnwu.magisk.ui.base.BaseViewModel
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch

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

@@ -7,9 +7,9 @@ import android.view.MenuItem
 import android.view.View
 import androidx.core.view.isVisible
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentLogMd2Binding
 import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel
 

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

@@ -4,15 +4,15 @@ import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.diffListOf
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.model.entity.recycler.LogItem
 import com.topjohnwu.magisk.model.entity.recycler.TextItem
 import com.topjohnwu.magisk.model.events.SnackbarEvent
-import com.topjohnwu.magisk.ui.base.BaseViewModel
-import com.topjohnwu.magisk.ui.base.diffListOf
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers

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

@@ -9,13 +9,13 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
+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.ktx.hideKeyboard
 import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
 import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
-import com.topjohnwu.magisk.ui.base.ReselectionTarget
-import com.topjohnwu.magisk.ui.base.ViewEvent
 import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel

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

@@ -6,6 +6,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.*
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.download.RemoteFileService
 import com.topjohnwu.magisk.core.model.module.Module
@@ -23,7 +24,6 @@ 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.ui.base.*
 import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
 import com.topjohnwu.magisk.utils.set
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt

@@ -5,8 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SafetynetFragment : BaseUIFragment<SafetynetViewModel, FragmentSafetynetMd2Binding>() {

app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt

@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.ui.safetynet
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.model.events.CheckSafetyNetEvent
-import com.topjohnwu.magisk.ui.base.BaseViewModel
 import com.topjohnwu.magisk.ui.safetynet.SafetyNetState.*
 import com.topjohnwu.magisk.utils.set
 import org.json.JSONObject

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

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.settings
 import android.os.Bundle
 import android.view.View
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
 import com.topjohnwu.magisk.ktx.setOnViewReadyListener
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SettingsFragment : BaseUIFragment<SettingsViewModel, FragmentSettingsMd2Binding>() {

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

@@ -13,7 +13,6 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.UpdateCheckService
 import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.utils.availableLocales
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
@@ -21,6 +20,7 @@ import com.topjohnwu.magisk.databinding.DialogSettingsDownloadPathBinding
 import com.topjohnwu.magisk.databinding.DialogSettingsUpdateChannelBinding
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.model.entity.recycler.SettingsItem
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.asTransitive
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell

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

@@ -6,21 +6,21 @@ import android.widget.Toast
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.adapterOf
+import com.topjohnwu.magisk.arch.diffListOf
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.utils.PatchAPK
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.recycler.SettingsItem
 import com.topjohnwu.magisk.model.events.RecreateEvent
 import com.topjohnwu.magisk.model.events.dialog.BiometricDialog
-import com.topjohnwu.magisk.ui.base.BaseViewModel
+import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.ui.base.adapterOf
-import com.topjohnwu.magisk.ui.base.diffListOf
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch
 import org.koin.core.get

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

@@ -1,8 +1,8 @@
 package com.topjohnwu.magisk.ui.superuser
 
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SuperuserFragment : BaseUIFragment<SuperuserViewModel, FragmentSuperuserMd2Binding>() {

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

@@ -6,6 +6,10 @@ import androidx.databinding.ObservableArrayList
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.adapterOf
+import com.topjohnwu.magisk.arch.diffListOf
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.core.utils.BiometricHelper
@@ -17,10 +21,6 @@ import com.topjohnwu.magisk.model.entity.recycler.TextItem
 import com.topjohnwu.magisk.model.events.SnackbarEvent
 import com.topjohnwu.magisk.model.events.dialog.BiometricDialog
 import com.topjohnwu.magisk.model.events.dialog.SuperuserRevokeDialog
-import com.topjohnwu.magisk.ui.base.BaseViewModel
-import com.topjohnwu.magisk.ui.base.adapterOf
-import com.topjohnwu.magisk.ui.base.diffListOf
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt

@@ -9,10 +9,10 @@ import android.view.Window
 import android.view.WindowManager
 import androidx.navigation.NavController
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIActivity
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import com.topjohnwu.magisk.core.su.SuCallbackHandler.REQUEST
 import com.topjohnwu.magisk.databinding.ActivityRequestBinding
-import com.topjohnwu.magisk.ui.base.BaseUIActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 open class SuRequestActivity : BaseUIActivity<SuRequestViewModel, ActivityRequestBinding>() {

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt

@@ -10,6 +10,7 @@ import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.ALLOW
@@ -18,7 +19,6 @@ import com.topjohnwu.magisk.core.su.SuRequestHandler
 import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
 import com.topjohnwu.magisk.model.events.DieEvent
-import com.topjohnwu.magisk.ui.base.BaseViewModel
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import kotlinx.coroutines.launch

app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt

@@ -1,8 +1,8 @@
 package com.topjohnwu.magisk.ui.theme
 
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
-import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ThemeFragment : BaseUIFragment<ThemeViewModel, FragmentThemeMd2Binding>() {

app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeViewModel.kt

@@ -1,9 +1,9 @@
 package com.topjohnwu.magisk.ui.theme
 
+import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.model.entity.recycler.TappableHeadlineItem
 import com.topjohnwu.magisk.model.events.RecreateEvent
 import com.topjohnwu.magisk.model.events.dialog.DarkThemeDialog
-import com.topjohnwu.magisk.ui.base.BaseViewModel
 
 class ThemeViewModel : BaseViewModel(), TappableHeadlineItem.Listener {
 

app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt

@@ -4,7 +4,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.topjohnwu.magisk.ui.base.ViewEvent
+import com.topjohnwu.magisk.arch.ViewEvent
 
 class EndlessRecyclerScrollListener(
     private val layoutManager: RecyclerView.LayoutManager,

app/src/main/java/com/topjohnwu/magisk/utils/MarkwonImagePlugin.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.core.utils
+package com.topjohnwu.magisk.utils
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -173,7 +173,8 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() {
             if (measured || canvasWidth == 0)
                 return
             measured = true
-            val bound = SizeResolver.resolveImageSize(size, defaultBounds(), canvasWidth, paint.textSize)
+            val bound =
+                SizeResolver.resolveImageSize(size, defaultBounds(), canvasWidth, paint.textSize)
             draw.bounds = bound
         }
 

app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.core.utils
+package com.topjohnwu.magisk.utils
 
 import android.content.Context
 import android.content.Intent

app/src/main/java/com/topjohnwu/magisk/utils/net/Connectivity.kt

@@ -1,4 +1,6 @@
-package com.topjohnwu.magisk.core.net
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.utils.net
 
 import android.net.ConnectivityManager
 import android.net.Network

app/src/main/java/com/topjohnwu/magisk/utils/net/LollipopNetworkObserver.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.core.net
+package com.topjohnwu.magisk.utils.net
 
 import android.annotation.TargetApi
 import android.content.Context

app/src/main/java/com/topjohnwu/magisk/utils/net/MarshmallowNetworkObserver.kt

@@ -1,4 +1,6 @@
-package com.topjohnwu.magisk.core.net
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.utils.net
 
 import android.annotation.TargetApi
 import android.content.BroadcastReceiver

app/src/main/java/com/topjohnwu/magisk/utils/net/NetworkObserver.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.core.net
+package com.topjohnwu.magisk.utils.net
 
 import android.content.Context
 import android.net.ConnectivityManager

app/src/main/java/com/topjohnwu/magisk/utils/net/PreLollipopNetworkObserver.kt

@@ -1,4 +1,6 @@
-package com.topjohnwu.magisk.core.net
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.utils.net
 
 import android.content.BroadcastReceiver
 import android.content.Context

app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt

@@ -23,9 +23,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.databinding.DialogMagiskBaseBinding
-import com.topjohnwu.magisk.ui.base.itemBindingOf
 import com.topjohnwu.magisk.utils.ObservableHost
 import com.topjohnwu.magisk.utils.set
 import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters

app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.core.view
+package com.topjohnwu.magisk.view
 
 import android.app.Notification
 import android.app.NotificationChannel

app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.core.view
+package com.topjohnwu.magisk.view
 
 import android.content.Context
 import android.content.Intent
@@ -15,8 +15,8 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.SplashActivity
 import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.ktx.getBitmap
+import com.topjohnwu.magisk.utils.Utils
 
 object Shortcuts {