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
d0112f98
Commit
d0112f98
authored
Jan 28, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup classes
parent
9c4c310f
Show whitespace changes
Inline
Side-by-side
Showing
36 changed files
with
68 additions
and
84 deletions
+68
-84
Config.kt
app/src/main/java/com/topjohnwu/magisk/core/Config.kt
+2
-2
SplashActivity.kt
...src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
+1
-1
RemoteFileService.kt
...a/com/topjohnwu/magisk/core/download/RemoteFileService.kt
+2
-2
SuCallbackHandler.kt
...in/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
+1
-1
FlashZip.kt
...src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
+1
-1
MagiskInstaller.kt
...n/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+1
-1
PatchAPK.kt
...src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
+1
-1
GithubServices.kt
.../java/com/topjohnwu/magisk/data/network/GithubServices.kt
+1
-1
MagiskRepository.kt
.../com/topjohnwu/magisk/data/repository/MagiskRepository.kt
+1
-1
XAndroid.kt
...src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
+16
-1
SuRequestViewModel.kt
...m/topjohnwu/magisk/legacy/surequest/SuRequestViewModel.kt
+1
-1
DownloadSubject.kt
...topjohnwu/magisk/model/entity/internal/DownloadSubject.kt
+3
-3
ViewEvents.kt
...main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+1
-1
BiometricDialog.kt
...m/topjohnwu/magisk/model/events/dialog/BiometricDialog.kt
+1
-1
EnvFixDialog.kt
.../com/topjohnwu/magisk/model/events/dialog/EnvFixDialog.kt
+1
-1
ManagerInstallDialog.kt
...johnwu/magisk/model/events/dialog/ManagerInstallDialog.kt
+1
-1
UninstallDialog.kt
...m/topjohnwu/magisk/model/events/dialog/UninstallDialog.kt
+2
-2
MagiskNavigationEvent.kt
...opjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt
+2
-2
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+2
-2
CompatActivity.kt
.../main/java/com/topjohnwu/magisk/ui/base/CompatActivity.kt
+0
-18
CompatFragment.kt
.../main/java/com/topjohnwu/magisk/ui/base/CompatFragment.kt
+0
-11
CompatNavigationDelegate.kt
.../com/topjohnwu/magisk/ui/base/CompatNavigationDelegate.kt
+1
-1
FlashFragment.kt
.../main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
+2
-2
HideFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
+2
-3
HomeFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+2
-2
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+2
-2
InstallFragment.kt
...n/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
+2
-2
LogFragment.kt
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+2
-2
ModuleFragment.kt
...ain/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
+2
-3
RequestActivity.kt
...n/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt
+2
-2
SafetynetFragment.kt
...va/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
+2
-2
SafetynetViewModel.kt
...a/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+1
-1
SettingsFragment.kt
...java/com/topjohnwu/magisk/ui/settings/SettingsFragment.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
+1
-1
ThemeFragment.kt
.../main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/core/Config.kt
View file @
d0112f98
...
@@ -9,14 +9,14 @@ import androidx.core.content.edit
...
@@ -9,14 +9,14 @@ import androidx.core.content.edit
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.core.magiskdb.SettingsDao
import
com.topjohnwu.magisk.core.magiskdb.SettingsDao
import
com.topjohnwu.magisk.core.magiskdb.StringDao
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.data.repository.DBConfig
import
com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.inject
import
com.topjohnwu.magisk.extensions.inject
import
com.topjohnwu.magisk.model.preference.PreferenceModel
import
com.topjohnwu.magisk.model.preference.PreferenceModel
import
com.topjohnwu.magisk.ui.theme.Theme
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.Shell
import
com.topjohnwu.superuser.io.SuFile
import
com.topjohnwu.superuser.io.SuFile
import
com.topjohnwu.superuser.io.SuFileInputStream
import
com.topjohnwu.superuser.io.SuFileInputStream
...
...
app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
View file @
d0112f98
...
@@ -4,10 +4,10 @@ import android.app.Activity
...
@@ -4,10 +4,10 @@ import android.app.Activity
import
android.content.Context
import
android.content.Context
import
android.os.Bundle
import
android.os.Bundle
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.core.view.Shortcuts
import
com.topjohnwu.magisk.core.view.Shortcuts
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.ShellUtils
import
com.topjohnwu.superuser.ShellUtils
...
...
app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt
View file @
d0112f98
...
@@ -6,6 +6,8 @@ import android.content.Intent
...
@@ -6,6 +6,8 @@ import android.content.Intent
import
androidx.lifecycle.LiveData
import
androidx.lifecycle.LiveData
import
androidx.lifecycle.MutableLiveData
import
androidx.lifecycle.MutableLiveData
import
com.topjohnwu.magisk.R
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.data.network.GithubRawServices
import
com.topjohnwu.magisk.di.NullActivity
import
com.topjohnwu.magisk.di.NullActivity
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.get
...
@@ -13,8 +15,6 @@ import com.topjohnwu.magisk.extensions.subscribeK
...
@@ -13,8 +15,6 @@ import com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.writeTo
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.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
com.topjohnwu.superuser.ShellUtils
import
io.reactivex.Completable
import
io.reactivex.Completable
import
okhttp3.ResponseBody
import
okhttp3.ResponseBody
...
...
app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
View file @
d0112f98
...
@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.core.Config
...
@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.intent
import
com.topjohnwu.magisk.core.intent
import
com.topjohnwu.magisk.core.model.MagiskPolicy
import
com.topjohnwu.magisk.core.model.MagiskPolicy
import
com.topjohnwu.magisk.core.model.toPolicy
import
com.topjohnwu.magisk.core.model.toPolicy
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.data.repository.LogRepository
import
com.topjohnwu.magisk.data.repository.LogRepository
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.get
...
@@ -21,7 +22,6 @@ import com.topjohnwu.magisk.extensions.startActivityWithRoot
...
@@ -21,7 +22,6 @@ import com.topjohnwu.magisk.extensions.startActivityWithRoot
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import
com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import
com.topjohnwu.magisk.model.entity.toLog
import
com.topjohnwu.magisk.model.entity.toLog
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
timber.log.Timber
import
timber.log.Timber
...
...
app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
View file @
d0112f98
...
@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.core.tasks
...
@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.core.tasks
import
android.content.Context
import
android.content.Context
import
android.net.Uri
import
android.net.Uri
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.utils.unzip
import
com.topjohnwu.magisk.extensions.fileName
import
com.topjohnwu.magisk.extensions.fileName
import
com.topjohnwu.magisk.extensions.inject
import
com.topjohnwu.magisk.extensions.inject
import
com.topjohnwu.magisk.extensions.readUri
import
com.topjohnwu.magisk.extensions.readUri
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.core.utils.unzip
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
io.reactivex.Single
import
io.reactivex.Single
import
java.io.File
import
java.io.File
...
...
app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View file @
d0112f98
...
@@ -7,8 +7,8 @@ import android.text.TextUtils
...
@@ -7,8 +7,8 @@ import android.text.TextUtils
import
androidx.annotation.MainThread
import
androidx.annotation.MainThread
import
androidx.annotation.WorkerThread
import
androidx.annotation.WorkerThread
import
androidx.core.net.toUri
import
androidx.core.net.toUri
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.extensions.*
import
com.topjohnwu.magisk.extensions.*
...
...
app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
View file @
d0112f98
...
@@ -9,12 +9,12 @@ import com.topjohnwu.magisk.core.Config
...
@@ -9,12 +9,12 @@ import com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.extensions.DynamicClassLoader
import
com.topjohnwu.magisk.extensions.DynamicClassLoader
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.writeTo
import
com.topjohnwu.magisk.extensions.writeTo
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.signing.JarMap
import
com.topjohnwu.signing.JarMap
import
com.topjohnwu.signing.SignAPK
import
com.topjohnwu.signing.SignAPK
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
...
...
app/src/main/java/com/topjohnwu/magisk/data/network/GithubServices.kt
View file @
d0112f98
package
com.topjohnwu.magisk.data.network
package
com.topjohnwu.magisk.data.network
import
com.topjohnwu.magisk.core.Const
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.model.UpdateInfo
import
com.topjohnwu.magisk.core.tasks.GithubRepoInfo
import
io.reactivex.Flowable
import
io.reactivex.Flowable
import
io.reactivex.Single
import
io.reactivex.Single
import
okhttp3.ResponseBody
import
okhttp3.ResponseBody
...
...
app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt
View file @
d0112f98
package
com.topjohnwu.magisk.data.repository
package
com.topjohnwu.magisk.data.repository
import
android.content.pm.PackageManager
import
android.content.pm.PackageManager
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.extensions.getLabel
import
com.topjohnwu.magisk.extensions.getLabel
import
com.topjohnwu.magisk.extensions.packageName
import
com.topjohnwu.magisk.extensions.packageName
...
...
app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
View file @
d0112f98
package
com.topjohnwu.magisk.extensions
package
com.topjohnwu.magisk.extensions
import
android.app.Activity
import
android.content.ComponentName
import
android.content.ComponentName
import
android.content.Context
import
android.content.Context
import
android.content.ContextWrapper
import
android.content.ContextWrapper
...
@@ -22,17 +23,20 @@ import android.os.Build
...
@@ -22,17 +23,20 @@ import android.os.Build
import
android.os.Build.VERSION.SDK_INT
import
android.os.Build.VERSION.SDK_INT
import
android.provider.OpenableColumns
import
android.provider.OpenableColumns
import
android.view.View
import
android.view.View
import
android.view.inputmethod.InputMethodManager
import
androidx.annotation.ColorRes
import
androidx.annotation.ColorRes
import
androidx.annotation.DrawableRes
import
androidx.annotation.DrawableRes
import
androidx.appcompat.content.res.AppCompatResources
import
androidx.appcompat.content.res.AppCompatResources
import
androidx.core.content.ContextCompat
import
androidx.core.content.ContextCompat
import
androidx.core.content.getSystemService
import
androidx.core.net.toFile
import
androidx.core.net.toFile
import
androidx.core.net.toUri
import
androidx.core.net.toUri
import
androidx.fragment.app.Fragment
import
com.topjohnwu.magisk.FileProvider
import
com.topjohnwu.magisk.FileProvider
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.utils.DynamicClassLoader
import
com.topjohnwu.magisk.utils.DynamicClassLoader
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.ShellUtils
import
com.topjohnwu.superuser.ShellUtils
import
java.io.File
import
java.io.File
...
@@ -347,3 +351,14 @@ val isAB
...
@@ -347,3 +351,14 @@ val isAB
get
()
=
ShellUtils
get
()
=
ShellUtils
.
fastCmd
(
"grep_prop ro.build.ab_update"
)
.
fastCmd
(
"grep_prop ro.build.ab_update"
)
.
let
{
it
.
isNotEmpty
()
&&
it
.
toBoolean
()
}
.
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
View file @
d0112f98
...
@@ -12,11 +12,11 @@ import com.topjohnwu.magisk.core.magiskdb.PolicyDao
...
@@ -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.ALLOW
import
com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.DENY
import
com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.DENY
import
com.topjohnwu.magisk.core.su.SuRequestHandler
import
com.topjohnwu.magisk.core.su.SuRequestHandler
import
com.topjohnwu.magisk.core.utils.BiometricHelper
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
import
com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
import
com.topjohnwu.magisk.model.events.DieEvent
import
com.topjohnwu.magisk.model.events.DieEvent
import
com.topjohnwu.magisk.ui.base.BaseViewModel
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.DiffObservableList
import
com.topjohnwu.magisk.utils.KObservableField
import
com.topjohnwu.magisk.utils.KObservableField
import
me.tatarka.bindingcollectionadapter2.BindingListViewAdapter
import
me.tatarka.bindingcollectionadapter2.BindingListViewAdapter
...
...
app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt
View file @
d0112f98
...
@@ -2,13 +2,13 @@ package com.topjohnwu.magisk.model.entity.internal
...
@@ -2,13 +2,13 @@ package com.topjohnwu.magisk.model.entity.internal
import
android.content.Context
import
android.content.Context
import
android.os.Parcelable
import
android.os.Parcelable
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Config
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.core.model.module.Repo
import
com.topjohnwu.magisk.extensions.cachedFile
import
com.topjohnwu.magisk.extensions.cachedFile
import
com.topjohnwu.magisk.extensions.get
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.IgnoredOnParcel
import
kotlinx.android.parcel.Parcelize
import
kotlinx.android.parcel.Parcelize
import
java.io.File
import
java.io.File
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
View file @
d0112f98
...
@@ -7,12 +7,12 @@ import com.topjohnwu.magisk.R
...
@@ -7,12 +7,12 @@ import com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.model.module.Repo
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.data.repository.MagiskRepository
import
com.topjohnwu.magisk.extensions.DynamicClassLoader
import
com.topjohnwu.magisk.extensions.DynamicClassLoader
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.writeTo
import
com.topjohnwu.magisk.extensions.writeTo
import
com.topjohnwu.magisk.utils.RxBus
import
com.topjohnwu.magisk.utils.RxBus
import
com.topjohnwu.magisk.core.utils.SafetyNetHelper
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MarkDownWindow
import
com.topjohnwu.magisk.view.MarkDownWindow
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/BiometricDialog.kt
View file @
d0112f98
package
com.topjohnwu.magisk.model.events.dialog
package
com.topjohnwu.magisk.model.events.dialog
import
com.topjohnwu.magisk.core.base.BaseActivity
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.ActivityExecutor
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.core.utils.BiometricHelper
class
BiometricDialog
(
class
BiometricDialog
(
builder
:
Builder
.()
->
Unit
builder
:
Builder
.()
->
Unit
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/EnvFixDialog.kt
View file @
d0112f98
...
@@ -4,8 +4,8 @@ import android.content.DialogInterface
...
@@ -4,8 +4,8 @@ import android.content.DialogInterface
import
android.widget.Toast
import
android.widget.Toast
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.tasks.MagiskInstaller
import
com.topjohnwu.magisk.core.tasks.MagiskInstaller
import
com.topjohnwu.magisk.extensions.reboot
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.extensions.reboot
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
org.koin.core.KoinComponent
import
org.koin.core.KoinComponent
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/ManagerInstallDialog.kt
View file @
d0112f98
package
com.topjohnwu.magisk.model.events.dialog
package
com.topjohnwu.magisk.model.events.dialog
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.extensions.res
import
com.topjohnwu.magisk.extensions.res
import
com.topjohnwu.magisk.model.entity.internal.Configuration
import
com.topjohnwu.magisk.model.entity.internal.Configuration
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/UninstallDialog.kt
View file @
d0112f98
package
com.topjohnwu.magisk.model.events.dialog
package
com.topjohnwu.magisk.model.events.dialog
import
android.widget.Toast
import
android.widget.Toast
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.download.DownloadService
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.Configuration
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
...
...
app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt
View file @
d0112f98
...
@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
...
@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.model.events.ActivityExecutor
import
com.topjohnwu.magisk.model.events.ActivityExecutor
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.ui.base.
Compat
Activity
import
com.topjohnwu.magisk.ui.base.
BaseUI
Activity
import
kotlin.reflect.KClass
import
kotlin.reflect.KClass
@DslMarker
@DslMarker
...
@@ -24,7 +24,7 @@ class MagiskNavigationEvent(
...
@@ -24,7 +24,7 @@ class MagiskNavigationEvent(
}
}
override
fun
invoke
(
activity
:
BaseActivity
)
{
override
fun
invoke
(
activity
:
BaseActivity
)
{
if
(
activity
!
is
Compat
Activity
<*,
*>)
return
if
(
activity
!
is
BaseUI
Activity
<*,
*>)
return
activity
.
navigation
?.
navigateTo
(
this
)
activity
.
navigation
?.
navigateTo
(
this
)
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
d0112f98
...
@@ -17,7 +17,7 @@ import com.topjohnwu.magisk.core.Const
...
@@ -17,7 +17,7 @@ import com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.extensions.startAnimations
import
com.topjohnwu.magisk.extensions.startAnimations
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.ui.base.
Compat
Activity
import
com.topjohnwu.magisk.ui.base.
BaseUI
Activity
import
com.topjohnwu.magisk.ui.base.CompatNavigationDelegate
import
com.topjohnwu.magisk.ui.base.CompatNavigationDelegate
import
com.topjohnwu.magisk.ui.home.HomeFragment
import
com.topjohnwu.magisk.ui.home.HomeFragment
import
com.topjohnwu.magisk.ui.module.ModuleFragment
import
com.topjohnwu.magisk.ui.module.ModuleFragment
...
@@ -29,7 +29,7 @@ import com.topjohnwu.superuser.Shell
...
@@ -29,7 +29,7 @@ import com.topjohnwu.superuser.Shell
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
kotlin.reflect.KClass
import
kotlin.reflect.KClass
open
class
MainActivity
:
Compat
Activity
<
MainViewModel
,
ActivityMainMd2Binding
>(),
open
class
MainActivity
:
BaseUI
Activity
<
MainViewModel
,
ActivityMainMd2Binding
>(),
FragNavController
.
TransactionListener
{
FragNavController
.
TransactionListener
{
override
val
layoutRes
=
R
.
layout
.
activity_main_md2
override
val
layoutRes
=
R
.
layout
.
activity_main_md2
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/CompatActivity.kt
deleted
100644 → 0
View file @
9c4c310f
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
deleted
100644 → 0
View file @
9c4c310f
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
View file @
d0112f98
...
@@ -49,7 +49,7 @@ class CompatNavigationDelegate<out Source>(
...
@@ -49,7 +49,7 @@ class CompatNavigationDelegate<out Source>(
}
}
fun
onBackPressed
():
Boolean
{
fun
onBackPressed
():
Boolean
{
val
fragment
=
controller
.
currentFrag
as
?
Compat
Fragment
<*,
*>
val
fragment
=
controller
.
currentFrag
as
?
BaseUI
Fragment
<*,
*>
if
(
fragment
?.
onBackPressed
()
==
true
)
{
if
(
fragment
?.
onBackPressed
()
==
true
)
{
return
true
return
true
...
...
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
View file @
d0112f98
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.flash
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.flash
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
FlashFragment
:
Compat
Fragment
<
FlashViewModel
,
FragmentFlashMd2Binding
>()
{
class
FlashFragment
:
BaseUI
Fragment
<
FlashViewModel
,
FragmentFlashMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_flash_md2
override
val
layoutRes
=
R
.
layout
.
fragment_flash_md2
override
val
viewModel
by
viewModel
<
FlashViewModel
>()
override
val
viewModel
by
viewModel
<
FlashViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
View file @
d0112f98
...
@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
...
@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
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
com.topjohnwu.magisk.utils.MotionRevealHelper
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
HideFragment
:
Compat
Fragment
<
HideViewModel
,
FragmentHideMd2Binding
>()
{
class
HideFragment
:
BaseUI
Fragment
<
HideViewModel
,
FragmentHideMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_hide_md2
override
val
layoutRes
=
R
.
layout
.
fragment_hide_md2
override
val
viewModel
by
viewModel
<
HideViewModel
>()
override
val
viewModel
by
viewModel
<
HideViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View file @
d0112f98
...
@@ -6,10 +6,10 @@ import android.view.MenuItem
...
@@ -6,10 +6,10 @@ import android.view.MenuItem
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
HomeFragment
:
Compat
Fragment
<
HomeViewModel
,
FragmentHomeMd2Binding
>()
{
class
HomeFragment
:
BaseUI
Fragment
<
HomeViewModel
,
FragmentHomeMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_home_md2
override
val
layoutRes
=
R
.
layout
.
fragment_home_md2
override
val
viewModel
by
viewModel
<
HomeViewModel
>()
override
val
viewModel
by
viewModel
<
HomeViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
d0112f98
...
@@ -7,11 +7,11 @@ import com.topjohnwu.magisk.R
...
@@ -7,11 +7,11 @@ import com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.download.RemoteFileService
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.MagiskJson
import
com.topjohnwu.magisk.core.model.ManagerJson
import
com.topjohnwu.magisk.core.model.ManagerJson
import
com.topjohnwu.magisk.core.model.UpdateInfo
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.Magisk
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Manager
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Manager
import
com.topjohnwu.magisk.model.entity.recycler.DeveloperItem
import
com.topjohnwu.magisk.model.entity.recycler.DeveloperItem
...
...
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
View file @
d0112f98
...
@@ -4,10 +4,10 @@ import android.content.Intent
...
@@ -4,10 +4,10 @@ import android.content.Intent
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
import
com.topjohnwu.magisk.model.events.RequestFileEvent
import
com.topjohnwu.magisk.model.events.RequestFileEvent
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
InstallFragment
:
Compat
Fragment
<
InstallViewModel
,
FragmentInstallMd2Binding
>()
{
class
InstallFragment
:
BaseUI
Fragment
<
InstallViewModel
,
FragmentInstallMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_install_md2
override
val
layoutRes
=
R
.
layout
.
fragment_install_md2
override
val
viewModel
by
viewModel
<
InstallViewModel
>()
override
val
viewModel
by
viewModel
<
InstallViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View file @
d0112f98
...
@@ -9,11 +9,11 @@ import androidx.core.view.isVisible
...
@@ -9,11 +9,11 @@ import androidx.core.view.isVisible
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentLogMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentLogMd2Binding
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
com.topjohnwu.magisk.utils.MotionRevealHelper
import
com.topjohnwu.magisk.utils.MotionRevealHelper
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
LogFragment
:
Compat
Fragment
<
LogViewModel
,
FragmentLogMd2Binding
>()
{
class
LogFragment
:
BaseUI
Fragment
<
LogViewModel
,
FragmentLogMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_log_md2
override
val
layoutRes
=
R
.
layout
.
fragment_log_md2
override
val
viewModel
by
viewModel
<
LogViewModel
>()
override
val
viewModel
by
viewModel
<
LogViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View file @
d0112f98
...
@@ -15,14 +15,13 @@ import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
...
@@ -15,14 +15,13 @@ import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.model.events.ViewEvent
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.ReselectionTarget
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.EndlessRecyclerScrollListener
import
com.topjohnwu.magisk.utils.MotionRevealHelper
import
com.topjohnwu.magisk.utils.MotionRevealHelper
import
com.topjohnwu.magisk.utils.PinchZoomTouchListener
import
com.topjohnwu.magisk.utils.PinchZoomTouchListener
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
ModuleFragment
:
Compat
Fragment
<
ModuleViewModel
,
FragmentModuleMd2Binding
>(),
class
ModuleFragment
:
BaseUI
Fragment
<
ModuleViewModel
,
FragmentModuleMd2Binding
>(),
ReselectionTarget
{
ReselectionTarget
{
override
val
layoutRes
=
R
.
layout
.
fragment_module_md2
override
val
layoutRes
=
R
.
layout
.
fragment_module_md2
...
...
app/src/main/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt
View file @
d0112f98
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.request
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.request
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.ActivityRequestMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityRequestMd2Binding
import
com.topjohnwu.magisk.ui.base.
Compat
Activity
import
com.topjohnwu.magisk.ui.base.
BaseUI
Activity
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
RequestActivity
:
Compat
Activity
<
RequestViewModel
,
ActivityRequestMd2Binding
>()
{
class
RequestActivity
:
BaseUI
Activity
<
RequestViewModel
,
ActivityRequestMd2Binding
>()
{
override
val
navHost
=
TODO
()
override
val
navHost
=
TODO
()
override
val
layoutRes
=
R
.
layout
.
activity_request_md2
override
val
layoutRes
=
R
.
layout
.
activity_request_md2
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
View file @
d0112f98
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.safetynet
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.safetynet
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SafetynetFragment
:
Compat
Fragment
<
SafetynetViewModel
,
FragmentSafetynetMd2Binding
>()
{
class
SafetynetFragment
:
BaseUI
Fragment
<
SafetynetViewModel
,
FragmentSafetynetMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_safetynet_md2
override
val
layoutRes
=
R
.
layout
.
fragment_safetynet_md2
override
val
viewModel
by
viewModel
<
SafetynetViewModel
>()
override
val
viewModel
by
viewModel
<
SafetynetViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View file @
d0112f98
...
@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.safetynet
...
@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.safetynet
import
androidx.databinding.Bindable
import
androidx.databinding.Bindable
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.utils.SafetyNetHelper
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.model.events.SafetyNetResult
import
com.topjohnwu.magisk.model.events.SafetyNetResult
import
com.topjohnwu.magisk.model.events.UpdateSafetyNetEvent
import
com.topjohnwu.magisk.model.events.UpdateSafetyNetEvent
...
@@ -10,7 +11,6 @@ import com.topjohnwu.magisk.ui.base.BaseViewModel
...
@@ -10,7 +11,6 @@ import com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.safetynet.SafetyNetState.*
import
com.topjohnwu.magisk.ui.safetynet.SafetyNetState.*
import
com.topjohnwu.magisk.utils.KObservableField
import
com.topjohnwu.magisk.utils.KObservableField
import
com.topjohnwu.magisk.utils.RxBus
import
com.topjohnwu.magisk.utils.RxBus
import
com.topjohnwu.magisk.core.utils.SafetyNetHelper
enum
class
SafetyNetState
{
enum
class
SafetyNetState
{
LOADING
,
PASS
,
FAILED
,
IDLE
LOADING
,
PASS
,
FAILED
,
IDLE
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View file @
d0112f98
...
@@ -4,11 +4,11 @@ import android.os.Bundle
...
@@ -4,11 +4,11 @@ import android.os.Bundle
import
android.view.View
import
android.view.View
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
com.topjohnwu.magisk.utils.PinchZoomTouchListener
import
com.topjohnwu.magisk.utils.PinchZoomTouchListener
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SettingsFragment
:
Compat
Fragment
<
SettingsViewModel
,
FragmentSettingsMd2Binding
>()
{
class
SettingsFragment
:
BaseUI
Fragment
<
SettingsViewModel
,
FragmentSettingsMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_settings_md2
override
val
layoutRes
=
R
.
layout
.
fragment_settings_md2
override
val
viewModel
by
viewModel
<
SettingsViewModel
>()
override
val
viewModel
by
viewModel
<
SettingsViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View file @
d0112f98
...
@@ -8,11 +8,11 @@ import android.view.View
...
@@ -8,11 +8,11 @@ import android.view.View
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
com.topjohnwu.magisk.utils.PinchZoomTouchListener
import
com.topjohnwu.magisk.utils.PinchZoomTouchListener
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SuperuserFragment
:
Compat
Fragment
<
SuperuserViewModel
,
FragmentSuperuserMd2Binding
>()
{
class
SuperuserFragment
:
BaseUI
Fragment
<
SuperuserViewModel
,
FragmentSuperuserMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_superuser_md2
override
val
layoutRes
=
R
.
layout
.
fragment_superuser_md2
override
val
viewModel
by
viewModel
<
SuperuserViewModel
>()
override
val
viewModel
by
viewModel
<
SuperuserViewModel
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
View file @
d0112f98
...
@@ -7,6 +7,7 @@ import com.topjohnwu.magisk.BR
...
@@ -7,6 +7,7 @@ import com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
import
com.topjohnwu.magisk.core.model.MagiskPolicy
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.core.utils.currentLocale
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.extensions.applySchedulers
import
com.topjohnwu.magisk.extensions.applySchedulers
...
@@ -24,7 +25,6 @@ import com.topjohnwu.magisk.ui.base.BaseViewModel
...
@@ -24,7 +25,6 @@ import com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.base.adapterOf
import
com.topjohnwu.magisk.ui.base.adapterOf
import
com.topjohnwu.magisk.ui.base.diffListOf
import
com.topjohnwu.magisk.ui.base.diffListOf
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.core.utils.BiometricHelper
import
io.reactivex.Single
import
io.reactivex.Single
import
me.tatarka.bindingcollectionadapter2.collections.MergeObservableList
import
me.tatarka.bindingcollectionadapter2.collections.MergeObservableList
...
...
app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt
View file @
d0112f98
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.theme
...
@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.ui.theme
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
import
com.topjohnwu.magisk.ui.base.
Compat
Fragment
import
com.topjohnwu.magisk.ui.base.
BaseUI
Fragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
ThemeFragment
:
Compat
Fragment
<
ThemeViewModel
,
FragmentThemeMd2Binding
>()
{
class
ThemeFragment
:
BaseUI
Fragment
<
ThemeViewModel
,
FragmentThemeMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_theme_md2
override
val
layoutRes
=
R
.
layout
.
fragment_theme_md2
override
val
viewModel
by
viewModel
<
ThemeViewModel
>()
override
val
viewModel
by
viewModel
<
ThemeViewModel
>()
...
...
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