From 1d831d65f3217d9b4d0fe9fcae4b4639d92dab79 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sat, 1 Feb 2020 14:41:22 +0100
Subject: [PATCH] Added overflow menu for reboot

---
 .../topjohnwu/magisk/ui/home/HomeViewModel.kt |  9 +++++++
 .../magisk/utils/DataBindingAdapters.kt       | 24 +++++++++++++++++++
 .../main/res/layout/include_home_device.xml   |  8 ++++++-
 app/src/main/res/menu/menu_reboot.xml         | 24 +++++++++++++++++++
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/styles_md2.xml        |  8 +++++++
 6 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/menu/menu_reboot.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
index e06e63274..d0e8403f6 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
@@ -136,6 +136,15 @@ 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() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
index ae23cfa29..e0eb1f21a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
@@ -5,9 +5,11 @@ import android.animation.ValueAnimator
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
 import android.os.Build
+import android.view.ContextThemeWrapper
 import android.view.View
 import android.view.ViewAnimationUtils
 import android.view.ViewGroup
+import android.widget.PopupMenu
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.annotation.ColorInt
@@ -460,4 +462,26 @@ fun TextView.setStrikeThroughEnabled(useStrikeThrough: Boolean) {
     } else {
         paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
     }
+}
+
+interface OnPopupMenuItemClickListener {
+    fun onMenuItemClick(itemId: Int)
+}
+
+@BindingAdapter("popupMenu", "popupMenuOnClickListener", requireAll = false)
+fun View.setPopupMenu(popupMenu: Int, listener: OnPopupMenuItemClickListener) {
+    tag = tag as? PopupMenu ?: let {
+        val themeWrapper = ContextThemeWrapper(context, R.style.Foundation_PopupMenu)
+        PopupMenu(themeWrapper, this)
+    }
+    setOnClickListener {
+        (tag as PopupMenu).apply {
+            menuInflater.inflate(popupMenu, menu)
+            setOnMenuItemClickListener {
+                listener.onMenuItemClick(it.itemId)
+                true
+            }
+            show()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_home_device.xml b/app/src/main/res/layout/include_home_device.xml
index 40f630ea5..751e6cb83 100644
--- a/app/src/main/res/layout/include_home_device.xml
+++ b/app/src/main/res/layout/include_home_device.xml
@@ -11,6 +11,10 @@
 
         <import type="com.topjohnwu.magisk.extensions.XSUKt" />
 
+        <import type="com.topjohnwu.magisk.R" />
+
+        <import type="com.topjohnwu.superuser.Shell" />
+
         <variable
             name="viewModel"
             type="com.topjohnwu.magisk.ui.home.HomeViewModel" />
@@ -44,10 +48,12 @@
             app:layout_constraintStart_toEndOf="@+id/home_device_icon"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--todo (diareuse) add dropdown menu so users can choose which reboot they want -->
         <com.google.android.material.button.MaterialButton
             android:id="@+id/home_device_action_reboot"
             style="@style/WidgetFoundation.Button.Text"
+            gone="@{!Shell.rootAccess()}"
+            popupMenu="@{R.menu.menu_reboot}"
+            popupMenuOnClickListener="@{(it) -> viewModel.rebootPressed(it)}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/l_50"
diff --git a/app/src/main/res/menu/menu_reboot.xml b/app/src/main/res/menu/menu_reboot.xml
new file mode 100644
index 000000000..5f607ce4f
--- /dev/null
+++ b/app/src/main/res/menu/menu_reboot.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_reboot_normal"
+        android:title="@string/reboot" />
+
+    <item
+        android:id="@+id/action_reboot_bootloader"
+        android:title="@string/reboot_bootloader" />
+
+    <item
+        android:id="@+id/action_reboot_download"
+        android:title="@string/reboot_download" />
+
+    <item
+        android:id="@+id/action_reboot_edl"
+        android:title="@string/reboot_edl" />
+
+    <item
+        android:id="@+id/action_reboot_recovery"
+        android:title="@string/reboot_recovery" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1f6e3b328..089a6ba48 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,6 +14,7 @@
     <dimen name="l_75">12dp</dimen>
     <dimen name="l1">16dp</dimen>
     <dimen name="l2">32dp</dimen>
+    <dimen name="l3">48dp</dimen>
 
     <dimen name="r1">8dp</dimen>
 
diff --git a/app/src/main/res/values/styles_md2.xml b/app/src/main/res/values/styles_md2.xml
index b502f095a..304428c68 100644
--- a/app/src/main/res/values/styles_md2.xml
+++ b/app/src/main/res/values/styles_md2.xml
@@ -23,6 +23,13 @@
     </style>
     <!--endregion-->
 
+    <style name="Foundation.PopupMenu" parent="Widget.AppCompat.PopupMenu">
+        <item name="android:textColor">?colorOnSurface</item>
+        <item name="android:itemBackground">?colorSurfaceVariant</item>
+        <item name="android:itemTextAppearance">@style/AppearanceFoundation.Caption</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="Foundation.Base" parent="Foundation.Compat">
         <item name="android:fontFamily">@font/exo</item>
         <item name="android:includeFontPadding">false</item>
@@ -32,6 +39,7 @@
         <item name="selectableItemBackground">@drawable/bg_selectable</item>
         <item name="selectableItemBackgroundBorderless">@drawable/bg_selectable_borderless</item>
         <item name="actionBarSize">@dimen/internal_action_bar_size</item>
+        <item name="popupMenuStyle">@style/Foundation.PopupMenu</item>
     </style>
 
     <style name="Foundation.Default" parent="Foundation.Base">