Rename base class names

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

@@ -18,7 +18,7 @@ import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.extensions.set
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
@@ -26,9 +26,9 @@ import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.currentLocale
 
-typealias RequestCallback = MagiskActivity<*, *>.(Int, Intent?) -> Unit
+typealias RequestCallback = BaseActivity<*, *>.(Int, Intent?) -> Unit
 
-abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
         AppCompatActivity(), EventHandler {
 
     protected lateinit var binding: Binding
@@ -66,7 +66,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
 
         binding = DataBindingUtil.setContentView<Binding>(this, layoutRes).apply {
             setVariable(BR.viewModel, viewModel)
-            lifecycleOwner = this@MagiskActivity
+            lifecycleOwner = this@BaseActivity
         }
     }
 
@@ -100,7 +100,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
         super.onActivityResult(requestCode, resultCode, data)
         resultCallbacks[requestCode]?.apply {
             resultCallbacks.remove(requestCode)
-            invoke(this@MagiskActivity, resultCode, data)
+            invoke(this@BaseActivity, resultCode, data)
         }
     }
 

app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt

@@ -9,15 +9,14 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.events.ViewEvent
-import com.topjohnwu.magisk.ui.MainActivity
 
-abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+abstract class BaseFragment<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
     Fragment(), EventHandler {
 
-    protected val activity get() = requireActivity() as MainActivity
+    protected val activity get() = requireActivity() as BaseActivity<*, *>
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
     protected abstract val viewModel: ViewModel
@@ -34,7 +33,7 @@ abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBin
     ): View? {
         binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).apply {
             setVariable(BR.viewModel, viewModel)
-            lifecycleOwner = this@MagiskFragment
+            lifecycleOwner = this@BaseFragment
         }
 
         return binding.root

app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt

@@ -14,7 +14,7 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener {
 
     protected val prefs: SharedPreferences by inject()
-    protected val activity get() = requireActivity() as MagiskActivity<*, *>
+    protected val activity get() = requireActivity() as BaseActivity<*, *>
 
     override fun onCreateView(
         inflater: LayoutInflater,

app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt

@@ -13,7 +13,7 @@ import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 
 
-abstract class MagiskViewModel(
+abstract class BaseViewModel(
     initialState: State = State.LOADING
 ) : LoadingViewModel(initialState) {