reformat style and fix tests

sds100 · sds100 · commit da0fd248da3d · 2025-10-20T01:23:07.000+02:00
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/BaseMainNavHost.kt b/base/src/main/java/io/github/sds100/keymapper/base/BaseMainNavHost.kt
@@ -77,7 +77,7 @@ fun BaseMainNavHost(
 
             ShellCommandActionScreen(
                 modifier = Modifier.fillMaxSize(),
-                viewModel = viewModel
+                viewModel = viewModel,
             )
         }
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/BaseViewModelHiltModule.kt b/base/src/main/java/io/github/sds100/keymapper/base/BaseViewModelHiltModule.kt
@@ -168,5 +168,4 @@ abstract class BaseViewModelHiltModule {
     @Binds
     @ViewModelScoped
     abstract fun bindFixKeyEventActionDelegate(impl: FixKeyEventActionDelegateImpl): FixKeyEventActionDelegate
-
 }
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt
@@ -938,7 +938,7 @@ sealed class ActionData : Comparable<ActionData> {
         val description: String,
         val command: String,
         val executionMode: ShellExecutionMode,
-        val timeoutMillis: Int = 10000, // milliseconds (default 10 seconds)
+        val timeoutMillis: Int = 10000,
     ) : ActionData() {
         override val id: ActionId = ActionId.SHELL_COMMAND
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/ActionDataEntityMapper.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/ActionDataEntityMapper.kt
@@ -664,7 +664,7 @@ object ActionDataEntityMapper {
                     useRoot -> ShellExecutionMode.ROOT
                     else -> ShellExecutionMode.STANDARD
                 }
-                
+
                 val description =
                     entity.extras.getData(ActionEntity.EXTRA_SHELL_COMMAND_DESCRIPTION)
                         .valueOrNull() ?: return null
@@ -783,7 +783,7 @@ object ActionDataEntityMapper {
         is ActionData.InteractUiElement -> data.description
         is ActionData.ShellCommand -> Base64.encodeToString(
             data.command.toByteArray(),
-            Base64.DEFAULT
+            Base64.DEFAULT,
         ).trim() // Trim to remove trailing newline added by Base64.DEFAULT
         is ActionData.HttpRequest -> SYSTEM_ACTION_ID_MAP[data.id]!!
         is ActionData.ControlMediaForApp.Rewind -> SYSTEM_ACTION_ID_MAP[data.id]!!
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/ActionUiHelper.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/ActionUiHelper.kt
@@ -576,17 +576,17 @@ class ActionUiHelper(
         is ActionData.ShellCommand -> when (action.executionMode) {
             ShellExecutionMode.ROOT -> getString(
                 R.string.action_shell_command_description_with_root,
-                action.description
+                action.description,
             )
 
             ShellExecutionMode.ADB -> getString(
                 R.string.action_shell_command_description_with_adb,
-                action.description
+                action.description,
             )
 
             ShellExecutionMode.STANDARD -> getString(
                 R.string.action_shell_command_description_with_standard,
-                action.description
+                action.description,
             )
         }
 
@@ -596,12 +596,12 @@ class ActionUiHelper(
         ActionData.ForceStopApp -> getString(R.string.action_force_stop_app)
         is ActionData.ComposeSms -> getString(
             R.string.action_compose_sms_description,
-            arrayOf(action.message, action.number)
+            arrayOf(action.message, action.number),
         )
 
         is ActionData.SendSms -> getString(
             R.string.action_send_sms_description,
-            arrayOf(action.message, action.number)
+            arrayOf(action.message, action.number),
         )
     }
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/ConfigShellCommandViewModel.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/ConfigShellCommandViewModel.kt
@@ -120,7 +120,7 @@ class ConfigShellCommandViewModel @Inject constructor(
             is KMError -> {
                 state = state.copy(
                     isRunning = false,
-                    testResult = flowResult
+                    testResult = flowResult,
                 )
             }
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/CreateActionDelegate.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/CreateActionDelegate.kt
@@ -746,7 +746,7 @@ class CreateActionDelegate(
                     SmsActionBottomSheetState.SendSms(
                         number = number,
                         message = message,
-                        testResult = null
+                        testResult = null,
                     )
                 } else {
                     SmsActionBottomSheetState.ComposeSms(
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/CreateActionUseCase.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/CreateActionUseCase.kt
@@ -21,7 +21,7 @@ class CreateActionUseCaseImpl @Inject constructor(
     private val systemFeatureAdapter: SystemFeatureAdapter,
     private val cameraAdapter: CameraAdapter,
     private val permissionAdapter: PermissionAdapter,
-    private val phoneAdapter: PhoneAdapter
+    private val phoneAdapter: PhoneAdapter,
 ) : CreateActionUseCase,
     IsActionSupportedUseCase by IsActionSupportedUseCaseImpl(
         systemFeatureAdapter,
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/ExecuteShellCommandUseCase.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/ExecuteShellCommandUseCase.kt
@@ -75,4 +75,3 @@ class ExecuteShellCommandUseCase @Inject constructor(
         }
     }
 }
-
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/ShellCommandActionScreen.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/ShellCommandActionScreen.kt
@@ -84,7 +84,7 @@ data class ShellCommandActionState(
 @Composable
 fun ShellCommandActionScreen(
     modifier: Modifier = Modifier,
-    viewModel: ConfigShellCommandViewModel
+    viewModel: ConfigShellCommandViewModel,
 ) {
     ShellCommandActionScreen(
         modifier = modifier,
@@ -217,7 +217,7 @@ private fun ShellCommandActionScreen(
                 modifier = Modifier.fillMaxSize(),
                 state = pagerState,
                 contentPadding = PaddingValues(16.dp),
-                pageSpacing = 16.dp
+                pageSpacing = 16.dp,
             ) { pageIndex ->
                 when (pageIndex) {
                     0 -> ShellCommandConfigurationContent(
@@ -354,7 +354,7 @@ private fun ShellCommandConfigurationContent(
                         stringResource(R.string.action_shell_command_setup_pro_mode_unsupported)
                     } else {
                         stringResource(R.string.action_shell_command_setup_pro_mode)
-                    }
+                    },
                 )
             }
         }
@@ -365,9 +365,13 @@ private fun ShellCommandConfigurationContent(
                 keyboardController?.hide()
                 onTestClick()
             },
-            enabled = !state.isRunning && (state.executionMode != ShellExecutionMode.ADB
-                || (state.executionMode == ShellExecutionMode.ADB
-                && state.proModeStatus == ProModeStatus.ENABLED)),
+            enabled = !state.isRunning && (
+                state.executionMode != ShellExecutionMode.ADB ||
+                    (
+                        state.executionMode == ShellExecutionMode.ADB &&
+                            state.proModeStatus == ProModeStatus.ENABLED
+                        )
+                ),
         ) {
             Icon(Icons.Rounded.PlayArrow, contentDescription = null)
             Spacer(modifier = Modifier.width(8.dp))
@@ -376,7 +380,7 @@ private fun ShellCommandConfigurationContent(
                     stringResource(R.string.action_shell_command_testing)
                 } else {
                     stringResource(R.string.action_shell_command_test_button)
-                }
+                },
             )
         }
     }
@@ -480,7 +484,7 @@ private fun ShellCommandOutputContent(
                 Text(
                     text = stringResource(
                         R.string.action_shell_command_exit_code,
-                        result.value.exitCode
+                        result.value.exitCode,
                     ),
                     style = MaterialTheme.typography.labelMedium,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -560,8 +564,8 @@ private fun PreviewShellCommandActionScreenShellError() {
                     ShellResult(
                         stdOut = "",
                         stdErr = "ls: .: Permission denied",
-                        exitCode = 1
-                    )
+                        exitCode = 1,
+                    ),
                 ),
             ),
         )
@@ -649,8 +653,8 @@ private fun PreviewShellCommandOutputShellError() {
                         ShellResult(
                             stdOut = "",
                             stdErr = "ls: .: Permission denied",
-                            exitCode = 1
-                        )
+                            exitCode = 1,
+                        ),
                     ),
                 ),
                 onKillClick = {},
@@ -674,8 +678,8 @@ private fun PreviewShellCommandOutputRunning() {
                         ShellResult(
                             "Line 1\nLine 2\nLine 3\nLine 4\nLine 5",
                             "",
-                            0
-                        )
+                            0,
+                        ),
                     ),
                 ),
                 onKillClick = {},
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/actions/SmsActionBottomSheet.kt b/base/src/main/java/io/github/sds100/keymapper/base/actions/SmsActionBottomSheet.kt
@@ -56,7 +56,7 @@ sealed class SmsActionBottomSheetState {
     data class SendSms(
         override val number: String,
         override val message: String,
-        val testResult: State<KMResult<Unit>>?
+        val testResult: State<KMResult<Unit>>?,
     ) : SmsActionBottomSheetState()
 
     data class ComposeSms(
@@ -209,7 +209,7 @@ private fun SmsActionBottomSheet(
                         .fillMaxWidth()
                         .padding(horizontal = 16.dp),
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.End
+                    horizontalArrangement = Arrangement.End,
                 ) {
                     when (state.testResult) {
                         is State.Data -> {
@@ -229,7 +229,7 @@ private fun SmsActionBottomSheet(
                                 modifier = Modifier.weight(1f),
                                 text = resultText,
                                 color = textColor,
-                                style = MaterialTheme.typography.bodyMedium
+                                style = MaterialTheme.typography.bodyMedium,
                             )
                         }
 
@@ -335,7 +335,7 @@ private fun Preview() {
             state = SmsActionBottomSheetState.SendSms(
                 "+1 123456789",
                 "Message",
-                testResult = State.Loading
+                testResult = State.Loading,
             ),
         )
     }
@@ -358,7 +358,7 @@ private fun PreviewTestError() {
             state = SmsActionBottomSheetState.SendSms(
                 "+1 123456789",
                 "Message",
-                testResult = State.Data(KMError.SendSmsError(SmsManager.RESULT_ERROR_NO_SERVICE))
+                testResult = State.Data(KMError.SendSmsError(SmsManager.RESULT_ERROR_NO_SERVICE)),
             ),
         )
     }
@@ -381,7 +381,7 @@ private fun PreviewTestSuccess() {
             state = SmsActionBottomSheetState.SendSms(
                 "+1 123456789",
                 "Message",
-                testResult = State.Data(Success(Unit))
+                testResult = State.Data(Success(Unit)),
             ),
         )
     }
@@ -404,8 +404,8 @@ private fun PreviewEmpty() {
             state = SmsActionBottomSheetState.SendSms(
                 "",
                 "",
-                testResult = null
+                testResult = null,
             ),
         )
     }
-}
+}
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDelegate.kt b/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDelegate.kt
@@ -46,7 +46,6 @@ class SetupAccessibilityServiceDelegateImpl @Inject constructor(
         if (state == AccessibilityServiceState.DISABLED) {
             val isRestricted = useCase.isRestrictedSetting()
             dialogState = AccessibilityServiceDialog.EnableService(isRestricted)
-
         } else if (state == AccessibilityServiceState.CRASHED) {
             dialogState = AccessibilityServiceDialog.RestartService
         }
@@ -88,4 +87,4 @@ interface SetupAccessibilityServiceDelegate {
     fun showFixAccessibilityServiceDialog(error: AccessibilityServiceError)
     fun showEnableAccessibilityServiceDialog()
     fun showCantFindAccessibilitySettingsDialog()
-}
+}
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt b/base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt
@@ -95,7 +95,6 @@ private fun EnableAccessibilityServiceDialog(
                     stringResource(R.string.dialog_message_accessibility_service_explanation),
                     style = MaterialTheme.typography.bodyMedium,
                 )
-
             }
         },
         confirmButton = {
@@ -256,4 +255,4 @@ private fun CantFindAccessibilitySettingsDialogPreview() {
             onOpenGuide = {},
         )
     }
-}
+}
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/system/accessibility/ControlAccessibilityServiceUseCase.kt b/base/src/main/java/io/github/sds100/keymapper/base/system/accessibility/ControlAccessibilityServiceUseCase.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
 class ControlAccessibilityServiceUseCaseImpl @Inject constructor(
     private val adapter: AccessibilityServiceAdapter,
     private val permissionAdapter: PermissionAdapter,
-    private val packageManagerAdapter: PackageManagerAdapter
+    private val packageManagerAdapter: PackageManagerAdapter,
 ) : ControlAccessibilityServiceUseCase {
     override val serviceState: Flow<AccessibilityServiceState> = adapter.state
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/utils/ProModeStatus.kt b/base/src/main/java/io/github/sds100/keymapper/base/utils/ProModeStatus.kt
@@ -4,4 +4,4 @@ enum class ProModeStatus {
     UNSUPPORTED,
     DISABLED,
     ENABLED,
-}
+}
diff --git a/base/src/test/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCaseTest.kt b/base/src/test/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCaseTest.kt
@@ -84,6 +84,7 @@ class PerformActionsUseCaseTest {
             ringtoneAdapter = mock(),
             inputEventHub = mockInputEventHub,
             systemBridgeConnectionManager = mock(),
+            executeShellCommandUseCase = mock(),
             coroutineScope = testCoroutineScope,
         )
     }
diff --git a/base/src/test/java/io/github/sds100/keymapper/base/actions/ShellCommandActionTest.kt b/base/src/test/java/io/github/sds100/keymapper/base/actions/ShellCommandActionTest.kt
diff --git a/base/src/test/java/io/github/sds100/keymapper/base/utils/ui/FakeResourceProvider.kt b/base/src/test/java/io/github/sds100/keymapper/base/utils/ui/FakeResourceProvider.kt
diff --git a/common/src/main/java/io/github/sds100/keymapper/common/models/ShellExecutionMode.kt b/common/src/main/java/io/github/sds100/keymapper/common/models/ShellExecutionMode.kt
diff --git a/common/src/main/java/io/github/sds100/keymapper/common/models/ShellResult.kt b/common/src/main/java/io/github/sds100/keymapper/common/models/ShellResult.kt

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fun BaseMainNavHost(`
`77`	`77`
`78`	`78`	`ShellCommandActionScreen(`
`79`	`79`	`modifier = Modifier.fillMaxSize(),`
`80`		`- viewModel = viewModel`
	`80`	`+ viewModel = viewModel,`
`81`	`81`	`)`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -168,5 +168,4 @@ abstract class BaseViewModelHiltModule {`
`168`	`168`	`@Binds`
`169`	`169`	`@ViewModelScoped`
`170`	`170`	`abstract fun bindFixKeyEventActionDelegate(impl: FixKeyEventActionDelegateImpl): FixKeyEventActionDelegate`
`171`		`-`
`172`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -576,17 +576,17 @@ class ActionUiHelper(`
`576`	`576`	`is ActionData.ShellCommand -> when (action.executionMode) {`
`577`	`577`	`ShellExecutionMode.ROOT -> getString(`
`578`	`578`	`R.string.action_shell_command_description_with_root,`
`579`		`- action.description`
	`579`	`+ action.description,`
`580`	`580`	`)`
`581`	`581`
`582`	`582`	`ShellExecutionMode.ADB -> getString(`
`583`	`583`	`R.string.action_shell_command_description_with_adb,`
`584`		`- action.description`
	`584`	`+ action.description,`
`585`	`585`	`)`
`586`	`586`
`587`	`587`	`ShellExecutionMode.STANDARD -> getString(`
`588`	`588`	`R.string.action_shell_command_description_with_standard,`
`589`		`- action.description`
	`589`	`+ action.description,`
`590`	`590`	`)`
`591`	`591`	`}`
`592`	`592`
`@@ -596,12 +596,12 @@ class ActionUiHelper(`
`596`	`596`	`ActionData.ForceStopApp -> getString(R.string.action_force_stop_app)`
`597`	`597`	`is ActionData.ComposeSms -> getString(`
`598`	`598`	`R.string.action_compose_sms_description,`
`599`		`- arrayOf(action.message, action.number)`
	`599`	`+ arrayOf(action.message, action.number),`
`600`	`600`	`)`
`601`	`601`
`602`	`602`	`is ActionData.SendSms -> getString(`
`603`	`603`	`R.string.action_send_sms_description,`
`604`		`- arrayOf(action.message, action.number)`
	`604`	`+ arrayOf(action.message, action.number),`
`605`	`605`	`)`
`606`	`606`	`}`
`607`	`607`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ class ConfigShellCommandViewModel @Inject constructor(`
`120`	`120`	`is KMError -> {`
`121`	`121`	`state = state.copy(`
`122`	`122`	`isRunning = false,`
`123`		`- testResult = flowResult`
	`123`	`+ testResult = flowResult,`
`124`	`124`	`)`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ class CreateActionDelegate(`
`746`	`746`	`SmsActionBottomSheetState.SendSms(`
`747`	`747`	`number = number,`
`748`	`748`	`message = message,`
`749`		`- testResult = null`
	`749`	`+ testResult = null,`
`750`	`750`	`)`
`751`	`751`	`} else {`
`752`	`752`	`SmsActionBottomSheetState.ComposeSms(`
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,3 @@ class ExecuteShellCommandUseCase @Inject constructor(`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`-`