Cleanup classes

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

@@ -9,14 +9,14 @@ import androidx.core.content.edit
 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.data.repository.DBConfig
 import com.topjohnwu.magisk.di.Protected
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.model.preference.PreferenceModel
 import com.topjohnwu.magisk.ui.theme.Theme
-import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.core.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/SplashActivity.kt

@@ -4,10 +4,10 @@ import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.model.navigation.Navigation
 import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.core.view.Shortcuts
+import com.topjohnwu.magisk.model.navigation.Navigation
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 

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

@@ -6,6 +6,8 @@ import android.content.Intent
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.topjohnwu.magisk.R
+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.di.NullActivity
 import com.topjohnwu.magisk.extensions.get
@@ -13,8 +15,6 @@ import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*
-import com.topjohnwu.magisk.core.utils.ProgressInputStream
-import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.superuser.ShellUtils
 import io.reactivex.Completable
 import okhttp3.ResponseBody

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

@@ -13,6 +13,7 @@ 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.extensions.get
@@ -21,7 +22,6 @@ import com.topjohnwu.magisk.extensions.startActivityWithRoot
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
 import com.topjohnwu.magisk.model.entity.toLog
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.superuser.Shell
 import timber.log.Timber
 

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

@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.core.tasks
 import android.content.Context
 import android.net.Uri
 import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.utils.unzip
 import com.topjohnwu.magisk.extensions.fileName
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.readUri
 import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.core.utils.unzip
 import com.topjohnwu.superuser.Shell
 import io.reactivex.Single
 import java.io.File

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

@@ -7,8 +7,8 @@ import android.text.TextUtils
 import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
 import androidx.core.net.toUri
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.di.Protected
 import com.topjohnwu.magisk.extensions.*

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

@@ -9,12 +9,12 @@ 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.extensions.DynamicClassLoader
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
-import com.topjohnwu.magisk.core.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/network/GithubServices.kt

@@ -1,8 +1,8 @@
 package com.topjohnwu.magisk.data.network
 
 import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.tasks.GithubRepoInfo
 import com.topjohnwu.magisk.core.model.UpdateInfo
+import com.topjohnwu.magisk.core.tasks.GithubRepoInfo
 import io.reactivex.Flowable
 import io.reactivex.Single
 import okhttp3.ResponseBody

app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt

@@ -1,8 +1,8 @@
 package com.topjohnwu.magisk.data.repository
 
 import android.content.pm.PackageManager
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.extensions.getLabel
 import com.topjohnwu.magisk.extensions.packageName

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.extensions
 
+import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
 import android.content.ContextWrapper
@@ -22,17 +23,20 @@ import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.provider.OpenableColumns
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
+import androidx.core.content.getSystemService
 import androidx.core.net.toFile
 import androidx.core.net.toUri
+import androidx.fragment.app.Fragment
 import com.topjohnwu.magisk.FileProvider
 import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.utils.DynamicClassLoader
-import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 import java.io.File
@@ -347,3 +351,14 @@ val isAB
     get() = ShellUtils
         .fastCmd("grep_prop ro.build.ab_update")
         .let { it.isNotEmpty() && it.toBoolean() }
+
+fun Activity.hideKeyboard() {
+    val view = currentFocus ?: return
+    getSystemService<InputMethodManager>()
+        ?.hideSoftInputFromWindow(view.windowToken, 0)
+    view.clearFocus()
+}
+
+fun Fragment.hideKeyboard() {
+    activity?.hideKeyboard()
+}

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

@@ -12,11 +12,11 @@ import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.ALLOW
 import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.DENY
 import com.topjohnwu.magisk.core.su.SuRequestHandler
+import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 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.core.utils.BiometricHelper
 import com.topjohnwu.magisk.utils.DiffObservableList
 import com.topjohnwu.magisk.utils.KObservableField
 import me.tatarka.bindingcollectionadapter2.BindingListViewAdapter

app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt

@@ -2,13 +2,13 @@ package com.topjohnwu.magisk.model.entity.internal
 
 import android.content.Context
 import android.os.Parcelable
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.model.MagiskJson
+import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.model.module.Repo
 import com.topjohnwu.magisk.extensions.cachedFile
 import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.core.model.MagiskJson
-import com.topjohnwu.magisk.core.model.ManagerJson
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import java.io.File

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

@@ -7,12 +7,12 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.model.module.Repo
+import com.topjohnwu.magisk.core.utils.SafetyNetHelper
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.extensions.DynamicClassLoader
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.utils.RxBus
-import com.topjohnwu.magisk.core.utils.SafetyNetHelper
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.superuser.Shell

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.core.base.BaseActivity
+import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.model.events.ActivityExecutor
 import com.topjohnwu.magisk.model.events.ViewEvent
-import com.topjohnwu.magisk.core.utils.BiometricHelper
 
 class BiometricDialog(
     builder: Builder.() -> Unit

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

@@ -4,8 +4,8 @@ import android.content.DialogInterface
 import android.widget.Toast
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
-import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.core.utils.Utils
+import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import org.koin.core.KoinComponent

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

@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.events.dialog
 
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.extensions.res
 import com.topjohnwu.magisk.model.entity.internal.Configuration

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

@@ -1,12 +1,12 @@
 package com.topjohnwu.magisk.model.events.dialog
 
 import android.widget.Toast
-import com.topjohnwu.magisk.core.Info
 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.core.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.superuser.Shell
 

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

@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.model.events.ActivityExecutor
 import com.topjohnwu.magisk.model.events.ViewEvent
-import com.topjohnwu.magisk.ui.base.CompatActivity
+import com.topjohnwu.magisk.ui.base.BaseUIActivity
 import kotlin.reflect.KClass
 
 @DslMarker
@@ -24,7 +24,7 @@ class MagiskNavigationEvent(
     }
 
     override fun invoke(activity: BaseActivity) {
-        if (activity !is CompatActivity<*, *>) return
+        if (activity !is BaseUIActivity<*, *>) return
         activity.navigation?.navigateTo(this)
     }
 

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

@@ -17,7 +17,7 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
 import com.topjohnwu.magisk.extensions.startAnimations
 import com.topjohnwu.magisk.model.navigation.Navigation
-import com.topjohnwu.magisk.ui.base.CompatActivity
+import com.topjohnwu.magisk.ui.base.BaseUIActivity
 import com.topjohnwu.magisk.ui.base.CompatNavigationDelegate
 import com.topjohnwu.magisk.ui.home.HomeFragment
 import com.topjohnwu.magisk.ui.module.ModuleFragment
@@ -29,7 +29,7 @@ import com.topjohnwu.superuser.Shell
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import kotlin.reflect.KClass
 
-open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(),
+open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(),
     FragNavController.TransactionListener {
 
     override val layoutRes = R.layout.activity_main_md2

app/src/main/java/com/topjohnwu/magisk/ui/base/CompatActivity.kt

@@ -1,18 +0,0 @@
-package com.topjohnwu.magisk.ui.base
-
-import android.app.Activity
-import android.view.inputmethod.InputMethodManager
-import androidx.core.content.getSystemService
-import androidx.databinding.ViewDataBinding
-
-// TODO (diareuse): Merge into BaseUIActivity after all legacy UI is migrated
-
-abstract class CompatActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
-    BaseUIActivity<ViewModel, Binding>()
-
-fun Activity.hideKeyboard() {
-    val view = currentFocus ?: return
-    getSystemService<InputMethodManager>()
-        ?.hideSoftInputFromWindow(view.windowToken, 0)
-    view.clearFocus()
-}

app/src/main/java/com/topjohnwu/magisk/ui/base/CompatFragment.kt

@@ -1,11 +0,0 @@
-package com.topjohnwu.magisk.ui.base
-
-import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
-
-abstract class CompatFragment<ViewModel : BaseViewModel, Binding : ViewDataBinding>
-    : BaseUIFragment<ViewModel, Binding>(), CompatView<ViewModel>
-
-fun Fragment.hideKeyboard() {
-    activity?.hideKeyboard()
-}

app/src/main/java/com/topjohnwu/magisk/ui/base/CompatNavigationDelegate.kt

@@ -49,7 +49,7 @@ class CompatNavigationDelegate<out Source>(
     }
 
     fun onBackPressed(): Boolean {
-        val fragment = controller.currentFrag as? CompatFragment<*, *>
+        val fragment = controller.currentFrag as? BaseUIFragment<*, *>
 
         if (fragment?.onBackPressed() == true) {
             return true

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

@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.flash
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class FlashFragment : CompatFragment<FlashViewModel, FragmentFlashMd2Binding>() {
+class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_flash_md2
     override val viewModel by viewModel<FlashViewModel>()

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

@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
-import com.topjohnwu.magisk.ui.base.hideKeyboard
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
+class HideFragment : BaseUIFragment<HideViewModel, FragmentHideMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_hide_md2
     override val viewModel by viewModel<HideViewModel>()

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

@@ -6,10 +6,10 @@ import android.view.MenuItem
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
 import com.topjohnwu.magisk.model.navigation.Navigation
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
+class HomeFragment : BaseUIFragment<HomeViewModel, FragmentHomeMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_home_md2
     override val viewModel by viewModel<HomeViewModel>()

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

@@ -7,11 +7,11 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.RemoteFileService
-import com.topjohnwu.magisk.data.repository.MagiskRepository
-import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.core.model.MagiskJson
 import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.model.UpdateInfo
+import com.topjohnwu.magisk.data.repository.MagiskRepository
+import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Manager
 import com.topjohnwu.magisk.model.entity.recycler.DeveloperItem

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

@@ -4,10 +4,10 @@ import android.content.Intent
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
 import com.topjohnwu.magisk.model.events.RequestFileEvent
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class InstallFragment : CompatFragment<InstallViewModel, FragmentInstallMd2Binding>() {
+class InstallFragment : BaseUIFragment<InstallViewModel, FragmentInstallMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_install_md2
     override val viewModel by viewModel<InstallViewModel>()

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

@@ -9,11 +9,11 @@ import androidx.core.view.isVisible
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentLogMd2Binding
 import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class LogFragment : CompatFragment<LogViewModel, FragmentLogMd2Binding>() {
+class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_log_md2
     override val viewModel by viewModel<LogViewModel>()

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

@@ -15,14 +15,13 @@ import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.ui.MainActivity
 import com.topjohnwu.magisk.ui.ReselectionTarget
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
-import com.topjohnwu.magisk.ui.base.hideKeyboard
 import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import com.topjohnwu.magisk.utils.PinchZoomTouchListener
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>(),
+class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>(),
     ReselectionTarget {
 
     override val layoutRes = R.layout.fragment_module_md2

app/src/main/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt

@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.request
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ActivityRequestMd2Binding
-import com.topjohnwu.magisk.ui.base.CompatActivity
+import com.topjohnwu.magisk.ui.base.BaseUIActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class RequestActivity : CompatActivity<RequestViewModel, ActivityRequestMd2Binding>() {
+class RequestActivity : BaseUIActivity<RequestViewModel, ActivityRequestMd2Binding>() {
 
     override val navHost = TODO()
     override val layoutRes = R.layout.activity_request_md2

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

@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.safetynet
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd2Binding>() {
+class SafetynetFragment : BaseUIFragment<SafetynetViewModel, FragmentSafetynetMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_safetynet_md2
     override val viewModel by viewModel<SafetynetViewModel>()

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

@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.safetynet
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.utils.SafetyNetHelper
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.model.events.SafetyNetResult
 import com.topjohnwu.magisk.model.events.UpdateSafetyNetEvent
@@ -10,7 +11,6 @@ import com.topjohnwu.magisk.ui.base.BaseViewModel
 import com.topjohnwu.magisk.ui.safetynet.SafetyNetState.*
 import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.magisk.utils.RxBus
-import com.topjohnwu.magisk.core.utils.SafetyNetHelper
 
 enum class SafetyNetState {
     LOADING, PASS, FAILED, IDLE

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

@@ -4,11 +4,11 @@ import android.os.Bundle
 import android.view.View
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.PinchZoomTouchListener
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class SettingsFragment : CompatFragment<SettingsViewModel, FragmentSettingsMd2Binding>() {
+class SettingsFragment : BaseUIFragment<SettingsViewModel, FragmentSettingsMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_settings_md2
     override val viewModel by viewModel<SettingsViewModel>()

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

@@ -8,11 +8,11 @@ import android.view.View
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
 import com.topjohnwu.magisk.model.navigation.Navigation
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.PinchZoomTouchListener
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class SuperuserFragment : CompatFragment<SuperuserViewModel, FragmentSuperuserMd2Binding>() {
+class SuperuserFragment : BaseUIFragment<SuperuserViewModel, FragmentSuperuserMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_superuser_md2
     override val viewModel by viewModel<SuperuserViewModel>()

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

@@ -7,6 +7,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.MagiskPolicy
+import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.applySchedulers
@@ -24,7 +25,6 @@ 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 com.topjohnwu.magisk.core.utils.BiometricHelper
 import io.reactivex.Single
 import me.tatarka.bindingcollectionadapter2.collections.MergeObservableList
 

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

@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.theme
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
-import com.topjohnwu.magisk.ui.base.CompatFragment
+import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class ThemeFragment : CompatFragment<ThemeViewModel, FragmentThemeMd2Binding>() {
+class ThemeFragment : BaseUIFragment<ThemeViewModel, FragmentThemeMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_theme_md2
     override val viewModel by viewModel<ThemeViewModel>()