Rename base class names

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

@@ -12,8 +12,8 @@ import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const.Key.OPEN_SECTION
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseActivity
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.ActivityMainBinding
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.snackbar
@@ -35,7 +35,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 import kotlin.reflect.KClass
 
-open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>(), Navigator,
+open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Navigator,
         FragNavController.RootFragmentListener, FragNavController.TransactionListener {
 
     override val layoutRes: Int = R.layout.activity_main
@@ -102,7 +102,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>(),
     }
 
     override fun onBackPressed() {
-        val fragment = navigationController?.currentFrag as? MagiskFragment<*, *>
+        val fragment = navigationController?.currentFrag as? BaseFragment<*, *>
 
         if (fragment?.onBackPressed() == true) {
             return

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

@@ -2,11 +2,11 @@ package com.topjohnwu.magisk.ui
 
 import android.view.MenuItem
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.model.navigation.Navigation
 
 
-class MainViewModel : MagiskViewModel() {
+class MainViewModel : BaseViewModel() {
 
     fun navPressed() = Navigation.Main.OPEN_NAV.publish()
 

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

@@ -9,13 +9,13 @@ import androidx.core.net.toUri
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityFlashBinding
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.io.File
 
-open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>() {
+open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>() {
 
     override val layoutRes: Int = R.layout.activity_flash
     override val viewModel: FlashViewModel by viewModel {

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

@@ -11,7 +11,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
@@ -31,7 +31,7 @@ class FlashViewModel(
     installer: Uri,
     uri: Uri,
     private val resources: Resources
-) : MagiskViewModel(), FlashResultListener {
+) : BaseViewModel(), FlashResultListener {
 
     val canShowReboot = Shell.rootAccess()
     val showRestartTitle = KObservableField(false)

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

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.ui.hide
 
 import android.content.pm.ApplicationInfo
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
@@ -22,7 +22,7 @@ import timber.log.Timber
 class HideViewModel(
     private val magiskRepo: MagiskRepository,
     rxBus: RxBus
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val query = KObservableField("")
     val isShowSystem = KObservableField(false)

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

@@ -6,11 +6,11 @@ import android.view.MenuItem
 import android.widget.SearchView
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentMagiskHideBinding
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class MagiskHideFragment : MagiskFragment<HideViewModel, FragmentMagiskHideBinding>(),
+class MagiskHideFragment : BaseFragment<HideViewModel, FragmentMagiskHideBinding>(),
     SearchView.OnQueryTextListener {
 
     override val layoutRes: Int = R.layout.fragment_magisk_hide

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

@@ -5,8 +5,8 @@ import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseActivity
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
 import com.topjohnwu.magisk.extensions.inject
@@ -24,7 +24,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.io.File
 import java.lang.reflect.InvocationHandler
 
-class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
+class HomeFragment : BaseFragment<HomeViewModel, FragmentMagiskBinding>(),
     SafetyNetHelper.Callback {
 
     override val layoutRes: Int = R.layout.fragment_magisk
@@ -61,7 +61,7 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
             return
         }
 
-        MagiskInstallDialog(requireActivity() as MagiskActivity<*, *>).show()
+        MagiskInstallDialog(requireActivity() as BaseActivity<*, *>).show()
     }
 
     private fun installManager() = ManagerInstallDialog(requireActivity()).show()

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

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.ui.home
 
 import android.content.pm.PackageManager
 import com.topjohnwu.magisk.*
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.events.*
@@ -25,7 +25,7 @@ enum class MagiskItem {
 
 class HomeViewModel(
     private val magiskRepo: MagiskRepository
-) : MagiskViewModel(State.LOADED) {
+) : BaseViewModel(State.LOADED) {
 
     val hasGMS = runCatching {
         get<PackageManager>().getPackageInfo("com.google.android.gms", 0); true

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

@@ -7,13 +7,13 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentLogBinding
 import com.topjohnwu.magisk.model.events.PageChangedEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class LogFragment : MagiskFragment<LogViewModel, FragmentLogBinding>() {
+class LogFragment : BaseFragment<LogViewModel, FragmentLogBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_log
     override val viewModel: LogViewModel by viewModel()

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

@@ -5,7 +5,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
@@ -30,7 +30,7 @@ import java.util.*
 class LogViewModel(
     private val resources: Resources,
     private val logRepo: LogRepository
-) : MagiskViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
+) : BaseViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
 
     val itemsAdapter = BindingAdapter()
     val items = DiffObservableList(ComparableRvItem.callback)

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

@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.ui.module
 import android.content.res.Resources
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.*
@@ -25,7 +25,7 @@ class ModuleViewModel(
     private val resources: Resources,
     private val repoUpdater: RepoUpdater,
     private val repoDB: RepoDao
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val query = KObservableField("")
 

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

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentModulesBinding
 import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
@@ -20,7 +20,7 @@ import com.topjohnwu.magisk.ui.flash.FlashActivity
 import com.topjohnwu.superuser.Shell
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class ModulesFragment : MagiskFragment<ModuleViewModel, FragmentModulesBinding>() {
+class ModulesFragment : BaseFragment<ModuleViewModel, FragmentModulesBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_modules
     override val viewModel: ModuleViewModel by sharedViewModel()

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

@@ -8,7 +8,7 @@ import android.view.MenuItem
 import android.widget.SearchView
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentReposBinding
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.internal.Configuration
@@ -21,7 +21,7 @@ import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class ReposFragment : MagiskFragment<ModuleViewModel, FragmentReposBinding>(),
+class ReposFragment : BaseFragment<ModuleViewModel, FragmentReposBinding>(),
     SearchView.OnQueryTextListener {
 
     override val layoutRes: Int = R.layout.fragment_repos

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

@@ -1,12 +1,12 @@
 package com.topjohnwu.magisk.ui.superuser
 
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentSuperuserBinding
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SuperuserFragment :
-    MagiskFragment<SuperuserViewModel, FragmentSuperuserBinding>() {
+    BaseFragment<SuperuserViewModel, FragmentSuperuserBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_superuser
     override val viewModel: SuperuserViewModel by viewModel()

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

@@ -4,7 +4,7 @@ import android.content.pm.PackageManager
 import android.content.res.Resources
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.applySchedulers
@@ -29,7 +29,7 @@ class SuperuserViewModel(
     private val packageManager: PackageManager,
     private val resources: Resources,
     rxBus: RxBus
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val items = DiffObservableList(ComparableRvItem.callback)
     val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->

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

@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.Window
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityRequestBinding
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.events.DieEvent
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.model.receiver.GeneralReceiver
 import com.topjohnwu.magisk.utils.SuLogger
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-open class SuRequestActivity : MagiskActivity<SuRequestViewModel, ActivityRequestBinding>() {
+open class SuRequestActivity : BaseActivity<SuRequestViewModel, ActivityRequestBinding>() {
 
     override val layoutRes: Int = R.layout.activity_request
     override val viewModel: SuRequestViewModel by viewModel()

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

@@ -12,7 +12,7 @@ import android.text.TextUtils
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
@@ -36,7 +36,7 @@ class SuRequestViewModel(
     private val policyDB: PolicyDao,
     private val timeoutPrefs: SharedPreferences,
     private val resources: Resources
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val icon = KObservableField<Drawable?>(null)
     val title = KObservableField("")