Merge pull request #1671 from keymapperorg/develop

Version 3.0.1

Author: sds100

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [3.0.1](https://github.com/sds100/KeyMapper/releases/tag/v3.0.1)
+
+#### 28 April 2025
+
+## Added
+
+- #1652 Bring back the menu button to show input method picker.
+- #1657 Turn on repeat by default for volume actions.
+
+## Changed
+
+- #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
+
+- Inputting key events with Shizuku does not crash the app if a Key Mapper keyboard is being used at the same time. And latency when inputting key events has been improved in some apps.
+- #1646 disabling Bluetooth clears the list of connected devices.
+- #1655 do not crash when restoring key map groups.
+- #1649 show purchase verification failed error if no network connection.
+- #1648 caching purchases works so you can use floating buttons and assistant trigger without an internet connection.
+- #1658 floating buttons appear in the wrong place in portrait if saved in landscape.
+- #1659 Use trigger does not work if the screen orientation changes when re-entering the app.
+- #1668 Crashes when floating menu does not fit in the display height.
+- #1667 Hold down mode UI is missing from 2.8.
+
 ## [3.0.0](https://github.com/sds100/KeyMapper/releases/tag/v3.0.0)
 
 _See the changes from previous 3.0 Beta releases._

app/build.gradle

@@ -221,7 +221,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.viewpager2:viewpager2:1.1.0"
-    implementation "androidx.datastore:datastore-preferences:1.1.4"
+    implementation "androidx.datastore:datastore-preferences:1.2.0-alpha01"
     implementation "androidx.core:core-splashscreen:1.0.1"
     implementation "androidx.activity:activity-compose:1.10.1"
     implementation "androidx.navigation:navigation-compose:2.8.9"

app/src/free/java/io/github/sds100/keymapper/purchasing/PurchasingManagerImpl.kt

@@ -14,7 +14,8 @@ class PurchasingManagerImpl(
     private val coroutineScope: CoroutineScope,
 ) : PurchasingManager {
     override val onCompleteProductPurchase: MutableSharedFlow<ProductId> = MutableSharedFlow()
-    override val purchases: Flow<State<Set<ProductId>>> = MutableStateFlow(State.Data(emptySet()))
+    override val purchases: Flow<State<Result<Set<ProductId>>>> =
+        MutableStateFlow(State.Data(Error.PurchasingNotImplemented))
 
     override suspend fun launchPurchasingFlow(product: ProductId): Result<Unit> {
         return Error.PurchasingNotImplemented
@@ -27,4 +28,6 @@ class PurchasingManagerImpl(
     override suspend fun isPurchased(product: ProductId): Result<Boolean> {
         return Error.PurchasingNotImplemented
     }
+
+    override fun refresh() {}
 }

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>

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

@@ -142,7 +142,7 @@ object UseCases {
         ServiceLocator.intentAdapter(ctx),
         getActionError(ctx),
         keyMapperImeMessenger(ctx, keyEventRelayService),
-        ShizukuInputEventInjector(),
+        ShizukuInputEventInjector(coroutineScope = ServiceLocator.appCoroutineScope(ctx)),
         ServiceLocator.packageManagerAdapter(ctx),
         ServiceLocator.appShortcutAdapter(ctx),
         ServiceLocator.popupMessageAdapter(ctx),
@@ -179,11 +179,12 @@ object UseCases {
         ServiceLocator.audioAdapter(ctx),
         keyMapperImeMessenger(ctx, keyEventRelayService),
         service,
-        ShizukuInputEventInjector(),
+        ShizukuInputEventInjector(ServiceLocator.appCoroutineScope(ctx)),
         ServiceLocator.popupMessageAdapter(ctx),
         ServiceLocator.permissionAdapter(ctx),
         ServiceLocator.resourceProvider(ctx),
         ServiceLocator.vibratorAdapter(ctx),
+        ServiceLocator.appCoroutineScope(ctx),
     )
 
     fun rerouteKeyEvents(ctx: Context, keyEventRelayService: KeyEventRelayServiceWrapper) = RerouteKeyEventsUseCaseImpl(

app/src/main/java/io/github/sds100/keymapper/about/AboutFragment.kt

@@ -57,7 +57,7 @@ class AboutFragment : Fragment() {
                 onBackPressed()
             }
 
-            version = Constants.VERSION
+            version = "${Constants.VERSION} ${Constants.VERSION_CODE}"
         }
     }
 

app/src/main/java/io/github/sds100/keymapper/actions/ActionOptionsBottomSheet.kt

@@ -30,6 +30,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
@@ -44,6 +45,7 @@ import io.github.sds100.keymapper.util.ui.SliderStepSizes
 import io.github.sds100.keymapper.util.ui.compose.CheckBoxText
 import io.github.sds100.keymapper.util.ui.compose.RadioButtonText
 import io.github.sds100.keymapper.util.ui.compose.SliderOptionText
+import io.github.sds100.keymapper.util.ui.compose.openUriSafe
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -63,6 +65,7 @@ fun ActionOptionsBottomSheet(
         dragHandle = {},
     ) {
         val uriHandler = LocalUriHandler.current
+        val ctx = LocalContext.current
         val helpUrl = stringResource(R.string.url_keymap_action_options_guide)
         val scope = rememberCoroutineScope()
 
@@ -80,7 +83,7 @@ fun ActionOptionsBottomSheet(
                     modifier = Modifier
                         .align(Alignment.TopEnd)
                         .padding(horizontal = 8.dp),
-                    onClick = { uriHandler.openUri(helpUrl) },
+                    onClick = { uriHandler.openUriSafe(ctx, helpUrl) },
                 ) {
                     Icon(
                         imageVector = Icons.AutoMirrored.Rounded.HelpOutline,
@@ -261,7 +264,36 @@ fun ActionOptionsBottomSheet(
                 )
             }
 
-            Spacer(Modifier.height(8.dp))
+            if (state.showHoldDownMode) {
+                Spacer(Modifier.height(8.dp))
+
+                Text(
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                    text = stringResource(R.string.hold_down_until_trigger_is_dot_dot_dot),
+                    style = MaterialTheme.typography.titleSmall,
+                )
+
+                FlowRow(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 8.dp),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    RadioButtonText(
+                        isSelected = state.holdDownMode == HoldDownMode.TRIGGER_RELEASED,
+                        text = stringResource(R.string.stop_holding_down_when_trigger_released),
+                        onSelected = { callback.onSelectHoldDownMode(HoldDownMode.TRIGGER_RELEASED) },
+                    )
+
+                    RadioButtonText(
+                        isSelected = state.holdDownMode == HoldDownMode.TRIGGER_PRESSED_AGAIN,
+                        text = stringResource(R.string.stop_holding_down_trigger_pressed_again),
+                        onSelected = { callback.onSelectHoldDownMode(HoldDownMode.TRIGGER_PRESSED_AGAIN) },
+                    )
+
+                    Spacer(Modifier.width(8.dp))
+                }
+            }
 
             if (state.showHoldDown) {
                 Spacer(Modifier.height(8.dp))
@@ -352,6 +384,7 @@ interface ActionOptionsBottomSheetCallback {
     fun onRepeatDelayChanged(delay: Int) = run { }
     fun onHoldDownCheckedChange(checked: Boolean) = run { }
     fun onHoldDownDurationChanged(duration: Int) = run { }
+    fun onSelectHoldDownMode(holdDownMode: HoldDownMode) = run { }
     fun onDelayBeforeNextActionChanged(delay: Int) = run { }
     fun onMultiplierChanged(multiplier: Int) = run { }
 }

app/src/main/java/io/github/sds100/keymapper/actions/ActionUtils.kt

@@ -781,8 +781,7 @@ fun ActionData.canBeHeldDown(): Boolean = when (this) {
 
 fun ActionData.canUseImeToPerform(): Boolean = when (this) {
     is ActionData.InputKeyEvent -> !useShell
-    // Android 13+ can use the accessibility service to input text.
-    is ActionData.Text -> Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
+    is ActionData.Text -> true
     is ActionData.MoveCursorToEnd -> true
     else -> false
 }

app/src/main/java/io/github/sds100/keymapper/actions/ConfigActionsViewModel.kt

@@ -219,6 +219,15 @@ class ConfigActionsViewModel(
         actionOptionsUid.value?.let { uid -> config.setActionHoldDownDuration(uid, duration) }
     }
 
+    override fun onSelectHoldDownMode(holdDownMode: HoldDownMode) {
+        actionOptionsUid.value?.let { uid ->
+            config.setActionStopHoldingDownWhenTriggerPressedAgain(
+                uid,
+                holdDownMode == HoldDownMode.TRIGGER_PRESSED_AGAIN,
+            )
+        }
+    }
+
     override fun onDelayBeforeNextActionChanged(delay: Int) {
         actionOptionsUid.value?.let { uid -> config.setDelayBeforeNextAction(uid, delay) }
     }
@@ -230,7 +239,10 @@ class ConfigActionsViewModel(
     override fun onSelectRepeatMode(repeatMode: RepeatMode) {
         actionOptionsUid.value?.let { uid ->
             when (repeatMode) {
-                RepeatMode.TRIGGER_RELEASED -> config.setActionStopRepeatingWhenTriggerReleased(uid)
+                RepeatMode.TRIGGER_RELEASED -> config.setActionStopRepeatingWhenTriggerReleased(
+                    uid,
+                )
+
                 RepeatMode.LIMIT_REACHED -> config.setActionStopRepeatingWhenLimitReached(uid)
                 RepeatMode.TRIGGER_PRESSED_AGAIN -> config.setActionStopRepeatingWhenTriggerPressedAgain(
                     uid,
@@ -416,7 +428,8 @@ class ConfigActionsViewModel(
             return ConfigActionsState.Empty(shortcuts = shortcuts)
         }
 
-        val actions = createListItems(keyMap, showDeviceDescriptors, errorSnapshot, shortcuts.size)
+        val actions =
+            createListItems(keyMap, showDeviceDescriptors, errorSnapshot, shortcuts.size)
 
         return ConfigActionsState.Loaded(
             actions = actions,
@@ -542,7 +555,9 @@ class ConfigActionsViewModel(
             holdDownDuration = action.holdDownDuration ?: defaultHoldDownDuration,
             defaultHoldDownDuration = defaultHoldDownDuration,
 
-            showHoldDownMode = keyMap.isStopHoldingDownActionWhenTriggerPressedAgainAllowed(action),
+            showHoldDownMode = keyMap.isStopHoldingDownActionWhenTriggerPressedAgainAllowed(
+                action,
+            ),
             holdDownMode = if (action.stopHoldDownWhenTriggerPressedAgain) {
                 HoldDownMode.TRIGGER_PRESSED_AGAIN
             } else {