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

Removed single-use reboot menu

Browse Source 
This addition will be used in modules as soon as the homepage gets merged
This commit is contained in:
Viktor De Pasquale 2020-02-06 14:40:38 +01:00 committed by John Wu
parent f8bea66313
commit 97d24a7d4d
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/topjohnwu/magisk/model/events/RebootEvent.kt Normal file
View File

@ -0,0 +1,19 @@
package com.topjohnwu.magisk.model.events
import com.topjohnwu.magisk.R
import com.topjohnwu.superuser.Shell
import com.topjohnwu.magisk.extensions.reboot as systemReboot
object RebootEvent {
@JvmStatic
fun reboot(menuItemId: Int) = when (menuItemId) {
R.id.action_reboot_normal -> systemReboot()
R.id.action_reboot_bootloader -> systemReboot("bootloader")
R.id.action_reboot_download -> systemReboot("download")
R.id.action_reboot_edl -> systemReboot("edl")
R.id.action_reboot_recovery -> Shell.su("/system/bin/reboot recovery").submit()
else -> Unit
}
}

9
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View File

@ -136,15 +136,6 @@ class HomeViewModel(
.subscribeK { Navigation.install().publish() }
.add()
fun rebootPressed(menuItemId: Int) = when (menuItemId) {
R.id.action_reboot_normal -> reboot()
R.id.action_reboot_bootloader -> reboot("bootloader")
R.id.action_reboot_download -> reboot("download")
R.id.action_reboot_edl -> reboot("edl")
R.id.action_reboot_recovery -> Shell.su("/system/bin/reboot recovery").submit()
else -> Unit
}
fun toggle(kof: KObservableField<Boolean>) = kof.toggle()
fun hideNotice() {

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

@ -13,6 +13,8 @@
<import type="com.topjohnwu.magisk.R" />
<import type="com.topjohnwu.magisk.model.events.RebootEvent" />
<variable
name="viewModel"
type="com.topjohnwu.magisk.ui.home.HomeViewModel" />
@ -51,7 +53,7 @@
style="@style/WidgetFoundation.Button.Text"
invisibleUnless="@{XSUKt.hasRoot}"
popupMenu="@{R.menu.menu_reboot}"
popupMenuOnClickListener="@{(it) -> viewModel.rebootPressed(it)}"
popupMenuOnClickListener="@{RebootEvent::reboot}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50"