Merge branch 'reformat-android' into develop

Author: sds100

.editorconfig

@@ -1,9 +1,10 @@
 [*.{kt,kts}]
-ktlint_standard_function-expression-body = disabled
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_ignore_back_ticked_identifier = true
-ktlint_code_style = intellij_idea # Use IntelliJ style because it has trailing commas
+ktlint_code_style = android_studio
 ij_kotlin_indent_before_arrow_on_new_line = true
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
 
 [base/src/main/java/io/github/sds100/keymapper/base/utils/ui/compose/icons/*.{kt,kts}]
 ktlint_standard_property-naming = disabled

api/src/main/java/io/github/sds100/keymapper/api/KeyEventRelayService.kt

@@ -8,8 +8,8 @@ import android.os.IBinder
 import android.os.IBinder.DeathRecipient
 import android.view.KeyEvent
 import android.view.MotionEvent
-import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
+import timber.log.Timber
 
 /**
  * This service is used as a relay between the accessibility service and input method service to pass
@@ -117,7 +117,9 @@ class KeyEventRelayService : Service() {
             val sourcePackageName = getCallerPackageName() ?: return
 
             if (client == null || !permittedPackages.contains(sourcePackageName)) {
-                Timber.d("An unrecognized package $sourcePackageName tried to register a key event relay callback.")
+                Timber.d(
+                    "An unrecognized package $sourcePackageName tried to register a key event relay callback.",
+                )
                 return
             }
 

api/src/main/java/io/github/sds100/keymapper/api/TriggerKeyMapsBroadcastReceiver.kt

@@ -6,9 +6,9 @@ import android.content.Intent
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.sds100.keymapper.base.keymaps.TriggerKeyMapEvent
 import io.github.sds100.keymapper.system.accessibility.AccessibilityServiceAdapter
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 // DON'T MOVE THIS CLASS TO A DIFFERENT PACKAGE BECAUSE IT BREAKS THE API
 @AndroidEntryPoint

app/src/main/java/io/github/sds100/keymapper/AppHiltModule.kt

@@ -12,9 +12,9 @@ import io.github.sds100.keymapper.common.utils.DefaultDispatcherProvider
 import io.github.sds100.keymapper.common.utils.DispatcherProvider
 import io.github.sds100.keymapper.purchasing.PurchasingManagerImpl
 import io.github.sds100.keymapper.system.accessibility.MyAccessibilityService
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)

app/src/main/java/io/github/sds100/keymapper/MainFragment.kt

@@ -105,7 +105,11 @@ class MainFragment : Fragment() {
                         modifier = Modifier
                             .windowInsetsPadding(
                                 WindowInsets.systemBars.only(sides = WindowInsetsSides.Horizontal)
-                                    .add(WindowInsets.displayCutout.only(sides = WindowInsetsSides.Horizontal)),
+                                    .add(
+                                        WindowInsets.displayCutout.only(
+                                            sides = WindowInsetsSides.Horizontal,
+                                        ),
+                                    ),
                             ),
                         navController = navController,
                         setupAccessibilityServiceDelegate = setupAccessibilityServiceDelegate,

app/src/main/java/io/github/sds100/keymapper/system/accessibility/MyAccessibilityService.kt

@@ -4,8 +4,8 @@ import android.content.Intent
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.sds100.keymapper.base.system.accessibility.BaseAccessibilityService
 import io.github.sds100.keymapper.base.system.accessibility.BaseAccessibilityServiceController
-import timber.log.Timber
 import javax.inject.Inject
+import timber.log.Timber
 
 @AndroidEntryPoint
 class MyAccessibilityService : BaseAccessibilityService() {

app/src/main/java/io/github/sds100/keymapper/trigger/AdvancedTriggersScreenFoss.kt

@@ -38,10 +38,7 @@ import io.github.sds100.keymapper.base.utils.ui.compose.openUriSafe
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun AdvancedTriggersScreenFoss(
-    modifier: Modifier = Modifier,
-    onBack: () -> Unit,
-) {
+fun AdvancedTriggersScreenFoss(modifier: Modifier = Modifier, onBack: () -> Unit) {
     Scaffold(
         modifier = modifier,
         topBar = {
@@ -56,7 +53,9 @@ fun AdvancedTriggersScreenFoss(
                     IconButton(onClick = onBack) {
                         Icon(
                             Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = stringResource(R.string.bottom_app_bar_back_content_description),
+                            contentDescription = stringResource(
+                                R.string.bottom_app_bar_back_content_description,
+                            ),
                         )
                     }
                 },

app/src/main/java/io/github/sds100/keymapper/trigger/ConfigTriggerViewModel.kt

@@ -16,8 +16,8 @@ import io.github.sds100.keymapper.base.trigger.TriggerSetupShortcut
 import io.github.sds100.keymapper.base.utils.navigation.NavigationProvider
 import io.github.sds100.keymapper.base.utils.ui.DialogProvider
 import io.github.sds100.keymapper.base.utils.ui.ResourceProvider
-import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlinx.coroutines.launch
 
 @HiltViewModel
 class ConfigTriggerViewModel @Inject constructor(

app/src/main/java/io/github/sds100/keymapper/trigger/TriggerScreen.kt

@@ -11,7 +11,8 @@ import io.github.sds100.keymapper.base.trigger.TriggerDiscoverScreen
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TriggerScreen(modifier: Modifier = Modifier, viewModel: ConfigTriggerViewModel) {
-    val showFingerprintGestures: Boolean by viewModel.showFingerprintGesturesShortcut.collectAsStateWithLifecycle()
+    val showFingerprintGestures: Boolean by
+        viewModel.showFingerprintGesturesShortcut.collectAsStateWithLifecycle()
 
     BaseTriggerScreen(modifier, viewModel, discoverScreenContent = {
         TriggerDiscoverScreen(

base/src/main/java/io/github/sds100/keymapper/base/ActivityViewModel.kt

@@ -9,8 +9,8 @@ import io.github.sds100.keymapper.base.utils.navigation.NavigationProvider
 import io.github.sds100.keymapper.base.utils.navigation.navigate
 import io.github.sds100.keymapper.base.utils.ui.DialogProvider
 import io.github.sds100.keymapper.base.utils.ui.ResourceProvider
-import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlinx.coroutines.launch
 
 @HiltViewModel
 class ActivityViewModel @Inject constructor(