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
846bbb4d
Commit
846bbb4d
authored
Aug 18, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorganize app source code
parent
d7a26dbf
Hide whitespace changes
Inline
Side-by-side
Showing
77 changed files
with
158 additions
and
191 deletions
+158
-191
BaseUIActivity.kt
...src/main/java/com/topjohnwu/magisk/arch/BaseUIActivity.kt
+1
-1
BaseUIComponent.kt
...rc/main/java/com/topjohnwu/magisk/arch/BaseUIComponent.kt
+1
-1
BaseUIFragment.kt
...src/main/java/com/topjohnwu/magisk/arch/BaseUIFragment.kt
+1
-1
BaseViewModel.kt
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
+1
-1
Helpers.kt
app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt
+1
-1
Queryable.kt
app/src/main/java/com/topjohnwu/magisk/arch/Queryable.kt
+1
-1
ViewEvent.kt
app/src/main/java/com/topjohnwu/magisk/arch/ViewEvent.kt
+1
-1
Config.kt
app/src/main/java/com/topjohnwu/magisk/core/Config.kt
+2
-2
GeneralReceiver.kt
...rc/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
+1
-1
Info.kt
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
+1
-1
SplashActivity.kt
...src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
+2
-2
UpdateCheckService.kt
...main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
+1
-1
BaseActivity.kt
.../main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+0
-1
PermissionRequestBuilder.kt
...om/topjohnwu/magisk/core/base/PermissionRequestBuilder.kt
+2
-2
NotificationService.kt
...com/topjohnwu/magisk/core/download/NotificationService.kt
+1
-1
RemoteFileService.kt
...a/com/topjohnwu/magisk/core/download/RemoteFileService.kt
+1
-1
SuCallbackHandler.kt
...in/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.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
+2
-1
BooleanProperty.kt
...a/com/topjohnwu/magisk/data/preference/BooleanProperty.kt
+1
-1
FloatProperty.kt
...ava/com/topjohnwu/magisk/data/preference/FloatProperty.kt
+1
-1
IntProperty.kt
.../java/com/topjohnwu/magisk/data/preference/IntProperty.kt
+1
-1
LongProperty.kt
...java/com/topjohnwu/magisk/data/preference/LongProperty.kt
+1
-1
PreferenceModel.kt
...a/com/topjohnwu/magisk/data/preference/PreferenceModel.kt
+1
-1
Property.kt
...ain/java/com/topjohnwu/magisk/data/preference/Property.kt
+2
-2
StringProperty.kt
...va/com/topjohnwu/magisk/data/preference/StringProperty.kt
+1
-1
StringSetProperty.kt
...com/topjohnwu/magisk/data/preference/StringSetProperty.kt
+1
-1
AdaptersGeneric.kt
.../java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt
+0
-40
DataBindingAdapters.kt
...a/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
+33
-1
RvBindingAdapter.kt
...java/com/topjohnwu/magisk/databinding/RvBindingAdapter.kt
+2
-3
NetworkingModule.kt
...src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
+1
-1
XAndroid.kt
app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
+1
-1
InstallExternalModuleEvent.kt
...pjohnwu/magisk/model/events/InstallExternalModuleEvent.kt
+2
-2
OpenInappLinkEvent.kt
...a/com/topjohnwu/magisk/model/events/OpenInappLinkEvent.kt
+2
-2
SnackbarEvent.kt
...n/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt
+3
-3
ViewEvents.kt
...main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+4
-4
BiometricDialog.kt
...m/topjohnwu/magisk/model/events/dialog/BiometricDialog.kt
+2
-2
DarkThemeDialog.kt
...m/topjohnwu/magisk/model/events/dialog/DarkThemeDialog.kt
+1
-1
DialogEvent.kt
...a/com/topjohnwu/magisk/model/events/dialog/DialogEvent.kt
+2
-2
UninstallDialog.kt
...m/topjohnwu/magisk/model/events/dialog/UninstallDialog.kt
+1
-1
NavigationWrapper.kt
...om/topjohnwu/magisk/model/navigation/NavigationWrapper.kt
+3
-3
Observer.kt
...main/java/com/topjohnwu/magisk/model/observer/Observer.kt
+0
-31
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+3
-3
FlashFragment.kt
.../main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
+2
-2
FlashViewModel.kt
...main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+6
-6
HideFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
+1
-1
HideViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
+4
-4
HomeFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+1
-1
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+4
-4
InstallFragment.kt
...n/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
+1
-1
InstallViewModel.kt
.../java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+2
-2
LogFragment.kt
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+1
-1
LogViewModel.kt
...src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+3
-3
ModuleFragment.kt
...ain/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
+3
-3
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+1
-1
SafetynetFragment.kt
...va/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
+1
-1
SafetynetViewModel.kt
...a/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+1
-1
SettingsFragment.kt
...java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+1
-1
SettingsItems.kt
...in/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+1
-1
SettingsViewModel.kt
...ava/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+5
-5
SuperuserFragment.kt
...va/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+1
-1
SuperuserViewModel.kt
...a/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+4
-4
SuRequestActivity.kt
...va/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+1
-1
SuRequestViewModel.kt
...a/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+1
-1
ThemeFragment.kt
.../main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt
+1
-1
ThemeViewModel.kt
...main/java/com/topjohnwu/magisk/ui/theme/ThemeViewModel.kt
+1
-1
EndlessRecyclerScrollListener.kt
...m/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
+1
-1
MarkwonImagePlugin.kt
...ain/java/com/topjohnwu/magisk/utils/MarkwonImagePlugin.kt
+3
-2
Utils.kt
app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
+1
-1
Connectivity.kt
.../main/java/com/topjohnwu/magisk/utils/net/Connectivity.kt
+3
-1
LollipopNetworkObserver.kt
...com/topjohnwu/magisk/utils/net/LollipopNetworkObserver.kt
+1
-1
MarshmallowNetworkObserver.kt
.../topjohnwu/magisk/utils/net/MarshmallowNetworkObserver.kt
+3
-1
NetworkObserver.kt
...in/java/com/topjohnwu/magisk/utils/net/NetworkObserver.kt
+1
-1
PreLollipopNetworkObserver.kt
.../topjohnwu/magisk/utils/net/PreLollipopNetworkObserver.kt
+3
-1
MagiskDialog.kt
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+1
-1
Notifications.kt
app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt
+1
-1
Shortcuts.kt
app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/
ui/base
/BaseUIActivity.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/BaseUIActivity.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
...
...
app/src/main/java/com/topjohnwu/magisk/
ui/base
/BaseUIComponent.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/BaseUIComponent.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
android.view.View
import
android.view.View
import
androidx.core.graphics.Insets
import
androidx.core.graphics.Insets
...
...
app/src/main/java/com/topjohnwu/magisk/
ui/base
/BaseUIFragment.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/BaseUIFragment.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
android.os.Bundle
import
android.os.Bundle
import
android.view.KeyEvent
import
android.view.KeyEvent
...
...
app/src/main/java/com/topjohnwu/magisk/
ui/base
/BaseViewModel.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/BaseViewModel.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
android.Manifest
import
android.Manifest
import
androidx.annotation.CallSuper
import
androidx.annotation.CallSuper
...
...
app/src/main/java/com/topjohnwu/magisk/
ui/base
/Helpers.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/Helpers.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
androidx.databinding.ViewDataBinding
import
androidx.databinding.ViewDataBinding
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.databinding.ComparableRvItem
...
...
app/src/main/java/com/topjohnwu/magisk/
ui/base
/Queryable.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/Queryable.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
android.os.Handler
import
android.os.Handler
import
androidx.core.os.postDelayed
import
androidx.core.os.postDelayed
...
...
app/src/main/java/com/topjohnwu/magisk/
ui/base
/ViewEvent.kt
→
app/src/main/java/com/topjohnwu/magisk/
arch
/ViewEvent.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
ui.base
package
com.topjohnwu.magisk.
arch
import
android.content.Context
import
android.content.Context
import
androidx.fragment.app.Fragment
import
androidx.fragment.app.Fragment
...
...
app/src/main/java/com/topjohnwu/magisk/core/Config.kt
View file @
846bbb4d
...
@@ -10,14 +10,14 @@ import com.topjohnwu.magisk.BuildConfig
...
@@ -10,14 +10,14 @@ 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.BiometricHelper
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.utils.refreshLocale
import
com.topjohnwu.magisk.core.utils.refreshLocale
import
com.topjohnwu.magisk.data.preference.PreferenceModel
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.ktx.get
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.ktx.inject
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.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/GeneralReceiver.kt
View file @
846bbb4d
...
@@ -7,10 +7,10 @@ import com.topjohnwu.magisk.core.download.DownloadService
...
@@ -7,10 +7,10 @@ import com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
import
com.topjohnwu.magisk.core.model.ManagerJson
import
com.topjohnwu.magisk.core.model.ManagerJson
import
com.topjohnwu.magisk.core.su.SuCallbackHandler
import
com.topjohnwu.magisk.core.su.SuCallbackHandler
import
com.topjohnwu.magisk.core.view.Shortcuts
import
com.topjohnwu.magisk.ktx.reboot
import
com.topjohnwu.magisk.ktx.reboot
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.view.Shortcuts
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
...
app/src/main/java/com/topjohnwu/magisk/core/Info.kt
View file @
846bbb4d
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.core
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.core
import
androidx.databinding.ObservableBoolean
import
androidx.databinding.ObservableBoolean
import
com.topjohnwu.magisk.DynAPK
import
com.topjohnwu.magisk.DynAPK
import
com.topjohnwu.magisk.core.model.UpdateInfo
import
com.topjohnwu.magisk.core.model.UpdateInfo
import
com.topjohnwu.magisk.core.net.NetworkObserver
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.utils.CachedValue
import
com.topjohnwu.magisk.utils.CachedValue
import
com.topjohnwu.magisk.utils.net.NetworkObserver
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.ShellUtils.fastCmd
import
com.topjohnwu.superuser.ShellUtils.fastCmd
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
com.topjohnwu.superuser.internal.UiThreadHandler
...
...
app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
View file @
846bbb4d
...
@@ -5,11 +5,11 @@ import android.content.Context
...
@@ -5,11 +5,11 @@ 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.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.core.view.Shortcuts
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.magisk.view.Shortcuts
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.GlobalScope
...
...
app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
View file @
846bbb4d
...
@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.core
...
@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.core
import
android.content.Context
import
android.content.Context
import
androidx.work.*
import
androidx.work.*
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.core.view.Notifications
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.withContext
import
kotlinx.coroutines.withContext
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
View file @
846bbb4d
...
@@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat
...
@@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.ktx.set
import
com.topjohnwu.magisk.ktx.set
import
com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
import
kotlin.random.Random
import
kotlin.random.Random
typealias
RequestCallback
=
BaseActivity
.(
Int
,
Intent
?)
->
Unit
typealias
RequestCallback
=
BaseActivity
.(
Int
,
Intent
?)
->
Unit
...
...
app/src/main/java/com/topjohnwu/magisk/
model/permissions
/PermissionRequestBuilder.kt
→
app/src/main/java/com/topjohnwu/magisk/
core/base
/PermissionRequestBuilder.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model.permissions
package
com.topjohnwu.magisk.
core.base
typealias
SimpleCallback
=
()
->
Unit
typealias
SimpleCallback
=
()
->
Unit
typealias
PermissionRationaleCallback
=
(
List
<
String
>)
->
Unit
typealias
PermissionRationaleCallback
=
(
List
<
String
>)
->
Unit
...
@@ -37,4 +37,4 @@ class PermissionRequest(
...
@@ -37,4 +37,4 @@ class PermissionRequest(
fun
onFailure
()
=
onFailureCallback
()
fun
onFailure
()
=
onFailureCallback
()
fun
onShowRationale
(
permissions
:
List
<
String
>)
=
onShowRationaleCallback
(
permissions
)
fun
onShowRationale
(
permissions
:
List
<
String
>)
=
onShowRationaleCallback
(
permissions
)
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/core/download/NotificationService.kt
View file @
846bbb4d
...
@@ -4,7 +4,7 @@ import android.app.Notification
...
@@ -4,7 +4,7 @@ import android.app.Notification
import
android.content.Intent
import
android.content.Intent
import
android.os.IBinder
import
android.os.IBinder
import
com.topjohnwu.magisk.core.base.BaseService
import
com.topjohnwu.magisk.core.base.BaseService
import
com.topjohnwu.magisk.
core.
view.Notifications
import
com.topjohnwu.magisk.view.Notifications
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.cancel
import
kotlinx.coroutines.cancel
...
...
app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt
View file @
846bbb4d
...
@@ -7,13 +7,13 @@ import androidx.lifecycle.MutableLiveData
...
@@ -7,13 +7,13 @@ import androidx.lifecycle.MutableLiveData
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.ForegroundTracker
import
com.topjohnwu.magisk.core.ForegroundTracker
import
com.topjohnwu.magisk.core.utils.ProgressInputStream
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.ktx.checkSum
import
com.topjohnwu.magisk.ktx.checkSum
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.ktx.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.Magisk
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module
import
com.topjohnwu.magisk.view.Notifications
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
okhttp3.ResponseBody
import
okhttp3.ResponseBody
import
org.koin.android.ext.android.inject
import
org.koin.android.ext.android.inject
...
...
app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
View file @
846bbb4d
...
@@ -13,7 +13,6 @@ import com.topjohnwu.magisk.core.Config
...
@@ -13,7 +13,6 @@ 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.ktx.get
import
com.topjohnwu.magisk.ktx.get
...
@@ -21,6 +20,7 @@ import com.topjohnwu.magisk.ktx.startActivity
...
@@ -21,6 +20,7 @@ import com.topjohnwu.magisk.ktx.startActivity
import
com.topjohnwu.magisk.ktx.startActivityWithRoot
import
com.topjohnwu.magisk.ktx.startActivityWithRoot
import
com.topjohnwu.magisk.model.entity.toLog
import
com.topjohnwu.magisk.model.entity.toLog
import
com.topjohnwu.magisk.ui.surequest.SuRequestActivity
import
com.topjohnwu.magisk.ui.surequest.SuRequestActivity
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
...
app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View file @
846bbb4d
...
@@ -12,13 +12,13 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
...
@@ -12,13 +12,13 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
import
com.topjohnwu.magisk.R
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.utils.Utils
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.ktx.readUri
import
com.topjohnwu.magisk.ktx.readUri
import
com.topjohnwu.magisk.ktx.reboot
import
com.topjohnwu.magisk.ktx.reboot
import
com.topjohnwu.magisk.ktx.withStreams
import
com.topjohnwu.magisk.ktx.withStreams
import
com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.signing.SignBoot
import
com.topjohnwu.signing.SignBoot
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/utils/PatchAPK.kt
View file @
846bbb4d
...
@@ -8,10 +8,11 @@ import com.topjohnwu.magisk.core.Config
...
@@ -8,10 +8,11 @@ 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.ktx.get
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.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/
model
/preference/BooleanProperty.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/BooleanProperty.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
...
...
app/src/main/java/com/topjohnwu/magisk/
model
/preference/FloatProperty.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/FloatProperty.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
...
...
app/src/main/java/com/topjohnwu/magisk/
model
/preference/IntProperty.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/IntProperty.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
...
...
app/src/main/java/com/topjohnwu/magisk/
model
/preference/LongProperty.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/LongProperty.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
...
...
app/src/main/java/com/topjohnwu/magisk/
model
/preference/PreferenceModel.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/PreferenceModel.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
android.content.Context
import
android.content.Context
import
android.content.SharedPreferences
import
android.content.SharedPreferences
...
...
app/src/main/java/com/topjohnwu/magisk/
model
/preference/Property.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/Property.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
android.content.SharedPreferences
import
android.content.SharedPreferences
...
@@ -18,4 +18,4 @@ abstract class Property {
...
@@ -18,4 +18,4 @@ abstract class Property {
fun
SharedPreferences
.
get
(
name
:
String
,
value
:
String
)
=
getString
(
name
,
value
)
?:
value
fun
SharedPreferences
.
get
(
name
:
String
,
value
:
String
)
=
getString
(
name
,
value
)
?:
value
fun
SharedPreferences
.
get
(
name
:
String
,
value
:
Set
<
String
>)
=
getStringSet
(
name
,
value
)
?:
value
fun
SharedPreferences
.
get
(
name
:
String
,
value
:
Set
<
String
>)
=
getStringSet
(
name
,
value
)
?:
value
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/
model
/preference/StringProperty.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/StringProperty.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
...
...
app/src/main/java/com/topjohnwu/magisk/
model
/preference/StringSetProperty.kt
→
app/src/main/java/com/topjohnwu/magisk/
data
/preference/StringSetProperty.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model
.preference
package
com.topjohnwu.magisk.
data
.preference
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
import
com.topjohnwu.magisk.ktx.trimEmptyToNull
...
...
app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt
deleted
100644 → 0
View file @
d7a26dbf
package
com.topjohnwu.magisk.databinding
import
android.view.View
import
android.widget.TextView
import
androidx.core.view.isGone
import
androidx.core.view.isInvisible
import
androidx.databinding.BindingAdapter
import
com.topjohnwu.magisk.ktx.coroutineScope
import
com.topjohnwu.magisk.ktx.get
import
io.noties.markwon.Markwon
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.launch
@BindingAdapter
(
"gone"
)
fun
setGone
(
view
:
View
,
gone
:
Boolean
)
{
view
.
isGone
=
gone
}
@BindingAdapter
(
"invisible"
)
fun
setInvisible
(
view
:
View
,
invisible
:
Boolean
)
{
view
.
isInvisible
=
invisible
}
@BindingAdapter
(
"goneUnless"
)
fun
setGoneUnless
(
view
:
View
,
goneUnless
:
Boolean
)
{
setGone
(
view
,
goneUnless
.
not
())
}
@BindingAdapter
(
"invisibleUnless"
)
fun
setInvisibleUnless
(
view
:
View
,
invisibleUnless
:
Boolean
)
{
setInvisible
(
view
,
invisibleUnless
.
not
())
}
@BindingAdapter
(
"markdownText"
)
fun
setMarkdownText
(
tv
:
TextView
,
text
:
CharSequence
)
{
tv
.
coroutineScope
.
launch
(
Dispatchers
.
IO
)
{
val
markwon
=
get
<
Markwon
>()
markwon
.
setMarkdown
(
tv
,
text
.
toString
())
}
}
app/src/main/java/com/topjohnwu/magisk/
utils
/DataBindingAdapters.kt
→
app/src/main/java/com/topjohnwu/magisk/
databinding
/DataBindingAdapters.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
utils
package
com.topjohnwu.magisk.
databinding
import
android.animation.ValueAnimator
import
android.animation.ValueAnimator
import
android.graphics.Paint
import
android.graphics.Paint
...
@@ -9,6 +9,8 @@ import android.view.ViewGroup
...
@@ -9,6 +9,8 @@ import android.view.ViewGroup
import
android.widget.*
import
android.widget.*
import
androidx.annotation.DrawableRes
import
androidx.annotation.DrawableRes
import
androidx.appcompat.widget.Toolbar
import
androidx.appcompat.widget.Toolbar
import
androidx.core.view.isGone
import
androidx.core.view.isInvisible
import
androidx.core.view.updateLayoutParams
import
androidx.core.view.updateLayoutParams
import
androidx.databinding.BindingAdapter
import
androidx.databinding.BindingAdapter
import
androidx.databinding.InverseBindingAdapter
import
androidx.databinding.InverseBindingAdapter
...
@@ -20,12 +22,42 @@ import com.google.android.material.card.MaterialCardView
...
@@ -20,12 +22,42 @@ import com.google.android.material.card.MaterialCardView
import
com.google.android.material.chip.Chip
import
com.google.android.material.chip.Chip
import
com.google.android.material.textfield.TextInputLayout
import
com.google.android.material.textfield.TextInputLayout
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.ktx.coroutineScope
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
import
com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
com.topjohnwu.widget.IndeterminateCheckBox
import
com.topjohnwu.widget.IndeterminateCheckBox
import
io.noties.markwon.Markwon
import
kotlinx.coroutines.*
import
kotlinx.coroutines.*
import
kotlin.math.roundToInt
import
kotlin.math.roundToInt
@BindingAdapter
(
"gone"
)
fun
setGone
(
view
:
View
,
gone
:
Boolean
)
{
view
.
isGone
=
gone
}
@BindingAdapter
(
"invisible"
)
fun
setInvisible
(
view
:
View
,
invisible
:
Boolean
)
{
view
.
isInvisible
=
invisible
}
@BindingAdapter
(
"goneUnless"
)
fun
setGoneUnless
(
view
:
View
,
goneUnless
:
Boolean
)
{
setGone
(
view
,
goneUnless
.
not
())
}
@BindingAdapter
(
"invisibleUnless"
)
fun
setInvisibleUnless
(
view
:
View
,
invisibleUnless
:
Boolean
)
{
setInvisible
(
view
,
invisibleUnless
.
not
())
}
@BindingAdapter
(
"markdownText"
)
fun
setMarkdownText
(
tv
:
TextView
,
text
:
CharSequence
)
{
tv
.
coroutineScope
.
launch
(
Dispatchers
.
IO
)
{
val
markwon
=
get
<
Markwon
>()
markwon
.
setMarkdown
(
tv
,
text
.
toString
())
}
}
@BindingAdapter
(
"onNavigationClick"
)
@BindingAdapter
(
"onNavigationClick"
)
fun
setOnNavigationClickedListener
(
view
:
Toolbar
,
listener
:
View
.
OnClickListener
)
{
fun
setOnNavigationClickedListener
(
view
:
Toolbar
,
listener
:
View
.
OnClickListener
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/
model/binding/
BindingAdapter.kt
→
app/src/main/java/com/topjohnwu/magisk/
databinding/Rv
BindingAdapter.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
model.
binding
package
com.topjohnwu.magisk.
data
binding
import
androidx.databinding.ViewDataBinding
import
androidx.databinding.ViewDataBinding
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
import
com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
import
me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
import
me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
class
BindingAdapter
<
T
:
ComparableRvItem
<*>
>
:
BindingRecyclerViewAdapter
<
T
>()
{
class
RvBindingAdapter
<
T
:
RvItem
>
:
BindingRecyclerViewAdapter
<
T
>()
{
private
var
recyclerView
:
RecyclerView
?
=
null
private
var
recyclerView
:
RecyclerView
?
=
null
...
...
app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
View file @
846bbb4d
...
@@ -5,12 +5,12 @@ import android.os.Build
...
@@ -5,12 +5,12 @@ import android.os.Build
import
com.squareup.moshi.Moshi
import
com.squareup.moshi.Moshi
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.utils.MarkwonImagePlugin
import
com.topjohnwu.magisk.data.network.GithubApiServices
import
com.topjohnwu.magisk.data.network.GithubApiServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.ktx.precomputedText
import
com.topjohnwu.magisk.ktx.precomputedText
import
com.topjohnwu.magisk.net.Networking
import
com.topjohnwu.magisk.net.Networking
import
com.topjohnwu.magisk.net.NoSSLv3SocketFactory
import
com.topjohnwu.magisk.net.NoSSLv3SocketFactory
import
com.topjohnwu.magisk.utils.MarkwonImagePlugin
import
io.noties.markwon.Markwon
import
io.noties.markwon.Markwon
import
io.noties.markwon.html.HtmlPlugin
import
io.noties.markwon.html.HtmlPlugin
import
okhttp3.Dns
import
okhttp3.Dns
...
...
app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
View file @
846bbb4d
...
@@ -47,9 +47,9 @@ import com.topjohnwu.magisk.FileProvider
...
@@ -47,9 +47,9 @@ import com.topjohnwu.magisk.FileProvider
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.ResMgr
import
com.topjohnwu.magisk.core.ResMgr
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.utils.Utils
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/InstallExternalModuleEvent.kt
View file @
846bbb4d
...
@@ -6,10 +6,10 @@ import android.content.Intent
...
@@ -6,10 +6,10 @@ import android.content.Intent
import
androidx.annotation.RequiresPermission
import
androidx.annotation.RequiresPermission
import
androidx.navigation.NavDirections
import
androidx.navigation.NavDirections
import
com.topjohnwu.magisk.MainDirections
import
com.topjohnwu.magisk.MainDirections
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.arch.ViewEvent
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.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.ui.base.ViewEvent
class
InstallExternalModuleEvent
:
ViewEvent
(),
ActivityExecutor
{
class
InstallExternalModuleEvent
:
ViewEvent
(),
ActivityExecutor
{
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/OpenInappLinkEvent.kt
View file @
846bbb4d
...
@@ -7,8 +7,8 @@ import androidx.annotation.AttrRes
...
@@ -7,8 +7,8 @@ import androidx.annotation.AttrRes
import
androidx.browser.customtabs.CustomTabsIntent
import
androidx.browser.customtabs.CustomTabsIntent
import
androidx.core.net.toUri
import
androidx.core.net.toUri
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.
ui.base
.ContextExecutor
import
com.topjohnwu.magisk.
arch
.ContextExecutor
import
com.topjohnwu.magisk.
ui.base
.ViewEvent
import
com.topjohnwu.magisk.
arch
.ViewEvent
data class
OpenInappLinkEvent
(
data class
OpenInappLinkEvent
(
private
val
link
:
String
private
val
link
:
String
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt
View file @
846bbb4d
...
@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.model.events
...
@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.model.events
import
android.content.Context
import
android.content.Context
import
androidx.annotation.StringRes
import
androidx.annotation.StringRes
import
com.google.android.material.snackbar.Snackbar
import
com.google.android.material.snackbar.Snackbar
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.arch.BaseUIActivity
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.ktx.snackbar
import
com.topjohnwu.magisk.ktx.snackbar
import
com.topjohnwu.magisk.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
com.topjohnwu.magisk.ui.base.ViewEvent
class
SnackbarEvent
private
constructor
(
class
SnackbarEvent
private
constructor
(
@StringRes
private
val
messageRes
:
Int
,
@StringRes
private
val
messageRes
:
Int
,
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
View file @
846bbb4d
...
@@ -4,6 +4,10 @@ import android.app.Activity
...
@@ -4,6 +4,10 @@ import android.app.Activity
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.arch.ContextExecutor
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.arch.ViewEventWithScope
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
...
@@ -11,10 +15,6 @@ import com.topjohnwu.magisk.core.utils.SafetyNetHelper
...
@@ -11,10 +15,6 @@ import com.topjohnwu.magisk.core.utils.SafetyNetHelper
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.ktx.DynamicClassLoader
import
com.topjohnwu.magisk.ktx.DynamicClassLoader
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.ui.base.ContextExecutor
import
com.topjohnwu.magisk.ui.base.ViewEvent
import
com.topjohnwu.magisk.ui.base.ViewEventWithScope
import
com.topjohnwu.magisk.ui.safetynet.SafetyNetResult
import
com.topjohnwu.magisk.ui.safetynet.SafetyNetResult
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MarkDownWindow
import
com.topjohnwu.magisk.view.MarkDownWindow
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/BiometricDialog.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.model.events.dialog
package
com.topjohnwu.magisk.model.events.dialog
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.arch.ViewEvent
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.core.utils.BiometricHelper
import
com.topjohnwu.magisk.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.ui.base.ViewEvent
class
BiometricDialog
(
class
BiometricDialog
(
builder
:
Builder
.()
->
Unit
builder
:
Builder
.()
->
Unit
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/DarkThemeDialog.kt
View file @
846bbb4d
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.model.events.dialog
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.model.events.dialog
import
android.app.Activity
import
android.app.Activity
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.appcompat.app.AppCompatDelegate
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
java.lang.ref.WeakReference
import
java.lang.ref.WeakReference
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/DialogEvent.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.model.events.dialog
package
com.topjohnwu.magisk.model.events.dialog
import
android.content.Context
import
android.content.Context
import
com.topjohnwu.magisk.
ui.base
.ContextExecutor
import
com.topjohnwu.magisk.
arch
.ContextExecutor
import
com.topjohnwu.magisk.
ui.base
.ViewEvent
import
com.topjohnwu.magisk.
arch
.ViewEvent
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
abstract
class
DialogEvent
:
ViewEvent
(),
ContextExecutor
{
abstract
class
DialogEvent
:
ViewEvent
(),
ContextExecutor
{
...
...
app/src/main/java/com/topjohnwu/magisk/model/events/dialog/UninstallDialog.kt
View file @
846bbb4d
...
@@ -4,9 +4,9 @@ import android.widget.Toast
...
@@ -4,9 +4,9 @@ import android.widget.Toast
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Info
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.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/NavigationWrapper.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.model.navigation
package
com.topjohnwu.magisk.model.navigation
import
androidx.navigation.NavDirections
import
androidx.navigation.NavDirections
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.arch.BaseUIActivity
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
com.topjohnwu.magisk.ui.base.ViewEvent
class
NavigationWrapper
(
class
NavigationWrapper
(
private
val
directions
:
NavDirections
private
val
directions
:
NavDirections
...
...
app/src/main/java/com/topjohnwu/magisk/model/observer/Observer.kt
deleted
100644 → 0
View file @
d7a26dbf
package
com.topjohnwu.magisk.model.observer
import
androidx.databinding.Observable
import
androidx.databinding.ObservableField
import
java.io.Serializable
class
Observer
<
T
>(
vararg
dependencies
:
Observable
,
private
val
observer
:
()
->
T
)
:
ObservableField
<
T
>(*
dependencies
),
Serializable
{
val
value
:
T
get
()
=
observer
()
@Deprecated
(
message
=
"Use KObservableField.value syntax from code"
,
replaceWith
=
ReplaceWith
(
"value"
)
)
override
fun
get
():
T
{
return
value
}
@Deprecated
(
message
=
"Observer cannot be set"
,
level
=
DeprecationLevel
.
HIDDEN
)
override
fun
set
(
newValue
:
T
)
{
}
override
fun
toString
():
String
{
return
"Observer(value=$value)"
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
846bbb4d
...
@@ -13,13 +13,13 @@ import androidx.navigation.NavDirections
...
@@ -13,13 +13,13 @@ import androidx.navigation.NavDirections
import
com.google.android.material.card.MaterialCardView
import
com.google.android.material.card.MaterialCardView
import
com.topjohnwu.magisk.MainDirections
import
com.topjohnwu.magisk.MainDirections
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIActivity
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.ReselectionTarget
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.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.ktx.startAnimations
import
com.topjohnwu.magisk.ktx.startAnimations
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.base.ReselectionTarget
import
com.topjohnwu.magisk.ui.home.HomeFragmentDirections
import
com.topjohnwu.magisk.ui.home.HomeFragmentDirections
import
com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
...
...
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
View file @
846bbb4d
...
@@ -9,12 +9,12 @@ import android.view.*
...
@@ -9,12 +9,12 @@ import android.view.*
import
androidx.core.net.toUri
import
androidx.core.net.toUri
import
androidx.navigation.NavDeepLinkBuilder
import
androidx.navigation.NavDeepLinkBuilder
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIActivity
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.cmp
import
com.topjohnwu.magisk.core.cmp
import
com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.core.parameter.parametersOf
import
org.koin.core.parameter.parametersOf
import
java.io.File
import
java.io.File
...
...
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
View file @
846bbb4d
...
@@ -7,19 +7,19 @@ import androidx.databinding.Bindable
...
@@ -7,19 +7,19 @@ import androidx.databinding.Bindable
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.diffListOf
import
com.topjohnwu.magisk.arch.itemBindingOf
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.tasks.FlashZip
import
com.topjohnwu.magisk.core.tasks.FlashZip
import
com.topjohnwu.magisk.core.tasks.MagiskInstaller
import
com.topjohnwu.magisk.core.tasks.MagiskInstaller
import
com.topjohnwu.magisk.
core.view.Notifications
import
com.topjohnwu.magisk.
databinding.RvBindingAdapter
import
com.topjohnwu.magisk.ktx.*
import
com.topjohnwu.magisk.ktx.*
import
com.topjohnwu.magisk.model.binding.BindingAdapter
import
com.topjohnwu.magisk.model.entity.recycler.ConsoleItem
import
com.topjohnwu.magisk.model.entity.recycler.ConsoleItem
import
com.topjohnwu.magisk.model.events.SnackbarEvent
import
com.topjohnwu.magisk.model.events.SnackbarEvent
import
com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.base.diffListOf
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.superuser.CallbackList
import
com.topjohnwu.superuser.CallbackList
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
...
@@ -40,7 +40,7 @@ class FlashViewModel(
...
@@ -40,7 +40,7 @@ class FlashViewModel(
var
behaviorText
=
resources
.
getString
(
R
.
string
.
flashing
)
var
behaviorText
=
resources
.
getString
(
R
.
string
.
flashing
)
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
behaviorText
)
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
behaviorText
)
val
adapter
=
BindingAdapter
<
ConsoleItem
>()
val
adapter
=
Rv
BindingAdapter
<
ConsoleItem
>()
val
items
=
diffListOf
<
ConsoleItem
>()
val
items
=
diffListOf
<
ConsoleItem
>()
val
itemBinding
=
itemBindingOf
<
ConsoleItem
>()
val
itemBinding
=
itemBindingOf
<
ConsoleItem
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
View file @
846bbb4d
...
@@ -10,9 +10,9 @@ import androidx.core.view.isVisible
...
@@ -10,9 +10,9 @@ import androidx.core.view.isVisible
import
androidx.recyclerview.widget.LinearLayoutManager
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.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
import
com.topjohnwu.magisk.ktx.hideKeyboard
import
com.topjohnwu.magisk.ktx.hideKeyboard
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
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
...
...
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
View file @
846bbb4d
...
@@ -4,6 +4,10 @@ import android.content.pm.ApplicationInfo
...
@@ -4,6 +4,10 @@ import android.content.pm.ApplicationInfo
import
androidx.databinding.Bindable
import
androidx.databinding.Bindable
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.Queryable
import
com.topjohnwu.magisk.arch.filterableListOf
import
com.topjohnwu.magisk.arch.itemBindingOf
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.data.repository.MagiskRepository
...
@@ -13,10 +17,6 @@ import com.topjohnwu.magisk.model.entity.HideTarget
...
@@ -13,10 +17,6 @@ import com.topjohnwu.magisk.model.entity.HideTarget
import
com.topjohnwu.magisk.model.entity.StatefulProcess
import
com.topjohnwu.magisk.model.entity.StatefulProcess
import
com.topjohnwu.magisk.model.entity.recycler.HideItem
import
com.topjohnwu.magisk.model.entity.recycler.HideItem
import
com.topjohnwu.magisk.model.entity.recycler.HideProcessItem
import
com.topjohnwu.magisk.model.entity.recycler.HideProcessItem
import
com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.base.Queryable
import
com.topjohnwu.magisk.ui.base.filterableListOf
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View file @
846bbb4d
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.home
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.home
import
android.os.Bundle
import
android.os.Bundle
import
android.view.*
import
android.view.*
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import
com.topjohnwu.magisk.model.events.RebootEvent
import
com.topjohnwu.magisk.model.events.RebootEvent
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
846bbb4d
...
@@ -5,6 +5,10 @@ import androidx.databinding.Bindable
...
@@ -5,6 +5,10 @@ import androidx.databinding.Bindable
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.ActivityExecutor
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.arch.itemBindingOf
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.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
...
@@ -21,10 +25,6 @@ import com.topjohnwu.magisk.model.events.OpenInappLinkEvent
...
@@ -21,10 +25,6 @@ import com.topjohnwu.magisk.model.events.OpenInappLinkEvent
import
com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.model.events.dialog.ManagerInstallDialog
import
com.topjohnwu.magisk.model.events.dialog.ManagerInstallDialog
import
com.topjohnwu.magisk.model.events.dialog.UninstallDialog
import
com.topjohnwu.magisk.model.events.dialog.UninstallDialog
import
com.topjohnwu.magisk.ui.base.ActivityExecutor
import
com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.base.ViewEvent
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
...
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
View file @
846bbb4d
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.install
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.install
import
android.content.Intent
import
android.content.Intent
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
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.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
InstallFragment
:
BaseUIFragment
<
InstallViewModel
,
FragmentInstallMd2Binding
>()
{
class
InstallFragment
:
BaseUIFragment
<
InstallViewModel
,
FragmentInstallMd2Binding
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View file @
846bbb4d
...
@@ -6,16 +6,16 @@ import androidx.databinding.Bindable
...
@@ -6,16 +6,16 @@ import androidx.databinding.Bindable
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.core.Info
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.download.RemoteFileService
import
com.topjohnwu.magisk.core.download.RemoteFileService
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.data.repository.StringRepository
import
com.topjohnwu.magisk.data.repository.StringRepository
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.model.events.RequestFileEvent
import
com.topjohnwu.magisk.model.events.RequestFileEvent
import
com.topjohnwu.magisk.model.events.dialog.SecondSlotWarningDialog
import
com.topjohnwu.magisk.model.events.dialog.SecondSlotWarningDialog
import
com.topjohnwu.magisk.u
i.base.BaseViewModel
import
com.topjohnwu.magisk.u
tils.Utils
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View file @
846bbb4d
...
@@ -7,9 +7,9 @@ import android.view.MenuItem
...
@@ -7,9 +7,9 @@ import android.view.MenuItem
import
android.view.View
import
android.view.View
import
androidx.core.view.isVisible
import
androidx.core.view.isVisible
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
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.BaseUIFragment
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
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
View file @
846bbb4d
...
@@ -4,15 +4,15 @@ import androidx.databinding.Bindable
...
@@ -4,15 +4,15 @@ import androidx.databinding.Bindable
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.diffListOf
import
com.topjohnwu.magisk.arch.itemBindingOf
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.data.repository.LogRepository
import
com.topjohnwu.magisk.data.repository.LogRepository
import
com.topjohnwu.magisk.model.entity.recycler.LogItem
import
com.topjohnwu.magisk.model.entity.recycler.LogItem
import
com.topjohnwu.magisk.model.entity.recycler.TextItem
import
com.topjohnwu.magisk.model.entity.recycler.TextItem
import
com.topjohnwu.magisk.model.events.SnackbarEvent
import
com.topjohnwu.magisk.model.events.SnackbarEvent
import
com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.ui.base.diffListOf
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View file @
846bbb4d
...
@@ -9,13 +9,13 @@ import android.view.View
...
@@ -9,13 +9,13 @@ import android.view.View
import
androidx.core.view.isVisible
import
androidx.core.view.isVisible
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.arch.ReselectionTarget
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import
com.topjohnwu.magisk.ktx.hideKeyboard
import
com.topjohnwu.magisk.ktx.hideKeyboard
import
com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
import
com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
com.topjohnwu.magisk.ui.base.ReselectionTarget
import
com.topjohnwu.magisk.ui.base.ViewEvent
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
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
846bbb4d
...
@@ -6,6 +6,7 @@ import androidx.lifecycle.Observer
...
@@ -6,6 +6,7 @@ import androidx.lifecycle.Observer
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.*
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.download.RemoteFileService
import
com.topjohnwu.magisk.core.download.RemoteFileService
import
com.topjohnwu.magisk.core.model.module.Module
import
com.topjohnwu.magisk.core.model.module.Module
...
@@ -23,7 +24,6 @@ import com.topjohnwu.magisk.model.entity.recycler.SectionTitle
...
@@ -23,7 +24,6 @@ import com.topjohnwu.magisk.model.entity.recycler.SectionTitle
import
com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
import
com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
import
com.topjohnwu.magisk.model.events.OpenChangelogEvent
import
com.topjohnwu.magisk.model.events.OpenChangelogEvent
import
com.topjohnwu.magisk.model.events.dialog.ModuleInstallDialog
import
com.topjohnwu.magisk.model.events.dialog.ModuleInstallDialog
import
com.topjohnwu.magisk.ui.base.*
import
com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
import
com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
View file @
846bbb4d
...
@@ -5,8 +5,8 @@ import android.view.LayoutInflater
...
@@ -5,8 +5,8 @@ import android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SafetynetFragment
:
BaseUIFragment
<
SafetynetViewModel
,
FragmentSafetynetMd2Binding
>()
{
class
SafetynetFragment
:
BaseUIFragment
<
SafetynetViewModel
,
FragmentSafetynetMd2Binding
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View file @
846bbb4d
...
@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.ui.safetynet
...
@@ -3,8 +3,8 @@ 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.arch.BaseViewModel
import
com.topjohnwu.magisk.model.events.CheckSafetyNetEvent
import
com.topjohnwu.magisk.model.events.CheckSafetyNetEvent
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.set
import
com.topjohnwu.magisk.utils.set
import
org.json.JSONObject
import
org.json.JSONObject
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View file @
846bbb4d
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.settings
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.ui.settings
import
android.os.Bundle
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.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
import
com.topjohnwu.magisk.ktx.setOnViewReadyListener
import
com.topjohnwu.magisk.ktx.setOnViewReadyListener
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SettingsFragment
:
BaseUIFragment
<
SettingsViewModel
,
FragmentSettingsMd2Binding
>()
{
class
SettingsFragment
:
BaseUIFragment
<
SettingsViewModel
,
FragmentSettingsMd2Binding
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View file @
846bbb4d
...
@@ -13,7 +13,6 @@ import com.topjohnwu.magisk.core.Const
...
@@ -13,7 +13,6 @@ import com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.UpdateCheckService
import
com.topjohnwu.magisk.core.UpdateCheckService
import
com.topjohnwu.magisk.core.utils.BiometricHelper
import
com.topjohnwu.magisk.core.utils.BiometricHelper
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.core.utils.availableLocales
import
com.topjohnwu.magisk.core.utils.availableLocales
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
import
com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
...
@@ -21,6 +20,7 @@ import com.topjohnwu.magisk.databinding.DialogSettingsDownloadPathBinding
...
@@ -21,6 +20,7 @@ import com.topjohnwu.magisk.databinding.DialogSettingsDownloadPathBinding
import
com.topjohnwu.magisk.databinding.DialogSettingsUpdateChannelBinding
import
com.topjohnwu.magisk.databinding.DialogSettingsUpdateChannelBinding
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.model.entity.recycler.SettingsItem
import
com.topjohnwu.magisk.model.entity.recycler.SettingsItem
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.asTransitive
import
com.topjohnwu.magisk.utils.asTransitive
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
View file @
846bbb4d
...
@@ -6,21 +6,21 @@ import android.widget.Toast
...
@@ -6,21 +6,21 @@ import android.widget.Toast
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.adapterOf
import
com.topjohnwu.magisk.arch.diffListOf
import
com.topjohnwu.magisk.arch.itemBindingOf
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.download.DownloadService
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.utils.PatchAPK
import
com.topjohnwu.magisk.core.utils.PatchAPK
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.data.database.RepoDao
import
com.topjohnwu.magisk.data.database.RepoDao
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.model.entity.recycler.SettingsItem
import
com.topjohnwu.magisk.model.entity.recycler.SettingsItem
import
com.topjohnwu.magisk.model.events.RecreateEvent
import
com.topjohnwu.magisk.model.events.RecreateEvent
import
com.topjohnwu.magisk.model.events.dialog.BiometricDialog
import
com.topjohnwu.magisk.model.events.dialog.BiometricDialog
import
com.topjohnwu.magisk.ui.base.BaseViewModel
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.ui.base.adapterOf
import
com.topjohnwu.magisk.ui.base.diffListOf
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
org.koin.core.get
import
org.koin.core.get
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.ui.superuser
package
com.topjohnwu.magisk.ui.superuser
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
SuperuserFragment
:
BaseUIFragment
<
SuperuserViewModel
,
FragmentSuperuserMd2Binding
>()
{
class
SuperuserFragment
:
BaseUIFragment
<
SuperuserViewModel
,
FragmentSuperuserMd2Binding
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
View file @
846bbb4d
...
@@ -6,6 +6,10 @@ import androidx.databinding.ObservableArrayList
...
@@ -6,6 +6,10 @@ import androidx.databinding.ObservableArrayList
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.arch.adapterOf
import
com.topjohnwu.magisk.arch.diffListOf
import
com.topjohnwu.magisk.arch.itemBindingOf
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.BiometricHelper
...
@@ -17,10 +21,6 @@ import com.topjohnwu.magisk.model.entity.recycler.TextItem
...
@@ -17,10 +21,6 @@ import com.topjohnwu.magisk.model.entity.recycler.TextItem
import
com.topjohnwu.magisk.model.events.SnackbarEvent
import
com.topjohnwu.magisk.model.events.SnackbarEvent
import
com.topjohnwu.magisk.model.events.dialog.BiometricDialog
import
com.topjohnwu.magisk.model.events.dialog.BiometricDialog
import
com.topjohnwu.magisk.model.events.dialog.SuperuserRevokeDialog
import
com.topjohnwu.magisk.model.events.dialog.SuperuserRevokeDialog
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
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.withContext
import
kotlinx.coroutines.withContext
...
...
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
View file @
846bbb4d
...
@@ -9,10 +9,10 @@ import android.view.Window
...
@@ -9,10 +9,10 @@ import android.view.Window
import
android.view.WindowManager
import
android.view.WindowManager
import
androidx.navigation.NavController
import
androidx.navigation.NavController
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIActivity
import
com.topjohnwu.magisk.core.su.SuCallbackHandler
import
com.topjohnwu.magisk.core.su.SuCallbackHandler
import
com.topjohnwu.magisk.core.su.SuCallbackHandler.REQUEST
import
com.topjohnwu.magisk.core.su.SuCallbackHandler.REQUEST
import
com.topjohnwu.magisk.databinding.ActivityRequestBinding
import
com.topjohnwu.magisk.databinding.ActivityRequestBinding
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
open
class
SuRequestActivity
:
BaseUIActivity
<
SuRequestViewModel
,
ActivityRequestBinding
>()
{
open
class
SuRequestActivity
:
BaseUIActivity
<
SuRequestViewModel
,
ActivityRequestBinding
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
View file @
846bbb4d
...
@@ -10,6 +10,7 @@ import androidx.databinding.Bindable
...
@@ -10,6 +10,7 @@ import androidx.databinding.Bindable
import
androidx.lifecycle.viewModelScope
import
androidx.lifecycle.viewModelScope
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
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
...
@@ -18,7 +19,6 @@ import com.topjohnwu.magisk.core.su.SuRequestHandler
...
@@ -18,7 +19,6 @@ import com.topjohnwu.magisk.core.su.SuRequestHandler
import
com.topjohnwu.magisk.core.utils.BiometricHelper
import
com.topjohnwu.magisk.core.utils.BiometricHelper
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.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
com.topjohnwu.superuser.internal.UiThreadHandler
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
...
app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.ui.theme
package
com.topjohnwu.magisk.ui.theme
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
ThemeFragment
:
BaseUIFragment
<
ThemeViewModel
,
FragmentThemeMd2Binding
>()
{
class
ThemeFragment
:
BaseUIFragment
<
ThemeViewModel
,
FragmentThemeMd2Binding
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeViewModel.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.ui.theme
package
com.topjohnwu.magisk.ui.theme
import
com.topjohnwu.magisk.arch.BaseViewModel
import
com.topjohnwu.magisk.model.entity.recycler.TappableHeadlineItem
import
com.topjohnwu.magisk.model.entity.recycler.TappableHeadlineItem
import
com.topjohnwu.magisk.model.events.RecreateEvent
import
com.topjohnwu.magisk.model.events.RecreateEvent
import
com.topjohnwu.magisk.model.events.dialog.DarkThemeDialog
import
com.topjohnwu.magisk.model.events.dialog.DarkThemeDialog
import
com.topjohnwu.magisk.ui.base.BaseViewModel
class
ThemeViewModel
:
BaseViewModel
(),
TappableHeadlineItem
.
Listener
{
class
ThemeViewModel
:
BaseViewModel
(),
TappableHeadlineItem
.
Listener
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
View file @
846bbb4d
...
@@ -4,7 +4,7 @@ import androidx.recyclerview.widget.GridLayoutManager
...
@@ -4,7 +4,7 @@ import androidx.recyclerview.widget.GridLayoutManager
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.StaggeredGridLayoutManager
import
androidx.recyclerview.widget.StaggeredGridLayoutManager
import
com.topjohnwu.magisk.
ui.base
.ViewEvent
import
com.topjohnwu.magisk.
arch
.ViewEvent
class
EndlessRecyclerScrollListener
(
class
EndlessRecyclerScrollListener
(
private
val
layoutManager
:
RecyclerView
.
LayoutManager
,
private
val
layoutManager
:
RecyclerView
.
LayoutManager
,
...
...
app/src/main/java/com/topjohnwu/magisk/
core/
utils/MarkwonImagePlugin.kt
→
app/src/main/java/com/topjohnwu/magisk/utils/MarkwonImagePlugin.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
core.
utils
package
com.topjohnwu.magisk.utils
import
android.graphics.Bitmap
import
android.graphics.Bitmap
import
android.graphics.Canvas
import
android.graphics.Canvas
...
@@ -173,7 +173,8 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() {
...
@@ -173,7 +173,8 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() {
if
(
measured
||
canvasWidth
==
0
)
if
(
measured
||
canvasWidth
==
0
)
return
return
measured
=
true
measured
=
true
val
bound
=
SizeResolver
.
resolveImageSize
(
size
,
defaultBounds
(),
canvasWidth
,
paint
.
textSize
)
val
bound
=
SizeResolver
.
resolveImageSize
(
size
,
defaultBounds
(),
canvasWidth
,
paint
.
textSize
)
draw
.
bounds
=
bound
draw
.
bounds
=
bound
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/
core/
utils/Utils.kt
→
app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
core.
utils
package
com.topjohnwu.magisk.utils
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
...
...
app/src/main/java/com/topjohnwu/magisk/
core
/net/Connectivity.kt
→
app/src/main/java/com/topjohnwu/magisk/
utils
/net/Connectivity.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.core.net
@file
:
Suppress
(
"DEPRECATION"
)
package
com.topjohnwu.magisk.utils.net
import
android.net.ConnectivityManager
import
android.net.ConnectivityManager
import
android.net.Network
import
android.net.Network
...
...
app/src/main/java/com/topjohnwu/magisk/
core
/net/LollipopNetworkObserver.kt
→
app/src/main/java/com/topjohnwu/magisk/
utils
/net/LollipopNetworkObserver.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
core
.net
package
com.topjohnwu.magisk.
utils
.net
import
android.annotation.TargetApi
import
android.annotation.TargetApi
import
android.content.Context
import
android.content.Context
...
...
app/src/main/java/com/topjohnwu/magisk/
core
/net/MarshmallowNetworkObserver.kt
→
app/src/main/java/com/topjohnwu/magisk/
utils
/net/MarshmallowNetworkObserver.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.core.net
@file
:
Suppress
(
"DEPRECATION"
)
package
com.topjohnwu.magisk.utils.net
import
android.annotation.TargetApi
import
android.annotation.TargetApi
import
android.content.BroadcastReceiver
import
android.content.BroadcastReceiver
...
...
app/src/main/java/com/topjohnwu/magisk/
core
/net/NetworkObserver.kt
→
app/src/main/java/com/topjohnwu/magisk/
utils
/net/NetworkObserver.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
core
.net
package
com.topjohnwu.magisk.
utils
.net
import
android.content.Context
import
android.content.Context
import
android.net.ConnectivityManager
import
android.net.ConnectivityManager
...
...
app/src/main/java/com/topjohnwu/magisk/
core
/net/PreLollipopNetworkObserver.kt
→
app/src/main/java/com/topjohnwu/magisk/
utils
/net/PreLollipopNetworkObserver.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.core.net
@file
:
Suppress
(
"DEPRECATION"
)
package
com.topjohnwu.magisk.utils.net
import
android.content.BroadcastReceiver
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Context
...
...
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
View file @
846bbb4d
...
@@ -23,9 +23,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
...
@@ -23,9 +23,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.itemBindingOf
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.databinding.DialogMagiskBaseBinding
import
com.topjohnwu.magisk.databinding.DialogMagiskBaseBinding
import
com.topjohnwu.magisk.ui.base.itemBindingOf
import
com.topjohnwu.magisk.utils.ObservableHost
import
com.topjohnwu.magisk.utils.ObservableHost
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters
import
me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters
...
...
app/src/main/java/com/topjohnwu/magisk/
core/
view/Notifications.kt
→
app/src/main/java/com/topjohnwu/magisk/view/Notifications.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
core.
view
package
com.topjohnwu.magisk.view
import
android.app.Notification
import
android.app.Notification
import
android.app.NotificationChannel
import
android.app.NotificationChannel
...
...
app/src/main/java/com/topjohnwu/magisk/
core/
view/Shortcuts.kt
→
app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt
View file @
846bbb4d
package
com.topjohnwu.magisk.
core.
view
package
com.topjohnwu.magisk.view
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
...
@@ -15,8 +15,8 @@ import com.topjohnwu.magisk.core.Const
...
@@ -15,8 +15,8 @@ import com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.SplashActivity
import
com.topjohnwu.magisk.core.SplashActivity
import
com.topjohnwu.magisk.core.intent
import
com.topjohnwu.magisk.core.intent
import
com.topjohnwu.magisk.core.utils.Utils
import
com.topjohnwu.magisk.ktx.getBitmap
import
com.topjohnwu.magisk.ktx.getBitmap
import
com.topjohnwu.magisk.utils.Utils
object
Shortcuts
{
object
Shortcuts
{
...
...
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