TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 10:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redesign is now the new norm

Browse Source
This commit is contained in:
topjohnwu 2020-01-13 00:43:09 +08:00
parent 1449486958
commit 3490ba0a56
90 changed files with 313 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/a/b.kt
View File

@ -1,5 +1,5 @@
package a package a
import com.topjohnwu.magisk.redesign.MainActivity import com.topjohnwu.magisk.ui.MainActivity
class b : MainActivity() class b : MainActivity()

2
app/src/main/java/a/f.java
View File

@ -1,6 +1,6 @@
package a; package a;
import com.topjohnwu.magisk.ui.flash.FlashActivity; import com.topjohnwu.magisk.legacy.flash.FlashActivity;
public class f extends FlashActivity { public class f extends FlashActivity {
/* stub */ /* stub */

2
app/src/main/java/a/m.java
View File

@ -1,6 +1,6 @@
package a; package a;
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity; import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity;
public class m extends SuRequestActivity { public class m extends SuRequestActivity {
/* stub */ /* stub */

2
app/src/main/java/com/topjohnwu/magisk/Config.kt
View File

@ -13,7 +13,7 @@ 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.redesign.theme.Theme import com.topjohnwu.magisk.ui.theme.Theme
import com.topjohnwu.magisk.utils.BiometricHelper import com.topjohnwu.magisk.utils.BiometricHelper
import com.topjohnwu.magisk.utils.Utils import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell

6
app/src/main/java/com/topjohnwu/magisk/Hacks.kt
View File

@ -18,10 +18,10 @@ import com.topjohnwu.magisk.extensions.forceGetDeclaredField
import com.topjohnwu.magisk.model.download.DownloadService import com.topjohnwu.magisk.model.download.DownloadService
import com.topjohnwu.magisk.model.receiver.GeneralReceiver import com.topjohnwu.magisk.model.receiver.GeneralReceiver
import com.topjohnwu.magisk.model.update.UpdateCheckService import com.topjohnwu.magisk.model.update.UpdateCheckService
import com.topjohnwu.magisk.redesign.MainActivity import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.magisk.ui.SplashActivity import com.topjohnwu.magisk.ui.SplashActivity
import com.topjohnwu.magisk.ui.flash.FlashActivity import com.topjohnwu.magisk.legacy.flash.FlashActivity
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import com.topjohnwu.magisk.utils.refreshLocale import com.topjohnwu.magisk.utils.refreshLocale
import com.topjohnwu.magisk.utils.updateConfig import com.topjohnwu.magisk.utils.updateConfig

24
app/src/main/java/com/topjohnwu/magisk/di/RedesignModule.kt
View File

@ -1,17 +1,17 @@
package com.topjohnwu.magisk.di package com.topjohnwu.magisk.di
import com.topjohnwu.magisk.redesign.MainViewModel import com.topjohnwu.magisk.ui.MainViewModel
import com.topjohnwu.magisk.redesign.flash.FlashViewModel import com.topjohnwu.magisk.ui.flash.FlashViewModel
import com.topjohnwu.magisk.redesign.hide.HideViewModel import com.topjohnwu.magisk.ui.hide.HideViewModel
import com.topjohnwu.magisk.redesign.home.HomeViewModel import com.topjohnwu.magisk.ui.home.HomeViewModel
import com.topjohnwu.magisk.redesign.install.InstallViewModel import com.topjohnwu.magisk.ui.install.InstallViewModel
import com.topjohnwu.magisk.redesign.log.LogViewModel import com.topjohnwu.magisk.ui.log.LogViewModel
import com.topjohnwu.magisk.redesign.module.ModuleViewModel import com.topjohnwu.magisk.ui.module.ModuleViewModel
import com.topjohnwu.magisk.redesign.request.RequestViewModel import com.topjohnwu.magisk.ui.request.RequestViewModel
import com.topjohnwu.magisk.redesign.safetynet.SafetynetViewModel import com.topjohnwu.magisk.ui.safetynet.SafetynetViewModel
import com.topjohnwu.magisk.redesign.settings.SettingsViewModel import com.topjohnwu.magisk.ui.settings.SettingsViewModel
import com.topjohnwu.magisk.redesign.superuser.SuperuserViewModel import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import com.topjohnwu.magisk.redesign.theme.ThemeViewModel import com.topjohnwu.magisk.ui.theme.ThemeViewModel
import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module import org.koin.dsl.module

4
app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
View File

@ -1,8 +1,8 @@
package com.topjohnwu.magisk.di package com.topjohnwu.magisk.di
import android.net.Uri import android.net.Uri
import com.topjohnwu.magisk.ui.flash.FlashViewModel import com.topjohnwu.magisk.legacy.flash.FlashViewModel
import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel import com.topjohnwu.magisk.legacy.surequest.SuRequestViewModel
import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module import org.koin.dsl.module

2
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt → app/src/main/java/com/topjohnwu/magisk/legacy/flash/FlashActivity.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.ui.flash package com.topjohnwu.magisk.legacy.flash
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

110
app/src/main/java/com/topjohnwu/magisk/legacy/flash/FlashViewModel.kt Normal file
View File

@ -0,0 +1,110 @@
package com.topjohnwu.magisk.legacy.flash
import android.Manifest.permission.READ_EXTERNAL_STORAGE
import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
import android.content.res.Resources
import android.net.Uri
import android.os.Handler
import androidx.core.os.postDelayed
import androidx.databinding.ObservableArrayList
import com.topjohnwu.magisk.BR
import com.topjohnwu.magisk.Config
import com.topjohnwu.magisk.Const
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.extensions.*
import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
import com.topjohnwu.magisk.model.events.SnackbarEvent
import com.topjohnwu.magisk.model.flash.FlashResultListener
import com.topjohnwu.magisk.model.flash.Flashing
import com.topjohnwu.magisk.model.flash.Patching
import com.topjohnwu.magisk.utils.DiffObservableList
import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.superuser.Shell
import me.tatarka.bindingcollectionadapter2.ItemBinding
import java.io.File
import java.util.*
class FlashViewModel(
action: String,
installer: Uri,
uri: Uri,
private val resources: Resources
) : BaseViewModel(), FlashResultListener {
val canShowReboot = Shell.rootAccess()
val showRestartTitle = KObservableField(false)
val behaviorText = KObservableField(resources.getString(R.string.flashing))
val items = DiffObservableList(ComparableRvItem.callback)
val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->
item.bind(itemBinding)
itemBinding.bindExtra(BR.viewModel, this@FlashViewModel)
}
private val outItems = ObservableArrayList<String>()
private val logItems = Collections.synchronizedList(mutableListOf<String>())
init {
outItems.sendUpdatesTo(items) { it.map { ConsoleRvItem(it) } }
outItems.copyNewInputInto(logItems)
state = State.LOADING
when (action) {
Const.Value.FLASH_ZIP -> Flashing
.Install(installer, outItems, logItems, this)
.exec()
Const.Value.UNINSTALL -> Flashing
.Uninstall(installer, outItems, logItems, this)
.exec()
Const.Value.FLASH_MAGISK -> Patching
.Direct(installer, outItems, logItems, this)
.exec()
Const.Value.FLASH_INACTIVE_SLOT -> Patching
.SecondSlot(installer, outItems, logItems, this)
.exec()
Const.Value.PATCH_FILE -> Patching
.File(installer, uri, outItems, logItems, this)
.exec()
}
}
override fun onResult(isSuccess: Boolean) {
state = if (isSuccess) State.LOADED else State.LOADING_FAILED
behaviorText.value = when {
isSuccess -> resources.getString(R.string.done)
else -> resources.getString(R.string.failure)
}
if (isSuccess) {
Handler().postDelayed(500) {
showRestartTitle.value = true
}
}
}
fun savePressed() = withPermissions(READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE)
.map { now }
.map { it.toTime(timeFormatStandard) }
.map { Const.MAGISK_INSTALL_LOG_FILENAME.format(it) }
.map { File(Config.downloadDirectory, it) }
.map { file ->
file.bufferedWriter().use { writer ->
logItems.forEach {
writer.write(it)
writer.newLine()
}
}
file.path
}
.subscribeK { SnackbarEvent(it).publish() }
.add()
fun restartPressed() = reboot()
fun backPressed() = back()
}

2
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt → app/src/main/java/com/topjohnwu/magisk/legacy/surequest/SuRequestActivity.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.ui.surequest package com.topjohnwu.magisk.legacy.surequest
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo

2
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt → app/src/main/java/com/topjohnwu/magisk/legacy/surequest/SuRequestViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.ui.surequest package com.topjohnwu.magisk.legacy.surequest
import android.content.Intent import android.content.Intent
import android.content.SharedPreferences import android.content.SharedPreferences

2
app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt
View File

@ -16,7 +16,7 @@ import com.topjohnwu.magisk.model.entity.internal.Configuration.*
import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary
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.ui.flash.FlashActivity import com.topjohnwu.magisk.legacy.flash.FlashActivity
import com.topjohnwu.magisk.utils.APKInstall import com.topjohnwu.magisk.utils.APKInstall
import org.koin.core.get import org.koin.core.get
import java.io.File import java.io.File

2
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt
View File

@ -10,7 +10,7 @@ import com.topjohnwu.magisk.extensions.toggle
import com.topjohnwu.magisk.model.entity.ProcessHideApp import com.topjohnwu.magisk.model.entity.ProcessHideApp
import com.topjohnwu.magisk.model.entity.StatefulProcess import com.topjohnwu.magisk.model.entity.StatefulProcess
import com.topjohnwu.magisk.model.observer.Observer import com.topjohnwu.magisk.model.observer.Observer
import com.topjohnwu.magisk.redesign.hide.HideViewModel import com.topjohnwu.magisk.ui.hide.HideViewModel
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
import kotlin.math.roundToInt import kotlin.math.roundToInt

2
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
View File

@ -10,7 +10,7 @@ import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.ComparableRvItem import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.model.entity.module.Module import com.topjohnwu.magisk.model.entity.module.Module
import com.topjohnwu.magisk.model.entity.module.Repo import com.topjohnwu.magisk.model.entity.module.Repo
import com.topjohnwu.magisk.redesign.module.ModuleViewModel import com.topjohnwu.magisk.ui.module.ModuleViewModel
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
object SafeModeNotice : ComparableRvItem<SafeModeNotice>() { object SafeModeNotice : ComparableRvItem<SafeModeNotice>() {

2
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt
View File

@ -6,7 +6,7 @@ import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.extensions.toggle
import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.MagiskPolicy
import com.topjohnwu.magisk.model.events.PolicyUpdateEvent import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
import com.topjohnwu.magisk.redesign.superuser.SuperuserViewModel import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
class PolicyItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyItem>() { class PolicyItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyItem>() {

2
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ThemeItem.kt
View File

@ -2,7 +2,7 @@ package com.topjohnwu.magisk.model.entity.recycler
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.ComparableRvItem import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.redesign.theme.Theme import com.topjohnwu.magisk.ui.theme.Theme
class ThemeItem(val theme: Theme) : ComparableRvItem<ThemeItem>() { class ThemeItem(val theme: Theme) : ComparableRvItem<ThemeItem>() {

2
app/src/main/java/com/topjohnwu/magisk/model/events/InstallExternalModuleEvent.kt
View File

@ -6,7 +6,7 @@ import android.content.Intent
import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.Const
import com.topjohnwu.magisk.base.BaseActivity import com.topjohnwu.magisk.base.BaseActivity
import com.topjohnwu.magisk.intent import com.topjohnwu.magisk.intent
import com.topjohnwu.magisk.ui.flash.FlashActivity import com.topjohnwu.magisk.legacy.flash.FlashActivity
class InstallExternalModuleEvent : ViewEvent(), ActivityExecutor { class InstallExternalModuleEvent : ViewEvent(), ActivityExecutor {

2
app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt
View File

@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
import com.topjohnwu.magisk.base.BaseActivity import com.topjohnwu.magisk.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.redesign.compat.CompatActivity import com.topjohnwu.magisk.ui.compat.CompatActivity
import kotlin.reflect.KClass import kotlin.reflect.KClass
@DslMarker @DslMarker

20
app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt
View File

@ -5,16 +5,16 @@ import android.content.Intent
import android.os.Build import android.os.Build
import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.Const
import com.topjohnwu.magisk.intent import com.topjohnwu.magisk.intent
import com.topjohnwu.magisk.redesign.MainActivity import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.magisk.redesign.hide.HideFragment import com.topjohnwu.magisk.ui.hide.HideFragment
import com.topjohnwu.magisk.redesign.home.HomeFragment import com.topjohnwu.magisk.ui.home.HomeFragment
import com.topjohnwu.magisk.redesign.install.InstallFragment import com.topjohnwu.magisk.ui.install.InstallFragment
import com.topjohnwu.magisk.redesign.log.LogFragment import com.topjohnwu.magisk.ui.log.LogFragment
import com.topjohnwu.magisk.redesign.module.ModuleFragment import com.topjohnwu.magisk.ui.module.ModuleFragment
import com.topjohnwu.magisk.redesign.safetynet.SafetynetFragment import com.topjohnwu.magisk.ui.safetynet.SafetynetFragment
import com.topjohnwu.magisk.redesign.settings.SettingsFragment import com.topjohnwu.magisk.ui.settings.SettingsFragment
import com.topjohnwu.magisk.redesign.superuser.SuperuserFragment import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import com.topjohnwu.magisk.redesign.theme.ThemeFragment import com.topjohnwu.magisk.ui.theme.ThemeFragment
object Navigation { object Navigation {

5
app/src/main/java/com/topjohnwu/magisk/redesign/MainViewModel.kt
View File

@ -1,5 +0,0 @@
package com.topjohnwu.magisk.redesign
import com.topjohnwu.magisk.redesign.compat.CompatViewModel
class MainViewModel : CompatViewModel()

5
app/src/main/java/com/topjohnwu/magisk/redesign/flash/FlashViewModel.kt
View File

@ -1,5 +0,0 @@
package com.topjohnwu.magisk.redesign.flash
import com.topjohnwu.magisk.redesign.compat.CompatViewModel
class FlashViewModel : CompatViewModel()

5
app/src/main/java/com/topjohnwu/magisk/redesign/request/RequestViewModel.kt
View File

@ -1,5 +0,0 @@
package com.topjohnwu.magisk.redesign.request
import com.topjohnwu.magisk.redesign.compat.CompatViewModel
class RequestViewModel : CompatViewModel()

12
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt → app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign package com.topjohnwu.magisk.ui
import android.os.Bundle import android.os.Bundle
import android.view.MenuItem import android.view.MenuItem
@ -17,11 +17,11 @@ import com.topjohnwu.magisk.R
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.redesign.compat.CompatActivity import com.topjohnwu.magisk.ui.compat.CompatActivity
import com.topjohnwu.magisk.redesign.compat.CompatNavigationDelegate import com.topjohnwu.magisk.ui.compat.CompatNavigationDelegate
import com.topjohnwu.magisk.redesign.home.HomeFragment import com.topjohnwu.magisk.ui.home.HomeFragment
import com.topjohnwu.magisk.redesign.module.ModuleFragment import com.topjohnwu.magisk.ui.module.ModuleFragment
import com.topjohnwu.magisk.redesign.superuser.SuperuserFragment import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior import com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
import com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior import com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
import com.topjohnwu.magisk.utils.HideableBehavior import com.topjohnwu.magisk.utils.HideableBehavior

5
app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt Normal file
View File

@ -0,0 +1,5 @@
package com.topjohnwu.magisk.ui
import com.topjohnwu.magisk.ui.compat.CompatViewModel
class MainViewModel : CompatViewModel()

2
app/src/main/java/com/topjohnwu/magisk/redesign/ReselectionTarget.kt → app/src/main/java/com/topjohnwu/magisk/ui/ReselectionTarget.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign package com.topjohnwu.magisk.ui
interface ReselectionTarget { interface ReselectionTarget {

4
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatActivity.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
@ -17,7 +17,7 @@ import com.topjohnwu.magisk.model.events.SnackbarEvent
import com.topjohnwu.magisk.model.events.ViewEvent import com.topjohnwu.magisk.model.events.ViewEvent
import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
import com.topjohnwu.magisk.model.navigation.Navigator import com.topjohnwu.magisk.model.navigation.Navigator
import com.topjohnwu.magisk.redesign.theme.Theme import com.topjohnwu.magisk.ui.theme.Theme
import kotlin.reflect.KClass import kotlin.reflect.KClass

2
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatDelegate.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import android.view.View import android.view.View
import androidx.core.graphics.Insets import androidx.core.graphics.Insets

2
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatFragment.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

2
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatHelpers.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatHelpers.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import androidx.databinding.ViewDataBinding import androidx.databinding.ViewDataBinding
import com.topjohnwu.magisk.databinding.ComparableRvItem import com.topjohnwu.magisk.databinding.ComparableRvItem

4
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatNavigationDelegate.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatNavigationDelegate.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -8,7 +8,7 @@ import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
import com.topjohnwu.magisk.model.navigation.Navigator import com.topjohnwu.magisk.model.navigation.Navigator
import com.topjohnwu.magisk.redesign.ReselectionTarget import com.topjohnwu.magisk.ui.ReselectionTarget
import timber.log.Timber import timber.log.Timber
class CompatNavigationDelegate<out Source>( class CompatNavigationDelegate<out Source>(

2
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatView.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import android.view.View import android.view.View
import androidx.core.graphics.Insets import androidx.core.graphics.Insets

2
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/CompatViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import androidx.annotation.CallSuper import androidx.annotation.CallSuper
import androidx.core.graphics.Insets import androidx.core.graphics.Insets

2
app/src/main/java/com/topjohnwu/magisk/redesign/compat/Queryable.kt → app/src/main/java/com/topjohnwu/magisk/ui/compat/Queryable.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.compat package com.topjohnwu.magisk.ui.compat
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper

4
app/src/main/java/com/topjohnwu/magisk/redesign/flash/FlashFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
View File

@ -1,8 +1,8 @@
package com.topjohnwu.magisk.redesign.flash 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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
class FlashFragment : CompatFragment<FlashViewModel, FragmentFlashMd2Binding>() { class FlashFragment : CompatFragment<FlashViewModel, FragmentFlashMd2Binding>() {

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

@ -1,110 +1,5 @@
package com.topjohnwu.magisk.ui.flash package com.topjohnwu.magisk.ui.flash
import android.Manifest.permission.READ_EXTERNAL_STORAGE import com.topjohnwu.magisk.ui.compat.CompatViewModel
import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
import android.content.res.Resources
import android.net.Uri
import android.os.Handler
import androidx.core.os.postDelayed
import androidx.databinding.ObservableArrayList
import com.topjohnwu.magisk.BR
import com.topjohnwu.magisk.Config
import com.topjohnwu.magisk.Const
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.extensions.*
import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
import com.topjohnwu.magisk.model.events.SnackbarEvent
import com.topjohnwu.magisk.model.flash.FlashResultListener
import com.topjohnwu.magisk.model.flash.Flashing
import com.topjohnwu.magisk.model.flash.Patching
import com.topjohnwu.magisk.utils.DiffObservableList
import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.superuser.Shell
import me.tatarka.bindingcollectionadapter2.ItemBinding
import java.io.File
import java.util.*
class FlashViewModel( class FlashViewModel : CompatViewModel()
action: String,
installer: Uri,
uri: Uri,
private val resources: Resources
) : BaseViewModel(), FlashResultListener {
val canShowReboot = Shell.rootAccess()
val showRestartTitle = KObservableField(false)
val behaviorText = KObservableField(resources.getString(R.string.flashing))
val items = DiffObservableList(ComparableRvItem.callback)
val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->
item.bind(itemBinding)
itemBinding.bindExtra(BR.viewModel, this@FlashViewModel)
}
private val outItems = ObservableArrayList<String>()
private val logItems = Collections.synchronizedList(mutableListOf<String>())
init {
outItems.sendUpdatesTo(items) { it.map { ConsoleRvItem(it) } }
outItems.copyNewInputInto(logItems)
state = State.LOADING
when (action) {
Const.Value.FLASH_ZIP -> Flashing
.Install(installer, outItems, logItems, this)
.exec()
Const.Value.UNINSTALL -> Flashing
.Uninstall(installer, outItems, logItems, this)
.exec()
Const.Value.FLASH_MAGISK -> Patching
.Direct(installer, outItems, logItems, this)
.exec()
Const.Value.FLASH_INACTIVE_SLOT -> Patching
.SecondSlot(installer, outItems, logItems, this)
.exec()
Const.Value.PATCH_FILE -> Patching
.File(installer, uri, outItems, logItems, this)
.exec()
}
}
override fun onResult(isSuccess: Boolean) {
state = if (isSuccess) State.LOADED else State.LOADING_FAILED
behaviorText.value = when {
isSuccess -> resources.getString(R.string.done)
else -> resources.getString(R.string.failure)
}
if (isSuccess) {
Handler().postDelayed(500) {
showRestartTitle.value = true
}
}
}
fun savePressed() = withPermissions(READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE)
.map { now }
.map { it.toTime(timeFormatStandard) }
.map { Const.MAGISK_INSTALL_LOG_FILENAME.format(it) }
.map { File(Config.downloadDirectory, it) }
.map { file ->
file.bufferedWriter().use { writer ->
logItems.forEach {
writer.write(it)
writer.newLine()
}
}
file.path
}
.subscribeK { SnackbarEvent(it).publish() }
.add()
fun restartPressed() = reboot()
fun backPressed() = back()
}

6
app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.hide package com.topjohnwu.magisk.ui.hide
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -12,8 +12,8 @@ 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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import com.topjohnwu.magisk.redesign.compat.hideKeyboard import com.topjohnwu.magisk.ui.compat.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

10
app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.hide package com.topjohnwu.magisk.ui.hide
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import androidx.databinding.Bindable import androidx.databinding.Bindable
@ -12,10 +12,10 @@ import com.topjohnwu.magisk.model.entity.ProcessHideApp
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.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.redesign.compat.Queryable import com.topjohnwu.magisk.ui.compat.Queryable
import com.topjohnwu.magisk.redesign.compat.filterableListOf import com.topjohnwu.magisk.ui.compat.filterableListOf
import com.topjohnwu.magisk.redesign.compat.itemBindingOf import com.topjohnwu.magisk.ui.compat.itemBindingOf
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.magisk.utils.currentLocale import com.topjohnwu.magisk.utils.currentLocale

4
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.home package com.topjohnwu.magisk.ui.home
import android.view.Menu import android.view.Menu
import android.view.MenuInflater import android.view.MenuInflater
@ -7,7 +7,7 @@ import androidx.core.graphics.Insets
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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() { class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {

6
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.home package com.topjohnwu.magisk.ui.home
import android.Manifest import android.Manifest
import android.os.Build import android.os.Build
@ -22,8 +22,8 @@ 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.model.navigation.Navigation import com.topjohnwu.magisk.model.navigation.Navigation
import com.topjohnwu.magisk.model.observer.Observer import com.topjohnwu.magisk.model.observer.Observer
import com.topjohnwu.magisk.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.redesign.compat.itemBindingOf import com.topjohnwu.magisk.ui.compat.itemBindingOf
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import me.tatarka.bindingcollectionadapter2.BR import me.tatarka.bindingcollectionadapter2.BR

4
app/src/main/java/com/topjohnwu/magisk/redesign/install/InstallFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
View File

@ -1,11 +1,11 @@
package com.topjohnwu.magisk.redesign.install package com.topjohnwu.magisk.ui.install
import android.content.Intent import android.content.Intent
import androidx.core.graphics.Insets import androidx.core.graphics.Insets
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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
class InstallFragment : CompatFragment<InstallViewModel, FragmentInstallMd2Binding>() { class InstallFragment : CompatFragment<InstallViewModel, FragmentInstallMd2Binding>() {

4
app/src/main/java/com/topjohnwu/magisk/redesign/install/InstallViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.install package com.topjohnwu.magisk.ui.install
import android.net.Uri import android.net.Uri
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
@ -8,7 +8,7 @@ import com.topjohnwu.magisk.model.download.RemoteFileService
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.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import com.topjohnwu.superuser.ShellUtils import com.topjohnwu.superuser.ShellUtils

6
app/src/main/java/com/topjohnwu/magisk/redesign/log/LogFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.log package com.topjohnwu.magisk.ui.log
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
@ -9,8 +9,8 @@ import androidx.core.graphics.Insets
import androidx.core.view.isVisible 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.redesign.MainActivity import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.magisk.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
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

8
app/src/main/java/com/topjohnwu/magisk/redesign/log/LogViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.log package com.topjohnwu.magisk.ui.log
import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.BR
import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.Config
@ -12,9 +12,9 @@ import com.topjohnwu.magisk.model.entity.recycler.ConsoleItem
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.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.redesign.compat.diffListOf import com.topjohnwu.magisk.ui.compat.diffListOf
import com.topjohnwu.magisk.redesign.compat.itemBindingOf import com.topjohnwu.magisk.ui.compat.itemBindingOf
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers

10
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.module package com.topjohnwu.magisk.ui.module
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -14,10 +14,10 @@ import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent 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.redesign.MainActivity import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.magisk.redesign.ReselectionTarget import com.topjohnwu.magisk.ui.ReselectionTarget
import com.topjohnwu.magisk.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import com.topjohnwu.magisk.redesign.compat.hideKeyboard import com.topjohnwu.magisk.ui.compat.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

4
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.module package com.topjohnwu.magisk.ui.module
import androidx.annotation.WorkerThread import androidx.annotation.WorkerThread
import androidx.databinding.Bindable import androidx.databinding.Bindable
@ -19,8 +19,8 @@ import com.topjohnwu.magisk.model.entity.recycler.*
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.redesign.compat.*
import com.topjohnwu.magisk.tasks.RepoUpdater import com.topjohnwu.magisk.tasks.RepoUpdater
import com.topjohnwu.magisk.ui.compat.*
import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
import com.topjohnwu.magisk.utils.currentLocale import com.topjohnwu.magisk.utils.currentLocale

4
app/src/main/java/com/topjohnwu/magisk/redesign/request/RequestActivity.kt → app/src/main/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt
View File

@ -1,8 +1,8 @@
package com.topjohnwu.magisk.redesign.request 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.redesign.compat.CompatActivity import com.topjohnwu.magisk.ui.compat.CompatActivity
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
class RequestActivity : CompatActivity<RequestViewModel, ActivityRequestMd2Binding>() { class RequestActivity : CompatActivity<RequestViewModel, ActivityRequestMd2Binding>() {

5
app/src/main/java/com/topjohnwu/magisk/ui/request/RequestViewModel.kt Normal file
View File

@ -0,0 +1,5 @@
package com.topjohnwu.magisk.ui.request
import com.topjohnwu.magisk.ui.compat.CompatViewModel
class RequestViewModel : CompatViewModel()

4
app/src/main/java/com/topjohnwu/magisk/redesign/safetynet/SafetynetFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
View File

@ -1,8 +1,8 @@
package com.topjohnwu.magisk.redesign.safetynet 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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd2Binding>() { class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd2Binding>() {

6
app/src/main/java/com/topjohnwu/magisk/redesign/safetynet/SafetynetViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.safetynet package com.topjohnwu.magisk.ui.safetynet
import androidx.databinding.Bindable import androidx.databinding.Bindable
import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.BR
@ -6,8 +6,8 @@ import com.topjohnwu.magisk.R
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
import com.topjohnwu.magisk.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.redesign.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.utils.SafetyNetHelper import com.topjohnwu.magisk.utils.SafetyNetHelper

4
app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View File

@ -1,11 +1,11 @@
package com.topjohnwu.magisk.redesign.settings package com.topjohnwu.magisk.ui.settings
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.core.graphics.Insets import androidx.core.graphics.Insets
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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
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

2
app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsItems.kt → app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.settings package com.topjohnwu.magisk.ui.settings
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build

10
app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.settings package com.topjohnwu.magisk.ui.settings
import android.Manifest import android.Manifest
import android.view.View import android.view.View
@ -15,10 +15,10 @@ import com.topjohnwu.magisk.model.events.PermissionEvent
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.model.navigation.Navigation import com.topjohnwu.magisk.model.navigation.Navigation
import com.topjohnwu.magisk.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.redesign.compat.adapterOf import com.topjohnwu.magisk.ui.compat.adapterOf
import com.topjohnwu.magisk.redesign.compat.diffListOf import com.topjohnwu.magisk.ui.compat.diffListOf
import com.topjohnwu.magisk.redesign.compat.itemBindingOf import com.topjohnwu.magisk.ui.compat.itemBindingOf
import com.topjohnwu.magisk.utils.PatchAPK import com.topjohnwu.magisk.utils.PatchAPK
import com.topjohnwu.magisk.utils.Utils import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell

4
app/src/main/java/com/topjohnwu/magisk/redesign/superuser/SuperuserFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.superuser package com.topjohnwu.magisk.ui.superuser
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
@ -9,7 +9,7 @@ import androidx.core.graphics.Insets
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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
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

10
app/src/main/java/com/topjohnwu/magisk/redesign/superuser/SuperuserViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.superuser package com.topjohnwu.magisk.ui.superuser
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.content.res.Resources import android.content.res.Resources
@ -19,10 +19,10 @@ 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.model.navigation.Navigation import com.topjohnwu.magisk.model.navigation.Navigation
import com.topjohnwu.magisk.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
import com.topjohnwu.magisk.redesign.compat.adapterOf import com.topjohnwu.magisk.ui.compat.adapterOf
import com.topjohnwu.magisk.redesign.compat.diffListOf import com.topjohnwu.magisk.ui.compat.diffListOf
import com.topjohnwu.magisk.redesign.compat.itemBindingOf import com.topjohnwu.magisk.ui.compat.itemBindingOf
import com.topjohnwu.magisk.utils.BiometricHelper import com.topjohnwu.magisk.utils.BiometricHelper
import com.topjohnwu.magisk.utils.currentLocale import com.topjohnwu.magisk.utils.currentLocale
import io.reactivex.Single import io.reactivex.Single

2
app/src/main/java/com/topjohnwu/magisk/redesign/theme/Theme.kt → app/src/main/java/com/topjohnwu/magisk/ui/theme/Theme.kt
View File

@ -1,4 +1,4 @@
package com.topjohnwu.magisk.redesign.theme package com.topjohnwu.magisk.ui.theme
import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.Config
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R

4
app/src/main/java/com/topjohnwu/magisk/redesign/theme/ThemeFragment.kt → app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt
View File

@ -1,9 +1,9 @@
package com.topjohnwu.magisk.redesign.theme package com.topjohnwu.magisk.ui.theme
import androidx.core.graphics.Insets import androidx.core.graphics.Insets
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.redesign.compat.CompatFragment import com.topjohnwu.magisk.ui.compat.CompatFragment
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
class ThemeFragment : CompatFragment<ThemeViewModel, FragmentThemeMd2Binding>() { class ThemeFragment : CompatFragment<ThemeViewModel, FragmentThemeMd2Binding>() {

4
app/src/main/java/com/topjohnwu/magisk/redesign/theme/ThemeViewModel.kt → app/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeViewModel.kt
View File

@ -1,9 +1,9 @@
package com.topjohnwu.magisk.redesign.theme package com.topjohnwu.magisk.ui.theme
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.redesign.compat.CompatViewModel import com.topjohnwu.magisk.ui.compat.CompatViewModel
class ThemeViewModel : CompatViewModel(), TappableHeadlineItem.Listener { class ThemeViewModel : CompatViewModel(), TappableHeadlineItem.Listener {

2
app/src/main/java/com/topjohnwu/magisk/utils/SuHandler.kt
View File

@ -15,7 +15,7 @@ import com.topjohnwu.magisk.extensions.subscribeK
import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.MagiskPolicy
import com.topjohnwu.magisk.model.entity.toLog import com.topjohnwu.magisk.model.entity.toLog
import com.topjohnwu.magisk.model.entity.toPolicy import com.topjohnwu.magisk.model.entity.toPolicy
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import timber.log.Timber import timber.log.Timber

2
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
View File

@ -22,7 +22,7 @@ import com.topjohnwu.magisk.BR
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
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.redesign.compat.itemBindingOf import com.topjohnwu.magisk.ui.compat.itemBindingOf
import com.topjohnwu.magisk.utils.KObservableField import com.topjohnwu.magisk.utils.KObservableField
import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters
import me.tatarka.bindingcollectionadapter2.ItemBinding import me.tatarka.bindingcollectionadapter2.ItemBinding

2
app/src/main/res/layout/activity_flash.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.ui.flash.FlashViewModel" /> type="com.topjohnwu.magisk.legacy.flash.FlashViewModel" />
</data> </data>

2
app/src/main/res/layout/activity_main_md2.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.MainViewModel" /> type="com.topjohnwu.magisk.ui.MainViewModel" />
</data> </data>

2
app/src/main/res/layout/activity_request.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.ui.surequest.SuRequestViewModel" /> type="com.topjohnwu.magisk.legacy.surequest.SuRequestViewModel" />
</data> </data>

2
app/src/main/res/layout/activity_request_md2.xml
View File

@ -5,7 +5,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.request.RequestViewModel" /> type="com.topjohnwu.magisk.ui.request.RequestViewModel" />
</data> </data>

2
app/src/main/res/layout/dialog_settings_app_name.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="data" name="data"
type="com.topjohnwu.magisk.redesign.settings.Hide" /> type="com.topjohnwu.magisk.ui.settings.Hide" />
</data> </data>

2
app/src/main/res/layout/dialog_settings_download_path.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="data" name="data"
type="com.topjohnwu.magisk.redesign.settings.DownloadPath" /> type="com.topjohnwu.magisk.ui.settings.DownloadPath" />
</data> </data>

2
app/src/main/res/layout/dialog_settings_update_channel.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="data" name="data"
type="com.topjohnwu.magisk.redesign.settings.UpdateChannelUrl" /> type="com.topjohnwu.magisk.ui.settings.UpdateChannelUrl" />
</data> </data>

2
app/src/main/res/layout/fragment_flash_md2.xml
View File

@ -5,7 +5,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.flash.FlashViewModel" /> type="com.topjohnwu.magisk.ui.flash.FlashViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_hide_md2.xml
View File

@ -9,7 +9,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.hide.HideViewModel" /> type="com.topjohnwu.magisk.ui.hide.HideViewModel" />
</data> </data>

4
app/src/main/res/layout/fragment_home_md2.xml
View File

@ -17,7 +17,7 @@
<import type="com.topjohnwu.magisk.BuildConfig" /> <import type="com.topjohnwu.magisk.BuildConfig" />
<import type="com.topjohnwu.magisk.redesign.home.MagiskState" /> <import type="com.topjohnwu.magisk.ui.home.MagiskState" />
<import type="com.topjohnwu.magisk.extensions.XAndroidKt" /> <import type="com.topjohnwu.magisk.extensions.XAndroidKt" />
@ -25,7 +25,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.home.HomeViewModel" /> type="com.topjohnwu.magisk.ui.home.HomeViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_install_md2.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.install.InstallViewModel" /> type="com.topjohnwu.magisk.ui.install.InstallViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_log_md2.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.log.LogViewModel" /> type="com.topjohnwu.magisk.ui.log.LogViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_module_md2.xml
View File

@ -11,7 +11,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_safetynet_md2.xml
View File

@ -12,7 +12,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.safetynet.SafetynetViewModel" /> type="com.topjohnwu.magisk.ui.safetynet.SafetynetViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_settings_md2.xml
View File

@ -9,7 +9,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.settings.SettingsViewModel" /> type="com.topjohnwu.magisk.ui.settings.SettingsViewModel" />
</data> </data>

2
app/src/main/res/layout/fragment_superuser_md2.xml
View File

@ -9,7 +9,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.superuser.SuperuserViewModel" /> type="com.topjohnwu.magisk.ui.superuser.SuperuserViewModel" />
</data> </data>

4
app/src/main/res/layout/fragment_theme_md2.xml
View File

@ -4,11 +4,11 @@
<data> <data>
<import type="com.topjohnwu.magisk.redesign.theme.Theme" /> <import type="com.topjohnwu.magisk.ui.theme.Theme" />
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.theme.ThemeViewModel" /> type="com.topjohnwu.magisk.ui.theme.ThemeViewModel" />
</data> </data>

2
app/src/main/res/layout/include_hide_filter.xml
View File

@ -9,7 +9,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.hide.HideViewModel" /> type="com.topjohnwu.magisk.ui.hide.HideViewModel" />
</data> </data>

2
app/src/main/res/layout/include_log_magisk.xml
View File

@ -7,7 +7,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.log.LogViewModel" /> type="com.topjohnwu.magisk.ui.log.LogViewModel" />
</data> </data>

2
app/src/main/res/layout/include_module_filter.xml
View File

@ -9,7 +9,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
</data> </data>

2
app/src/main/res/layout/item_developer.xml
View File

@ -11,7 +11,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.home.HomeViewModel" /> type="com.topjohnwu.magisk.ui.home.HomeViewModel" />
</data> </data>

2
app/src/main/res/layout/item_developer_link.xml
View File

@ -11,7 +11,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.home.HomeViewModel" /> type="com.topjohnwu.magisk.ui.home.HomeViewModel" />
</data> </data>

2
app/src/main/res/layout/item_hide_md2.xml
View File

@ -13,7 +13,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.hide.HideViewModel" /> type="com.topjohnwu.magisk.ui.hide.HideViewModel" />
</data> </data>

2
app/src/main/res/layout/item_hide_process_md2.xml
View File

@ -11,7 +11,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.hide.HideViewModel" /> type="com.topjohnwu.magisk.ui.hide.HideViewModel" />
</data> </data>

2
app/src/main/res/layout/item_log_access_md2.xml
View File

@ -13,7 +13,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.log.LogViewModel" /> type="com.topjohnwu.magisk.ui.log.LogViewModel" />
</data> </data>

2
app/src/main/res/layout/item_module_download.xml
View File

@ -10,7 +10,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
</data> </data>

2
app/src/main/res/layout/item_module_md2.xml
View File

@ -15,7 +15,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
</data> </data>

2
app/src/main/res/layout/item_policy_md2.xml
View File

@ -11,7 +11,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.superuser.SuperuserViewModel" /> type="com.topjohnwu.magisk.ui.superuser.SuperuserViewModel" />
</data> </data>

2
app/src/main/res/layout/item_repo_md2.xml
View File

@ -13,7 +13,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
</data> </data>

2
app/src/main/res/layout/item_section_md2.xml
View File

@ -11,7 +11,7 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
</data> </data>

4
app/src/main/res/layout/item_theme.xml
View File

@ -7,11 +7,11 @@
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.redesign.theme.ThemeViewModel" /> type="com.topjohnwu.magisk.ui.theme.ThemeViewModel" />
<variable <variable
name="theme" name="theme"
type="com.topjohnwu.magisk.redesign.theme.Theme" /> type="com.topjohnwu.magisk.ui.theme.Theme" />
</data> </data>