From fde4052811cc7b746c708c8d2a04c53d206b9e5b Mon Sep 17 00:00:00 2001
From: Hepolise <admin@srvr.su>
Date: Thu, 30 Jan 2025 12:39:06 +0300
Subject: [PATCH] Fix: SettingsActivity: button align, add an alert before
 settings reset

---
 app/src/main/AndroidManifest.xml              |  7 ++-
 .../ui/SettingsActivity.kt                    | 46 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  4 ++
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d08be0..06574bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@android:style/Theme.Material.NoActionBar">
+        android:theme="@android:style/Theme.Material.NoActionBar"
+        android:enableOnBackInvokedCallback="true"
+        tools:targetApi="tiramisu">
 
         <!-- Main activity -->
         <activity
diff --git a/app/src/main/java/ru/hepolise/volumekeytrackcontrol/ui/SettingsActivity.kt b/app/src/main/java/ru/hepolise/volumekeytrackcontrol/ui/SettingsActivity.kt
index de4c06d..83573d7 100644
--- a/app/src/main/java/ru/hepolise/volumekeytrackcontrol/ui/SettingsActivity.kt
+++ b/app/src/main/java/ru/hepolise/volumekeytrackcontrol/ui/SettingsActivity.kt
@@ -153,11 +153,11 @@ fun VibrationSettingsScreen(vibrator: Vibrator?) {
         Box(
             modifier = Modifier
                 .fillMaxSize()
+                .padding(padding)
         ) {
             Column(
                 modifier = Modifier
                     .fillMaxSize()
-                    .padding(padding)
                     .padding(12.dp)
                     .verticalScroll(rememberScrollState())
                     .padding(bottom = 48.dp),
@@ -347,25 +347,47 @@ fun VibrationSettingsScreen(vibrator: Vibrator?) {
                 modifier = Modifier
                     .fillMaxWidth()
                     .align(Alignment.BottomCenter)
-                    .padding(16.dp)
+                    .padding(end = 16.dp, bottom = 8.dp)
             ) {
                 Spacer(modifier = Modifier.weight(1f))
 
+                var showResetSettingsDialog by remember { mutableStateOf(false) }
                 Button(onClick = {
-                    sharedPreferences.edit().clear().apply()
-                    vibrationType = VibrationType.fromKey(SELECTED_EFFECT_DEFAULT_VALUE)
-                    vibrationLength = VIBRATION_LENGTH_DEFAULT_VALUE
-                    vibrationAmplitude = VIBRATION_AMPLITUDE_DEFAULT_VALUE
-                    longPressDuration = LONG_PRESS_DURATION_DEFAULT_VALUE
-                    Toast.makeText(
-                        context,
-                        context.getString(R.string.settings_reset_toast),
-                        Toast.LENGTH_SHORT
-                    ).show()
+                    showResetSettingsDialog = true
                 }) {
                     Text(stringResource(R.string.settings_reset))
                 }
 
+                if (showResetSettingsDialog) {
+                    AlertDialog(
+                        onDismissRequest = { showResetSettingsDialog = false },
+                        title = { Text(stringResource(R.string.settings_reset)) },
+                        text = { Text(stringResource(R.string.settings_reset_message)) },
+                        confirmButton = {
+                            Button(onClick = {
+                                showResetSettingsDialog = false
+                                sharedPreferences.edit().clear().apply()
+                                vibrationType = VibrationType.fromKey(SELECTED_EFFECT_DEFAULT_VALUE)
+                                vibrationLength = VIBRATION_LENGTH_DEFAULT_VALUE
+                                vibrationAmplitude = VIBRATION_AMPLITUDE_DEFAULT_VALUE
+                                longPressDuration = LONG_PRESS_DURATION_DEFAULT_VALUE
+                                Toast.makeText(
+                                    context,
+                                    context.getString(R.string.settings_reset_toast),
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }) {
+                                Text(stringResource(R.string.yes))
+                            }
+                        },
+                        dismissButton = {
+                            Button(onClick = { showResetSettingsDialog = false }) {
+                                Text(stringResource(R.string.no))
+                            }
+                        }
+                    )
+                }
+
                 Spacer(modifier = Modifier.width(8.dp))
 
                 Button(onClick = {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 554a0f9..8f4d87c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,12 +22,16 @@
     <string name="long_press_duration_dialog_title">Long Press Duration</string>
 
     <string name="settings_reset">Reset settings</string>
+    <string name="settings_reset_message">Are you sure you want to reset settings?</string>
     <string name="settings_reset_toast">Settings are reset to default</string>
     <string name="about">About</string>
 
     <string name="module_is_not_enabled">Module is not enabled in LSPosed.\nRestart the app after enabling the module.\nIf you think this is a bug, please</string>
     <string name="open_issue">open an issue</string>
 
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="edit">Edit</string>