#1946 feat: change record trigger button text when recording with expert mode

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/trigger/RecordTriggerButtonRow.kt

@@ -67,6 +67,7 @@ fun RecordTriggerButtonRow(
             RecordTriggerButton(
                 modifier = Modifier.weight(1f),
                 recordTriggerState,
+                isExpertModeRecordingEnabled = expertModeRecordSwitchState.isChecked,
                 onClick = onRecordTriggerClick,
             )
 
@@ -105,7 +106,12 @@ private fun ExpertModeSwitch(
 }
 
 @Composable
-fun RecordTriggerButton(modifier: Modifier, state: RecordTriggerState, onClick: () -> Unit) {
+fun RecordTriggerButton(
+    modifier: Modifier,
+    state: RecordTriggerState,
+    isExpertModeRecordingEnabled: Boolean,
+    onClick: () -> Unit,
+) {
     val colors = ButtonDefaults.filledTonalButtonColors().copy(
         containerColor = LocalCustomColorsPalette.current.red,
         contentColor = LocalCustomColorsPalette.current.onRed,
@@ -115,8 +121,11 @@ fun RecordTriggerButton(modifier: Modifier, state: RecordTriggerState, onClick:
         is RecordTriggerState.CountingDown ->
             stringResource(R.string.button_recording_trigger_countdown, state.timeLeft)
 
-        else ->
+        else -> if (isExpertModeRecordingEnabled) {
+            stringResource(R.string.button_record_trigger_expert_mode)
+        } else {
             stringResource(R.string.button_record_trigger)
+        }
     }
 
     // Create pulsing animation for the recording dot

base/src/main/java/io/github/sds100/keymapper/base/trigger/TriggerSetupBottomSheet.kt

@@ -183,6 +183,9 @@ private fun GamepadTriggerSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled =
+                    state is TriggerSetupState.Gamepad.SimpleButtons &&
+                        state.isUseExpertModeChecked,
                     onClick = onRecordTriggerClick,
                 )
             } else {
@@ -298,6 +301,7 @@ private fun MouseTriggerSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled = true,
                     onClick = onRecordTriggerClick,
                 )
             } else {
@@ -353,6 +357,7 @@ private fun PowerTriggerSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled = true,
                     onClick = onRecordTriggerClick,
                 )
             } else {
@@ -440,6 +445,7 @@ private fun VolumeTriggerSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled = state.isUseExpertModeChecked,
                     onClick = onRecordTriggerClick,
                 )
             } else {
@@ -500,6 +506,7 @@ private fun NotDetectedSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled = true,
                     onClick = onRecordTriggerClick,
                 )
             } else {
@@ -586,6 +593,7 @@ private fun OtherTriggerSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled = state.isUseExpertModeChecked,
                     onClick = onRecordTriggerClick,
                 )
             } else {
@@ -670,6 +678,7 @@ private fun KeyboardTriggerSetupBottomSheet(
                 RecordTriggerButton(
                     modifier = Modifier.weight(1f),
                     state = state.recordTriggerState,
+                    isExpertModeRecordingEnabled = state.isUseExpertModeChecked,
                     onClick = onRecordTriggerClick,
                 )
             } else {

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

@@ -407,6 +407,7 @@
     <!-- Button titles -->
     <string name="button_add_action">Add action</string>
     <string name="button_record_trigger">Tap to record trigger</string>
+    <string name="button_record_trigger_expert_mode">Record with Expert Mode</string>
     <string name="button_advanced_triggers_badge">NEW!</string>
     <string name="button_done">Done</string>
     <string name="button_fix">Fix</string>