diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java index 040ea39..2f3ac59 100644 --- a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java +++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java @@ -29,6 +29,7 @@ import com.fox2code.mmm.utils.Hashes; import com.fox2code.mmm.utils.Http; import com.fox2code.mmm.utils.IntentHelper; import com.fox2code.mmm.utils.PropUtils; +import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; import com.google.android.material.progressindicator.LinearProgressIndicator; import com.topjohnwu.superuser.CallbackList; import com.topjohnwu.superuser.Shell; @@ -47,6 +48,7 @@ import java.util.zip.ZipInputStream; public class InstallerActivity extends CompatActivity { private static final String TAG = "InstallerActivity"; public LinearProgressIndicator progressIndicator; + public ExtendedFloatingActionButton rebootFloatingButton; public InstallerTerminal installerTerminal; private File moduleCache; private File toDelete; @@ -109,6 +111,7 @@ public class InstallerActivity extends CompatActivity { View horizontalScroller = findViewById(R.id.install_horizontal_scroller); RecyclerView installTerminal; this.progressIndicator = findViewById(R.id.progress_bar); + this.rebootFloatingButton = findViewById(R.id.install_terminal_reboot_fab); this.installerTerminal = new InstallerTerminal( installTerminal = findViewById(R.id.install_terminal), foreground); (horizontalScroller != null ? horizontalScroller : installTerminal) @@ -553,6 +556,11 @@ public class InstallerActivity extends CompatActivity { this.setOnBackPressedCallback(null); this.setDisplayHomeAsUpEnabled(true); this.progressIndicator.setVisibility(View.GONE); + + // This should be improved ? + rebootFloatingButton.setOnClickListener(_view -> Shell.cmd("/system/bin/svc power reboot || /system/bin/reboot").submit()); + this.rebootFloatingButton.setVisibility(View.VISIBLE); + if (message != null && !message.isEmpty()) this.installerTerminal.addLine(message); if (!optionalLink.isEmpty()) { diff --git a/app/src/main/res/drawable/ic_reboot_24.xml b/app/src/main/res/drawable/ic_reboot_24.xml new file mode 100644 index 0000000..f2be45b --- /dev/null +++ b/app/src/main/res/drawable/ic_reboot_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/installer.xml b/app/src/main/res/layout/installer.xml index 236d9b2..61e0e7f 100644 --- a/app/src/main/res/layout/installer.xml +++ b/app/src/main/res/layout/installer.xml @@ -33,4 +33,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 42adfe2..c4640a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,6 +24,7 @@ Donate Submit a module Require Android 6.0+ + Reboot Last update: