Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
6b317f91
Commit
6b317f91
authored
Sep 28, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename base class names
parent
08b528dc
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
57 additions
and
58 deletions
+57
-58
BaseActivity.kt
app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
+5
-5
BaseFragment.kt
app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
+4
-5
BasePreferenceFragment.kt
.../java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt
+1
-1
BaseViewModel.kt
...java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt
+1
-1
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+4
-4
MainViewModel.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt
+2
-2
FlashActivity.kt
.../main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
+2
-2
FlashViewModel.kt
...main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+2
-2
HideViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
+2
-2
MagiskHideFragment.kt
...n/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt
+2
-2
HomeFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+4
-4
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+2
-2
LogFragment.kt
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+2
-2
LogViewModel.kt
...src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+2
-2
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+2
-2
ModulesFragment.kt
...in/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
+2
-2
ReposFragment.kt
...main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
+2
-2
SuperuserFragment.kt
...va/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+2
-2
SuperuserViewModel.kt
...a/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+2
-2
SuRequestActivity.kt
...va/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+2
-2
SuRequestViewModel.kt
...a/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+2
-2
InstallMethodDialog.kt
.../com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.kt
+6
-6
MagiskInstallDialog.kt
.../com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.kt
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/base/
Magisk
Activity.kt
→
app/src/main/java/com/topjohnwu/magisk/base/
Base
Activity.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
=
Magisk
Activity
<*,
*>.(
Int
,
Intent
?)
->
Unit
typealias
RequestCallback
=
Base
Activity
<*,
*>.(
Int
,
Intent
?)
->
Unit
abstract
class
MagiskActivity
<
ViewModel
:
Magisk
ViewModel
,
Binding
:
ViewDataBinding
>
:
abstract
class
BaseActivity
<
ViewModel
:
Base
ViewModel
,
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
@
Magisk
Activity
lifecycleOwner
=
this
@
Base
Activity
}
}
...
...
@@ -100,7 +100,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
resultCallbacks
[
requestCode
]
?.
apply
{
resultCallbacks
.
remove
(
requestCode
)
invoke
(
this
@
Magisk
Activity
,
resultCode
,
data
)
invoke
(
this
@
Base
Activity
,
resultCode
,
data
)
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/base/
Magisk
Fragment.kt
→
app/src/main/java/com/topjohnwu/magisk/base/
Base
Fragment.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
import
com.topjohnwu.magisk.model.events.EventHandler
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.ui.MainActivity
abstract
class
MagiskFragment
<
ViewModel
:
Magisk
ViewModel
,
Binding
:
ViewDataBinding
>
:
abstract
class
BaseFragment
<
ViewModel
:
Base
ViewModel
,
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
@
Magisk
Fragment
lifecycleOwner
=
this
@
Base
Fragment
}
return
binding
.
root
...
...
app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt
View file @
6b317f91
...
...
@@ -14,7 +14,7 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
SharedPreferences
.
OnSharedPreferenceChangeListener
{
protected
val
prefs
:
SharedPreferences
by
inject
()
protected
val
activity
get
()
=
requireActivity
()
as
Magisk
Activity
<*,
*>
protected
val
activity
get
()
=
requireActivity
()
as
Base
Activity
<*,
*>
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
...
...
app/src/main/java/com/topjohnwu/magisk/base/viewmodel/
Magisk
ViewModel.kt
→
app/src/main/java/com/topjohnwu/magisk/base/viewmodel/
Base
ViewModel.kt
View file @
6b317f91
...
...
@@ -13,7 +13,7 @@ import io.reactivex.Observable
import
io.reactivex.subjects.PublishSubject
abstract
class
Magisk
ViewModel
(
abstract
class
Base
ViewModel
(
initialState
:
State
=
State
.
LOADING
)
:
LoadingViewModel
(
initialState
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
Activity
import
com.topjohnwu.magisk.base.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Activity
import
com.topjohnwu.magisk.base.
Base
Fragment
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
:
Magisk
Activity
<
MainViewModel
,
ActivityMainBinding
>(),
Navigator
,
open
class
MainActivity
:
Base
Activity
<
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
?
Magisk
Fragment
<*,
*>
val
fragment
=
navigationController
?.
currentFrag
as
?
Base
Fragment
<*,
*>
if
(
fragment
?.
onBackPressed
()
==
true
)
{
return
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt
View file @
6b317f91
...
...
@@ -2,11 +2,11 @@ package com.topjohnwu.magisk.ui
import
android.view.MenuItem
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.base.viewmodel.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
import
com.topjohnwu.magisk.model.navigation.Navigation
class
MainViewModel
:
Magisk
ViewModel
()
{
class
MainViewModel
:
Base
ViewModel
()
{
fun
navPressed
()
=
Navigation
.
Main
.
OPEN_NAV
.
publish
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
Activity
import
com.topjohnwu.magisk.base.
Base
Activity
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
:
Magisk
Activity
<
FlashViewModel
,
ActivityFlashBinding
>()
{
open
class
FlashActivity
:
Base
Activity
<
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
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
(),
FlashResultListener
{
)
:
Base
ViewModel
(),
FlashResultListener
{
val
canShowReboot
=
Shell
.
rootAccess
()
val
showRestartTitle
=
KObservableField
(
false
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
()
{
)
:
Base
ViewModel
()
{
val
query
=
KObservableField
(
""
)
val
isShowSystem
=
KObservableField
(
false
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Fragment
import
com.topjohnwu.magisk.databinding.FragmentMagiskHideBinding
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
MagiskHideFragment
:
Magisk
Fragment
<
HideViewModel
,
FragmentMagiskHideBinding
>(),
class
MagiskHideFragment
:
Base
Fragment
<
HideViewModel
,
FragmentMagiskHideBinding
>(),
SearchView
.
OnQueryTextListener
{
override
val
layoutRes
:
Int
=
R
.
layout
.
fragment_magisk_hide
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
Activity
import
com.topjohnwu.magisk.base.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Activity
import
com.topjohnwu.magisk.base.
Base
Fragment
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
:
Magisk
Fragment
<
HomeViewModel
,
FragmentMagiskBinding
>(),
class
HomeFragment
:
Base
Fragment
<
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
Magisk
Activity
<*,
*>).
show
()
MagiskInstallDialog
(
requireActivity
()
as
Base
Activity
<*,
*>).
show
()
}
private
fun
installManager
()
=
ManagerInstallDialog
(
requireActivity
()).
show
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
(
State
.
LOADED
)
{
)
:
Base
ViewModel
(
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
View file @
6b317f91
...
...
@@ -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.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Fragment
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
:
Magisk
Fragment
<
LogViewModel
,
FragmentLogBinding
>()
{
class
LogFragment
:
Base
Fragment
<
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
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
(),
BindingViewPagerAdapter
.
PageTitles
<
ComparableRvItem
<*>>
{
)
:
Base
ViewModel
(),
BindingViewPagerAdapter
.
PageTitles
<
ComparableRvItem
<*>>
{
val
itemsAdapter
=
BindingAdapter
()
val
items
=
DiffObservableList
(
ComparableRvItem
.
callback
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
()
{
)
:
Base
ViewModel
()
{
val
query
=
KObservableField
(
""
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Fragment
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
:
Magisk
Fragment
<
ModuleViewModel
,
FragmentModulesBinding
>()
{
class
ModulesFragment
:
Base
Fragment
<
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
View file @
6b317f91
...
...
@@ -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.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Fragment
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
:
Magisk
Fragment
<
ModuleViewModel
,
FragmentReposBinding
>(),
class
ReposFragment
:
Base
Fragment
<
ModuleViewModel
,
FragmentReposBinding
>(),
SearchView
.
OnQueryTextListener
{
override
val
layoutRes
:
Int
=
R
.
layout
.
fragment_repos
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View file @
6b317f91
package
com.topjohnwu.magisk.ui.superuser
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.base.
Magisk
Fragment
import
com.topjohnwu.magisk.base.
Base
Fragment
import
com.topjohnwu.magisk.databinding.FragmentSuperuserBinding
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SuperuserFragment
:
Magisk
Fragment
<
SuperuserViewModel
,
FragmentSuperuserBinding
>()
{
Base
Fragment
<
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
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
()
{
)
:
Base
ViewModel
()
{
val
items
=
DiffObservableList
(
ComparableRvItem
.
callback
)
val
itemBinding
=
ItemBinding
.
of
<
ComparableRvItem
<*>>
{
itemBinding
,
_
,
item
->
...
...
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
View file @
6b317f91
...
...
@@ -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.
Magisk
Activity
import
com.topjohnwu.magisk.base.
Base
Activity
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
:
Magisk
Activity
<
SuRequestViewModel
,
ActivityRequestBinding
>()
{
open
class
SuRequestActivity
:
Base
Activity
<
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
View file @
6b317f91
...
...
@@ -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.
Magisk
ViewModel
import
com.topjohnwu.magisk.base.viewmodel.
Base
ViewModel
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
)
:
Magisk
ViewModel
()
{
)
:
Base
ViewModel
()
{
val
icon
=
KObservableField
<
Drawable
?>(
null
)
val
title
=
KObservableField
(
""
)
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.kt
View file @
6b317f91
...
...
@@ -7,13 +7,13 @@ import android.widget.Toast
import
androidx.appcompat.app.AlertDialog
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.base.
Magisk
Activity
import
com.topjohnwu.magisk.base.
Base
Activity
import
com.topjohnwu.magisk.model.download.DownloadService
import
com.topjohnwu.magisk.model.entity.internal.Configuration
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.utils.Utils
internal
class
InstallMethodDialog
(
activity
:
Magisk
Activity
<
*
,
*
>,
options
:
List
<
String
>)
:
internal
class
InstallMethodDialog
(
activity
:
Base
Activity
<
*
,
*
>,
options
:
List
<
String
>)
:
AlertDialog
.
Builder
(
activity
)
{
init
{
...
...
@@ -28,11 +28,11 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
}
}
private
fun
flash
(
activity
:
Magisk
Activity
<
*
,
*
>)
=
DownloadService
(
activity
)
{
private
fun
flash
(
activity
:
Base
Activity
<
*
,
*
>)
=
DownloadService
(
activity
)
{
subject
=
DownloadSubject
.
Magisk
(
Configuration
.
Flash
.
Primary
)
}
private
fun
patchBoot
(
activity
:
Magisk
Activity
<
*
,
*
>)
=
activity
.
withExternalRW
{
private
fun
patchBoot
(
activity
:
Base
Activity
<
*
,
*
>)
=
activity
.
withExternalRW
{
onSuccess
{
Utils
.
toast
(
R
.
string
.
patch_file_msg
,
Toast
.
LENGTH_LONG
)
val
intent
=
Intent
(
Intent
.
ACTION_GET_CONTENT
)
...
...
@@ -49,7 +49,7 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
}
}
private
fun
downloadOnly
(
activity
:
Magisk
Activity
<
*
,
*
>)
=
activity
.
withExternalRW
{
private
fun
downloadOnly
(
activity
:
Base
Activity
<
*
,
*
>)
=
activity
.
withExternalRW
{
onSuccess
{
DownloadService
(
activity
)
{
subject
=
DownloadSubject
.
Magisk
(
Configuration
.
Download
)
...
...
@@ -57,7 +57,7 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
}
}
private
fun
installInactiveSlot
(
activity
:
Magisk
Activity
<
*
,
*
>)
{
private
fun
installInactiveSlot
(
activity
:
Base
Activity
<
*
,
*
>)
{
CustomAlertDialog
(
activity
)
.
setTitle
(
R
.
string
.
warning
)
.
setMessage
(
R
.
string
.
install_inactive_slot_msg
)
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.kt
View file @
6b317f91
...
...
@@ -3,14 +3,14 @@ package com.topjohnwu.magisk.view.dialogs
import
android.net.Uri
import
com.topjohnwu.magisk.Info
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.base.
Magisk
Activity
import
com.topjohnwu.magisk.base.
Base
Activity
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.view.MarkDownWindow
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.ShellUtils
import
java.util.*
class
MagiskInstallDialog
(
a
:
Magisk
Activity
<
*
,
*
>)
:
CustomAlertDialog
(
a
)
{
class
MagiskInstallDialog
(
a
:
Base
Activity
<
*
,
*
>)
:
CustomAlertDialog
(
a
)
{
init
{
val
filename
=
"Magisk v${Info.remote.magisk.version}"
+
"(${Info.remote.magisk.versionCode})"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment