#1394 complete more TODOs

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCase.kt

@@ -122,7 +122,6 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
         )
     }
 
-    // TODO use system bridge where possible
     override suspend fun perform(
         action: ActionData,
         inputEventAction: InputEventAction,

base/src/main/java/io/github/sds100/keymapper/base/promode/ProModeSetupScreen.kt

@@ -37,7 +37,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -71,7 +70,7 @@ fun ProModeSetupScreen(
         state = state,
         onStepButtonClick = viewModel::onStepButtonClick,
         onAssistantClick = viewModel::onAssistantClick,
-        onWatchTutorialClick = { }, //TODO
+        onWatchTutorialClick = { },
         onBackClick = viewModel::onBackClick
     )
 }
@@ -251,12 +250,12 @@ private fun StepContent(
 
         Row(
             modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
+            horizontalArrangement = Arrangement.End,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            TextButton(onClick = onWatchTutorialClick) {
-                Text(text = stringResource(R.string.pro_mode_setup_wizard_watch_tutorial_button))
-            }
+//            TextButton(onClick = onWatchTutorialClick) {
+//                Text(text = stringResource(R.string.pro_mode_setup_wizard_watch_tutorial_button))
+//            }
             Button(onClick = onButtonClick) {
                 Text(text = stepContent.buttonText)
             }

base/src/main/java/io/github/sds100/keymapper/base/system/permissions/RequestPermissionDelegate.kt

@@ -70,10 +70,7 @@ class RequestPermissionDelegate(
             Permission.CALL_PHONE -> requestPermissionLauncher.launch(Manifest.permission.CALL_PHONE)
             Permission.ANSWER_PHONE_CALL -> requestPermissionLauncher.launch(Manifest.permission.ANSWER_PHONE_CALLS)
             Permission.FIND_NEARBY_DEVICES -> requestPermissionLauncher.launch(Manifest.permission.BLUETOOTH_CONNECT)
-            Permission.ROOT -> {
-                require(navController != null) { "nav controller can't be null!" }
-                requestRootPermission(navController)
-            }
+            Permission.ROOT -> requestRootPermission()
 
             Permission.IGNORE_BATTERY_OPTIMISATION ->
                 requestIgnoreBatteryOptimisations()
@@ -179,24 +176,18 @@ class RequestPermissionDelegate(
         }
     }
 
-    // TODO show prompt requesting root permission. If not found then show a dialog explaining to grant permission manually in their root management app such as Magisk.
-    private fun requestRootPermission(navController: NavController) {
+    private fun requestRootPermission() {
         if (showDialogs) {
             activity.materialAlertDialog {
                 titleResource = R.string.dialog_title_root_prompt
                 messageResource = R.string.dialog_message_root_prompt
                 setIcon(R.drawable.ic_baseline_warning_24)
 
-                okButton {
-//                    navController.navigate(NavBaseAppDirections.toSettingsFragment())
-                }
-
+                okButton()
                 negativeButton(R.string.neg_cancel) { it.cancel() }
 
                 show()
             }
-        } else {
-//            navController.navigate(NavBaseAppDirections.toSettingsFragment())
         }
     }
 

base/src/main/res/values/strings.xml

@@ -420,8 +420,7 @@
     <string name="dialog_title_cant_find_accessibility_settings_page">Can\'t find the accessibility settings page</string>
     <string name="dialog_title_unsaved_changes">Unsaved changes</string>
     <string name="dialog_message_unsaved_changes"> You have unsaved changes. If you discard them, your edits will be lost.</string>
-    <string name="dialog_message_root_prompt">If you know your phone isn\'t rooted or you don\'t know what root is, you can\'t use features which only work on rooted devices. When you tap \'OK\', you will be taken to the settings.
-            In the settings, scroll to the bottom and tap \'Key Mapper has root permission\' so you can use root features/actions.</string>
+    <string name="dialog_message_root_prompt">Please grant Key Mapper root permission in your root management app, such as Magisk.</string>
 
     <string name="dialog_title_write_secure_settings">Grant WRITE_SECURE_SETTINGS permission</string>
     <string name="dialog_message_write_secure_settings">A PC/Mac is required to grant this permission. Read the online guide.</string>