Merge branch 'develop' into feature/699-time-constraints

sds100 · sds100 · commit f4254813e0b5 · 2025-04-29T12:46:17.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## [3.0.1](https://github.com/sds100/KeyMapper/releases/tag/v3.0.1)
 
-#### TO BE RELEASED
+#### 28 April 2025
 
 ## Added
 
@@ -11,6 +11,8 @@
 
 - #1654 The Key Mapper keyboard is now required again for Text actions because the accessibility service API does not work in all situations.
 - #1653 Hide the export/import menu buttons in groups.
+- #1553 Hide double press option for side key and fingerprint gesture triggers because it is misleading. Double activations can be done with sequence triggers instead.
+- #1669 Change quick settings tile text.
 
 ## Bug fixes
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -254,7 +254,7 @@
             android:name=".system.tiles.ToggleMappingsTile"
             android:exported="true"
             android:icon="@drawable/ic_tile_pause"
-            android:label="@string/tile_pause"
+            android:label="@string/tile_pause_title"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
             tools:targetApi="24">
             <intent-filter>
diff --git a/app/src/main/java/io/github/sds100/keymapper/home/SelectionBottomSheet.kt b/app/src/main/java/io/github/sds100/keymapper/home/SelectionBottomSheet.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
@@ -67,8 +66,7 @@ fun SelectionBottomSheet(
     Surface(
         modifier = modifier
             .widthIn(max = BottomSheetDefaults.SheetMaxWidth)
-            .fillMaxWidth()
-            .navigationBarsPadding(),
+            .fillMaxWidth(),
         shadowElevation = 5.dp,
         shape = BottomSheetDefaults.ExpandedShape,
         tonalElevation = BottomSheetDefaults.Elevation,
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/ConfigKeyMapUseCase.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/ConfigKeyMapUseCase.kt
@@ -304,7 +304,7 @@ class ConfigKeyMapUseCaseController(
 
         val triggerKey = AssistantTriggerKey(type = type, clickType = clickType)
 
-        val newKeys = trigger.keys.plus(triggerKey)
+        val newKeys = trigger.keys.plus(triggerKey).map { it.setClickType(ClickType.SHORT_PRESS) }
 
         val newMode = when {
             trigger.mode != TriggerMode.Sequence && containsAssistantKey -> TriggerMode.Sequence
@@ -335,7 +335,7 @@ class ConfigKeyMapUseCaseController(
 
         val triggerKey = FingerprintTriggerKey(type = type, clickType = clickType)
 
-        val newKeys = trigger.keys.plus(triggerKey)
+        val newKeys = trigger.keys.plus(triggerKey).map { it.setClickType(ClickType.SHORT_PRESS) }
 
         val newMode = when {
             trigger.mode != TriggerMode.Sequence && containsFingerprintGesture -> TriggerMode.Sequence
@@ -513,7 +513,7 @@ class ConfigKeyMapUseCaseController(
             // You can't set the trigger to a long press if it contains a key
             // that isn't detected with key codes. This is because there aren't
             // separate key events for the up and down press that can be timed.
-            if (trigger.keys.any { it is AssistantTriggerKey }) {
+            if (trigger.keys.any { !it.allowedLongPress }) {
                 return@editTrigger trigger
             }
 
@@ -534,6 +534,10 @@ class ConfigKeyMapUseCaseController(
                 return@editTrigger trigger
             }
 
+            if (trigger.keys.any { !it.allowedDoublePress }) {
+                return@editTrigger trigger
+            }
+
             val newKeys = trigger.keys.map { it.setClickType(clickType = ClickType.DOUBLE_PRESS) }
             val newMode = TriggerMode.Undefined
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListItemCreator.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListItemCreator.kt
@@ -267,21 +267,25 @@ class KeyMapListItemCreator(
             }
         }
 
-        if (deviceName != null || key.detectionSource == KeyEventDetectionSource.INPUT_METHOD || !key.consumeEvent) {
-            append(" (")
+        val parts = mutableListOf<String>()
 
+        if (deviceName != null || key.detectionSource == KeyEventDetectionSource.INPUT_METHOD || !key.consumeEvent) {
             if (key.detectionSource == KeyEventDetectionSource.INPUT_METHOD) {
-                append("${getString(R.string.flag_detect_from_input_method)} $midDot ")
+                parts.add(getString(R.string.flag_detect_from_input_method))
             }
 
             if (deviceName != null) {
-                append(deviceName)
+                parts.add(deviceName)
             }
 
             if (!key.consumeEvent) {
-                append(" $midDot ${getString(R.string.flag_dont_override_default_action)}")
+                parts.add(getString(R.string.flag_dont_override_default_action))
             }
+        }
 
+        if (parts.isNotEmpty()) {
+            append(" (")
+            append(parts.joinToString(separator = " $midDot "))
             append(")")
         }
     }
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/AssistantTriggerKey.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/AssistantTriggerKey.kt
@@ -23,6 +23,7 @@ data class AssistantTriggerKey(
     override val consumeEvent: Boolean = true
 
     override val allowedLongPress: Boolean = false
+    override val allowedDoublePress: Boolean = false
 
     override fun compareTo(other: TriggerKey) = when (other) {
         is AssistantTriggerKey -> compareValuesBy(
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/BaseConfigTriggerViewModel.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/BaseConfigTriggerViewModel.kt
@@ -291,7 +291,7 @@ abstract class BaseConfigTriggerViewModel(
              * or there are only key code keys in the trigger. It is not possible to do a long press of
              * non-key code keys in a parallel trigger.
              */
-            if (trigger.keys.size == 1) {
+            if (trigger.keys.size == 1 && trigger.keys.all { it.allowedDoublePress }) {
                 clickTypeButtons.add(ClickType.SHORT_PRESS)
                 clickTypeButtons.add(ClickType.DOUBLE_PRESS)
             }
@@ -363,7 +363,6 @@ abstract class BaseConfigTriggerViewModel(
                         return TriggerKeyOptionsState.Assistant(
                             assistantType = key.type,
                             clickType = key.clickType,
-                            showClickTypes = showClickTypes,
                         )
                     }
 
@@ -379,7 +378,6 @@ abstract class BaseConfigTriggerViewModel(
                         return TriggerKeyOptionsState.FingerprintGesture(
                             gestureType = key.type,
                             clickType = key.clickType,
-                            showClickTypes = showClickTypes,
                         )
                     }
                 }
@@ -864,16 +862,16 @@ sealed class TriggerKeyOptionsState {
     data class Assistant(
         val assistantType: AssistantTriggerType,
         override val clickType: ClickType,
-        override val showClickTypes: Boolean,
     ) : TriggerKeyOptionsState() {
+        override val showClickTypes: Boolean = false
         override val showLongPressClickType: Boolean = false
     }
 
     data class FingerprintGesture(
         val gestureType: FingerprintGestureType,
         override val clickType: ClickType,
-        override val showClickTypes: Boolean,
     ) : TriggerKeyOptionsState() {
+        override val showClickTypes: Boolean = false
         override val showLongPressClickType: Boolean = false
     }
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/FingerprintTriggerKey.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/FingerprintTriggerKey.kt
@@ -19,6 +19,7 @@ data class FingerprintTriggerKey(
 ) : TriggerKey() {
     override val consumeEvent: Boolean = true
     override val allowedLongPress: Boolean = false
+    override val allowedDoublePress: Boolean = false
 
     override fun compareTo(other: TriggerKey) = when (other) {
         is FingerprintTriggerKey -> compareValuesBy(
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/FloatingButtonKey.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/FloatingButtonKey.kt
@@ -19,6 +19,7 @@ data class FloatingButtonKey(
 
     override val consumeEvent: Boolean = true
     override val allowedLongPress: Boolean = true
+    override val allowedDoublePress: Boolean = true
 
     override fun compareTo(other: TriggerKey) = when (other) {
         is FloatingButtonKey -> compareValuesBy(
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/KeyCodeTriggerKey.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/KeyCodeTriggerKey.kt
@@ -19,6 +19,7 @@ data class KeyCodeTriggerKey(
 ) : TriggerKey() {
 
     override val allowedLongPress: Boolean = true
+    override val allowedDoublePress: Boolean = true
 
     override fun toString(): String {
         val deviceString = when (device) {
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKey.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKey.kt
@@ -15,6 +15,7 @@ sealed class TriggerKey : Comparable<TriggerKey> {
     abstract val consumeEvent: Boolean
     abstract val uid: String
     abstract val allowedLongPress: Boolean
+    abstract val allowedDoublePress: Boolean
 
     fun setClickType(clickType: ClickType): TriggerKey = when (this) {
         is AssistantTriggerKey -> copy(clickType = clickType)
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKeyOptionsBottomSheet.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKeyOptionsBottomSheet.kt
@@ -333,7 +333,6 @@ private fun AssistantPreview() {
             state = TriggerKeyOptionsState.Assistant(
                 assistantType = AssistantTriggerType.VOICE,
                 clickType = ClickType.DOUBLE_PRESS,
-                showClickTypes = true,
             ),
         )
     }
diff --git a/app/src/main/java/io/github/sds100/keymapper/system/tiles/ToggleMappingsTile.kt b/app/src/main/java/io/github/sds100/keymapper/system/tiles/ToggleMappingsTile.kt
@@ -45,35 +45,83 @@ class ToggleMappingsTile :
 
                 val ctx = this@ToggleMappingsTile
 
-                when {
-                    serviceState == ServiceState.DISABLED -> {
-                        qsTile.label = str(R.string.tile_service_disabled)
-                        qsTile.contentDescription =
-                            str(R.string.tile_accessibility_service_disabled_content_description)
-                        qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_error)
-                        qsTile.state = Tile.STATE_UNAVAILABLE
-                    }
-
-                    isPaused -> {
-                        qsTile.label = str(R.string.tile_resume)
-                        qsTile.contentDescription = str(R.string.tile_resume)
-                        qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_resume)
-                        qsTile.state = Tile.STATE_INACTIVE
-                    }
-
-                    !isPaused -> {
-                        qsTile.label = str(R.string.tile_pause)
-                        qsTile.contentDescription = str(R.string.tile_pause)
-                        qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_pause)
-                        qsTile.state = Tile.STATE_ACTIVE
-                    }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    updateQsTile(serviceState, ctx, isPaused)
+                } else {
+                    updateQsTilePreSdk29(serviceState, ctx, isPaused)
                 }
-
-                qsTile.updateTile()
             }.collect()
         }
     }
 
+    private fun updateQsTilePreSdk29(
+        serviceState: ServiceState,
+        ctx: ToggleMappingsTile,
+        isPaused: Boolean,
+    ) {
+        when {
+            serviceState == ServiceState.DISABLED -> {
+                qsTile.label = str(R.string.tile_service_disabled)
+                qsTile.contentDescription =
+                    str(R.string.tile_accessibility_service_disabled_content_description)
+                qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_error)
+                qsTile.state = Tile.STATE_UNAVAILABLE
+            }
+
+            isPaused -> {
+                qsTile.label = str(R.string.tile_resume_title)
+                qsTile.contentDescription = str(R.string.tile_resume_title)
+                qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_pause)
+                qsTile.state = Tile.STATE_INACTIVE
+            }
+
+            !isPaused -> {
+                qsTile.label = str(R.string.tile_pause_title)
+                qsTile.contentDescription = str(R.string.tile_pause_title)
+                qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_resume)
+                qsTile.state = Tile.STATE_ACTIVE
+            }
+        }
+
+        qsTile.updateTile()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    private fun updateQsTile(
+        serviceState: ServiceState,
+        ctx: ToggleMappingsTile,
+        isPaused: Boolean,
+    ) {
+        when {
+            serviceState == ServiceState.DISABLED -> {
+                qsTile.label = str(R.string.app_name)
+                qsTile.subtitle = str(R.string.tile_service_disabled)
+                qsTile.contentDescription =
+                    str(R.string.tile_accessibility_service_disabled_content_description)
+                qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_error)
+                qsTile.state = Tile.STATE_UNAVAILABLE
+            }
+
+            isPaused -> {
+                qsTile.label = str(R.string.app_name)
+                qsTile.subtitle = str(R.string.tile_paused_subtitle)
+                qsTile.contentDescription = str(R.string.tile_resume_title)
+                qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_pause)
+                qsTile.state = Tile.STATE_INACTIVE
+            }
+
+            !isPaused -> {
+                qsTile.label = str(R.string.app_name)
+                qsTile.subtitle = str(R.string.tile_running_subtitle)
+                qsTile.contentDescription = str(R.string.tile_pause_title)
+                qsTile.icon = Icon.createWithResource(ctx, R.drawable.ic_tile_resume)
+                qsTile.state = Tile.STATE_ACTIVE
+            }
+        }
+
+        qsTile.updateTile()
+    }
+
     override fun onStartListening() {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -769,8 +769,10 @@
     <!-- system action options -->
 
     <!-- Tiles -->
-    <string name="tile_pause">Pause key maps</string>
-    <string name="tile_resume">Resume key maps</string>
+    <string name="tile_pause_title">Pause key maps</string>
+    <string name="tile_resume_title">Resume key maps</string>
+    <string name="tile_paused_subtitle">Paused</string>
+    <string name="tile_running_subtitle">Running</string>
     <string name="tile_service_disabled">Service Disabled</string>
     <string name="tile_accessibility_service_disabled_content_description">Key Mapper accessibility service is disabled</string>
     <string name="tile_toggle_keymapper_keyboard">Toggle Key Mapper keyboard</string>
diff --git a/app/src/test/java/io/github/sds100/keymapper/ConfigKeyMapUseCaseTest.kt b/app/src/test/java/io/github/sds100/keymapper/ConfigKeyMapUseCaseTest.kt
diff --git a/app/version.properties b/app/version.properties

Original file line number	Diff line number	Diff line change
`@@ -267,21 +267,25 @@ class KeyMapListItemCreator(`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`270`		`- if (deviceName != null \|\| key.detectionSource == KeyEventDetectionSource.INPUT_METHOD \|\| !key.consumeEvent) {`
`271`		`- append(" (")`
	`270`	`+ val parts = mutableListOf<String>()`
`272`	`271`
	`272`	`+ if (deviceName != null \|\| key.detectionSource == KeyEventDetectionSource.INPUT_METHOD \|\| !key.consumeEvent) {`
`273`	`273`	`if (key.detectionSource == KeyEventDetectionSource.INPUT_METHOD) {`
`274`		`- append("${getString(R.string.flag_detect_from_input_method)} $midDot ")`
	`274`	`+ parts.add(getString(R.string.flag_detect_from_input_method))`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`if (deviceName != null) {`
`278`		`- append(deviceName)`
	`278`	`+ parts.add(deviceName)`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`if (!key.consumeEvent) {`
`282`		`- append(" $midDot ${getString(R.string.flag_dont_override_default_action)}")`
	`282`	`+ parts.add(getString(R.string.flag_dont_override_default_action))`
`283`	`283`	`}`
	`284`	`+ }`
`284`	`285`
	`286`	`+ if (parts.isNotEmpty()) {`
	`287`	`+ append(" (")`
	`288`	`+ append(parts.joinToString(separator = " $midDot "))`
`285`	`289`	`append(")")`
`286`	`290`	`}`
`287`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ abstract class BaseConfigTriggerViewModel(`
`291`	`291`	`* or there are only key code keys in the trigger. It is not possible to do a long press of`
`292`	`292`	`* non-key code keys in a parallel trigger.`
`293`	`293`	`*/`
`294`		`- if (trigger.keys.size == 1) {`
	`294`	`+ if (trigger.keys.size == 1 && trigger.keys.all { it.allowedDoublePress }) {`
`295`	`295`	`clickTypeButtons.add(ClickType.SHORT_PRESS)`
`296`	`296`	`clickTypeButtons.add(ClickType.DOUBLE_PRESS)`
`297`	`297`	`}`
`@@ -363,7 +363,6 @@ abstract class BaseConfigTriggerViewModel(`
`363`	`363`	`return TriggerKeyOptionsState.Assistant(`
`364`	`364`	`assistantType = key.type,`
`365`	`365`	`clickType = key.clickType,`
`366`		`- showClickTypes = showClickTypes,`
`367`	`366`	`)`
`368`	`367`	`}`
`369`	`368`
`@@ -379,7 +378,6 @@ abstract class BaseConfigTriggerViewModel(`
`379`	`378`	`return TriggerKeyOptionsState.FingerprintGesture(`
`380`	`379`	`gestureType = key.type,`
`381`	`380`	`clickType = key.clickType,`
`382`		`- showClickTypes = showClickTypes,`
`383`	`381`	`)`
`384`	`382`	`}`
`385`	`383`	`}`
`@@ -864,16 +862,16 @@ sealed class TriggerKeyOptionsState {`
`864`	`862`	`data class Assistant(`
`865`	`863`	`val assistantType: AssistantTriggerType,`
`866`	`864`	`override val clickType: ClickType,`
`867`		`- override val showClickTypes: Boolean,`
`868`	`865`	`) : TriggerKeyOptionsState() {`
	`866`	`+ override val showClickTypes: Boolean = false`
`869`	`867`	`override val showLongPressClickType: Boolean = false`
`870`	`868`	`}`
`871`	`869`
`872`	`870`	`data class FingerprintGesture(`
`873`	`871`	`val gestureType: FingerprintGestureType,`
`874`	`872`	`override val clickType: ClickType,`
`875`		`- override val showClickTypes: Boolean,`
`876`	`873`	`) : TriggerKeyOptionsState() {`
	`874`	`+ override val showClickTypes: Boolean = false`
`877`	`875`	`override val showLongPressClickType: Boolean = false`
`878`	`876`	`}`
`879`	`877`