#1818 add buttons to setting to switch key event action method

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/settings/SettingsScreen.kt

@@ -5,7 +5,9 @@ import android.content.Intent
 import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
@@ -63,6 +65,7 @@ import io.github.sds100.keymapper.base.compose.KeyMapperTheme
 import io.github.sds100.keymapper.base.utils.ui.compose.KeyMapperSegmentedButtonRow
 import io.github.sds100.keymapper.base.utils.ui.compose.OptionPageButton
 import io.github.sds100.keymapper.base.utils.ui.compose.OptionsHeaderRow
+import io.github.sds100.keymapper.base.utils.ui.compose.RadioButtonText
 import io.github.sds100.keymapper.base.utils.ui.compose.SwitchPreferenceCompose
 import io.github.sds100.keymapper.base.utils.ui.compose.icons.FolderManaged
 import io.github.sds100.keymapper.base.utils.ui.compose.icons.KeyMapperIcons
@@ -172,6 +175,7 @@ fun SettingsScreen(modifier: Modifier = Modifier, viewModel: SettingsViewModel)
                 }
             },
             onShareLogcatClick = viewModel::onShareLogcatClick,
+            onKeyEventActionMethodSelected = viewModel::onKeyEventActionMethodSelected
         )
     }
 }
@@ -247,11 +251,13 @@ private fun Content(
     onShareLogcatClick: () -> Unit = { },
     onHideHomeScreenAlertsToggled: (Boolean) -> Unit = { },
     onShowDeviceDescriptorsToggled: (Boolean) -> Unit = { },
+    onKeyEventActionMethodSelected: (isProModeSelected: Boolean) -> Unit = {}
 ) {
     Column(
         modifier
             .verticalScroll(rememberScrollState())
             .padding(horizontal = 16.dp),
+        verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         Spacer(modifier = Modifier.height(8.dp))
 
@@ -261,8 +267,6 @@ private fun Content(
             text = stringResource(R.string.settings_section_customize_experience_title),
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
-
         Text(
             text = stringResource(R.string.title_pref_dark_theme),
             style = MaterialTheme.typography.bodyLarge,
@@ -274,7 +278,6 @@ private fun Content(
             Theme.DARK to stringResource(R.string.theme_dark),
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         KeyMapperSegmentedButtonRow(
             modifier = Modifier.fillMaxWidth(),
@@ -283,7 +286,6 @@ private fun Content(
             onStateSelected = onThemeSelected,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionPageButton(
             title = stringResource(R.string.title_pref_show_toggle_keymaps_notification),
@@ -292,7 +294,6 @@ private fun Content(
             onClick = onPauseResumeNotificationClick,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         SwitchPreferenceCompose(
             title = stringResource(R.string.title_pref_hide_home_screen_alerts),
@@ -302,15 +303,13 @@ private fun Content(
             onCheckedChange = onHideHomeScreenAlertsToggled,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionsHeaderRow(
             modifier = Modifier.fillMaxWidth(),
             icon = Icons.Outlined.Gamepad,
             text = stringResource(R.string.settings_section_key_maps_title),
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionPageButton(
             title = stringResource(R.string.title_pref_default_options),
@@ -319,7 +318,6 @@ private fun Content(
             onClick = onDefaultOptionsClick,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         SwitchPreferenceCompose(
             title = stringResource(R.string.title_pref_force_vibrate),
@@ -329,7 +327,6 @@ private fun Content(
             onCheckedChange = onForceVibrateToggled,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         SwitchPreferenceCompose(
             title = stringResource(R.string.title_pref_show_device_descriptors),
@@ -339,15 +336,13 @@ private fun Content(
             onCheckedChange = onShowDeviceDescriptorsToggled,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionsHeaderRow(
             modifier = Modifier.fillMaxWidth(),
             icon = KeyMapperIcons.FolderManaged,
             text = stringResource(R.string.settings_section_data_management_title),
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionPageButton(
             title = if (state.autoBackupLocation == null) {
@@ -361,15 +356,22 @@ private fun Content(
             onClick = onAutomaticBackupClick,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionsHeaderRow(
             modifier = Modifier.fillMaxWidth(),
             icon = Icons.Rounded.Construction,
             text = stringResource(R.string.settings_section_power_user_title),
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
+
+        KeyEventActionMethodRow(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp),
+            isProModeSelected = state.keyEventActionsUseSystemBridege,
+            onSelected = onKeyEventActionMethodSelected
+        )
+
 
         OptionPageButton(
             title = stringResource(R.string.title_pref_pro_mode),
@@ -401,15 +403,13 @@ private fun Content(
             enabled = isAutoSwitchImeSupported,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         OptionsHeaderRow(
             modifier = Modifier.fillMaxWidth(),
             icon = Icons.Rounded.Code,
             text = stringResource(R.string.settings_section_debugging_title),
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
 
         SwitchPreferenceCompose(
             title = stringResource(R.string.title_pref_toggle_logging),
@@ -419,8 +419,6 @@ private fun Content(
             onCheckedChange = onLoggingToggled,
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
-
         OptionPageButton(
             title = stringResource(R.string.title_pref_view_and_share_log),
             text = stringResource(R.string.summary_pref_view_and_share_log),
@@ -439,7 +437,47 @@ private fun Content(
     }
 }
 
-@Preview(heightDp = 1200)
+@Composable
+private fun KeyEventActionMethodRow(
+    modifier: Modifier = Modifier,
+    isProModeSelected: Boolean,
+    onSelected: (isProModeSelected: Boolean) -> Unit
+) {
+    Column(modifier) {
+        val buttonStates = listOf(
+            false to stringResource(R.string.fix_key_event_action_input_method_title),
+            true to stringResource(R.string.pro_mode_app_bar_title)
+        )
+
+        Text(
+            text = stringResource(R.string.title_pref_key_event_actions_use_system_bridge),
+            style = MaterialTheme.typography.bodyLarge
+        )
+
+        Text(
+            text = stringResource(R.string.summary_pref_key_event_actions_use_system_bridge),
+            style = MaterialTheme.typography.bodyMedium
+        )
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        FlowRow(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp)
+        ) {
+            for ((isProMode, text) in buttonStates) {
+                RadioButtonText(
+                    text = text,
+                    isSelected = isProMode == isProModeSelected,
+                    onSelected = { onSelected(isProMode) },
+                )
+            }
+        }
+    }
+}
+
+@Preview(heightDp = 1500)
 @Composable
 private fun Preview() {
     KeyMapperTheme {
@@ -449,4 +487,4 @@ private fun Preview() {
             )
         }
     }
-}
+}

base/src/main/java/io/github/sds100/keymapper/base/settings/SettingsViewModel.kt

@@ -58,6 +58,7 @@ class SettingsViewModel @Inject constructor(
         useCase.getPreference(Keys.forceVibrate),
         useCase.getPreference(Keys.hideHomeScreenAlerts),
         useCase.getPreference(Keys.showDeviceDescriptors),
+        useCase.getPreference(Keys.keyEventActionsUseSystemBridge),
     ) { values ->
         MainSettingsState(
             theme = values[0] as Theme,
@@ -66,6 +67,7 @@ class SettingsViewModel @Inject constructor(
             forceVibrate = values[3] as Boolean? ?: false,
             hideHomeScreenAlerts = values[4] as Boolean? ?: false,
             showDeviceDescriptors = values[5] as Boolean? ?: false,
+            keyEventActionsUseSystemBridege = values[6] as Boolean? ?: false
         )
     }.stateIn(viewModelScope, SharingStarted.Lazily, MainSettingsState())
 
@@ -299,6 +301,12 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    fun onKeyEventActionMethodSelected(isProModeSelected: Boolean) {
+        viewModelScope.launch {
+            useCase.setPreference(Keys.keyEventActionsUseSystemBridge, isProModeSelected)
+        }
+    }
+
     fun onHideHomeScreenAlertsToggled(enabled: Boolean) {
         viewModelScope.launch {
             useCase.setPreference(Keys.hideHomeScreenAlerts, enabled)
@@ -330,6 +338,7 @@ data class MainSettingsState(
     val loggingEnabled: Boolean = false,
     val hideHomeScreenAlerts: Boolean = false,
     val showDeviceDescriptors: Boolean = false,
+    val keyEventActionsUseSystemBridege: Boolean = false
 )
 
 data class DefaultSettingsState(

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

@@ -1517,6 +1517,9 @@
     <string name="title_pref_pro_mode_auto_start_at_boot">Automatically start at boot</string>
     <string name="summary_pref_pro_mode_auto_start_at_boot">PRO Mode will start itself whenever you turn on or restart your device</string>
 
+    <string name="title_pref_key_event_actions_use_system_bridge">Key event actions</string>
+    <string name="summary_pref_key_event_actions_use_system_bridge">Select how key event actions are run</string>
+
     <string name="pro_mode_emergency_tip_title">Emergency tip</string>
     <string name="pro_mode_emergency_tip_text">If your power button stops working, hold down the power button for 10 seconds and release to disable PRO Mode.</string>