Commit 97d24a7d authored by Viktor De Pasquale's avatar Viktor De Pasquale Committed by John Wu

Removed single-use reboot menu

This addition will be used in modules as soon as the homepage gets merged
parent f8bea663
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
}
}
\ No newline at end of file
...@@ -136,15 +136,6 @@ class HomeViewModel( ...@@ -136,15 +136,6 @@ class HomeViewModel(
.subscribeK { Navigation.install().publish() } .subscribeK { Navigation.install().publish() }
.add() .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 toggle(kof: KObservableField<Boolean>) = kof.toggle()
fun hideNotice() { fun hideNotice() {
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
<import type="com.topjohnwu.magisk.R" /> <import type="com.topjohnwu.magisk.R" />
<import type="com.topjohnwu.magisk.model.events.RebootEvent" />
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.ui.home.HomeViewModel" /> type="com.topjohnwu.magisk.ui.home.HomeViewModel" />
...@@ -51,7 +53,7 @@ ...@@ -51,7 +53,7 @@
style="@style/WidgetFoundation.Button.Text" style="@style/WidgetFoundation.Button.Text"
invisibleUnless="@{XSUKt.hasRoot}" invisibleUnless="@{XSUKt.hasRoot}"
popupMenu="@{R.menu.menu_reboot}" popupMenu="@{R.menu.menu_reboot}"
popupMenuOnClickListener="@{(it) -> viewModel.rebootPressed(it)}" popupMenuOnClickListener="@{RebootEvent::reboot}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50" android:layout_marginEnd="@dimen/l_50"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment