MarcoBuster
/
Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move surequest out of legacy

This commit is contained in:
topjohnwu 2020-03-30 23:53:11 -07:00
parent 6b0854749f
commit 5537b083a8
10 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import com.topjohnwu.magisk.core.App
import com.topjohnwu.magisk.core.GeneralReceiver
import com.topjohnwu.magisk.core.SplashActivity
import com.topjohnwu.magisk.core.download.DownloadService
import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.signing.BootSigner

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

@ -21,7 +21,7 @@ import com.topjohnwu.magisk.core.download.DownloadService
import com.topjohnwu.magisk.core.utils.refreshLocale
import com.topjohnwu.magisk.core.utils.updateConfig
import com.topjohnwu.magisk.extensions.forceGetDeclaredField
import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
import com.topjohnwu.magisk.ui.MainActivity
fun AssetManager.addAssetPath(path: String) {

2
app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
View File

@ -20,7 +20,7 @@ import com.topjohnwu.magisk.extensions.get
import com.topjohnwu.magisk.extensions.startActivity
import com.topjohnwu.magisk.extensions.startActivityWithRoot
import com.topjohnwu.magisk.extensions.subscribeK
import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
import com.topjohnwu.magisk.model.entity.toLog
import com.topjohnwu.superuser.Shell
import timber.log.Timber

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

@ -1,6 +1,5 @@
package com.topjohnwu.magisk.di
import com.topjohnwu.magisk.legacy.surequest.SuRequestViewModel
import com.topjohnwu.magisk.ui.MainViewModel
import com.topjohnwu.magisk.ui.flash.FlashFragmentArgs
import com.topjohnwu.magisk.ui.flash.FlashViewModel
@ -9,10 +8,10 @@ import com.topjohnwu.magisk.ui.home.HomeViewModel
import com.topjohnwu.magisk.ui.install.InstallViewModel
import com.topjohnwu.magisk.ui.log.LogViewModel
import com.topjohnwu.magisk.ui.module.ModuleViewModel
import com.topjohnwu.magisk.ui.request.RequestViewModel
import com.topjohnwu.magisk.ui.safetynet.SafetynetViewModel
import com.topjohnwu.magisk.ui.settings.SettingsViewModel
import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
import com.topjohnwu.magisk.ui.theme.ThemeViewModel
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module
@ -22,7 +21,6 @@ val viewModelModules = module {
viewModel { HomeViewModel(get()) }
viewModel { LogViewModel(get()) }
viewModel { ModuleViewModel(get(), get(), get()) }
viewModel { RequestViewModel() }
viewModel { SafetynetViewModel(get()) }
viewModel { SettingsViewModel(get()) }
viewModel { SuperuserViewModel(get(), get(), get()) }

14
app/src/main/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt
View File

@ -1,14 +0,0 @@
package com.topjohnwu.magisk.ui.request
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.ActivityRequestMd2Binding
import com.topjohnwu.magisk.ui.base.BaseUIActivity
import org.koin.androidx.viewmodel.ext.android.viewModel
class RequestActivity : BaseUIActivity<RequestViewModel, ActivityRequestMd2Binding>() {
override val navHost = TODO()
override val layoutRes = R.layout.activity_request_md2
override val viewModel by viewModel<RequestViewModel>()
}

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

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

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

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

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

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

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

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

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

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="viewModel"
type="com.topjohnwu.magisk.ui.request.RequestViewModel" />
</data>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</androidx.core.widget.NestedScrollView>
</layout>