Merge pull request #2600 from switchifyapp/feature/pc-modifier-key-toggle-2599

Add PC modifier key toggles

Author: enaboapps

app/src/main/java/com/enaboapps/switchify/pc/PcConnector.kt

@@ -28,6 +28,8 @@ sealed class PcControlCommand {
     data class TextStreamClose(val streamId: String, val expectedCount: Int) : PcControlCommand()
     data class PressKey(val key: PcKeyboardKey) : PcControlCommand()
     data class KeyboardShortcut(val keys: List<PcKeyboardShortcutKey>) : PcControlCommand()
+    data class ModifierDown(val key: PcKeyboardModifierKey) : PcControlCommand()
+    data class ModifierUp(val key: PcKeyboardModifierKey) : PcControlCommand()
     data class WindowControl(val action: PcWindowControlAction) : PcControlCommand()
     data object LeftClick : PcControlCommand()
     data object DoubleClick : PcControlCommand()

app/src/main/java/com/enaboapps/switchify/pc/PcKeyboardKey.kt

@@ -43,3 +43,13 @@ enum class PcKeyboardShortcutKey(val protocolValue: String) {
     C("C"),
     X("X")
 }
+
+enum class PcKeyboardModifierKey(
+    val protocolValue: String,
+    @param:StringRes val labelResId: Int
+) {
+    Ctrl("Ctrl", R.string.pc_modifier_ctrl),
+    Alt("Alt", R.string.pc_modifier_alt),
+    Shift("Shift", R.string.pc_modifier_shift),
+    Meta("Meta", R.string.pc_modifier_start)
+}

app/src/main/java/com/enaboapps/switchify/pc/PcPointerProfile.kt

@@ -47,3 +47,12 @@ fun PcPointerMovementProfile.supportsTextStreams(): Boolean {
         )
     )
 }
+
+fun PcPointerMovementProfile.supportsModifierToggle(): Boolean {
+    return capabilities.supportedCommands.containsAll(
+        setOf(
+            "keyboard.modifierDown",
+            "keyboard.modifierUp"
+        )
+    )
+}

app/src/main/java/com/enaboapps/switchify/pc/PcProtocol.kt

@@ -386,6 +386,44 @@ object PcProtocol {
         )
     }
 
+    fun keyboardModifierDown(
+        id: String,
+        deviceId: String,
+        token: String,
+        timestamp: Long,
+        key: PcKeyboardModifierKey,
+        responseMode: PcCommandResponseMode = PcCommandResponseMode.Ack
+    ): String {
+        return authenticatedCommand(
+            id,
+            deviceId,
+            token,
+            timestamp,
+            "keyboard.modifierDown",
+            JSONObject().put("key", key.protocolValue),
+            responseMode
+        )
+    }
+
+    fun keyboardModifierUp(
+        id: String,
+        deviceId: String,
+        token: String,
+        timestamp: Long,
+        key: PcKeyboardModifierKey,
+        responseMode: PcCommandResponseMode = PcCommandResponseMode.Ack
+    ): String {
+        return authenticatedCommand(
+            id,
+            deviceId,
+            token,
+            timestamp,
+            "keyboard.modifierUp",
+            JSONObject().put("key", key.protocolValue),
+            responseMode
+        )
+    }
+
     fun windowControl(
         id: String,
         deviceId: String,
@@ -630,6 +668,8 @@ object PcProtocol {
         "mouse.dragEnd",
         "keyboard.key",
         "keyboard.shortcut",
+        "keyboard.modifierDown",
+        "keyboard.modifierUp",
         "keyboard.typeText",
         "keyboard.textStream.char",
         "keyboard.textStream.key",

app/src/main/java/com/enaboapps/switchify/pc/bluetooth/SwitchifyPcBleClient.kt

@@ -295,6 +295,8 @@ class SwitchifyPcBleClient(
             is PcControlCommand.TextStreamClose -> PcProtocol.keyboardTextStreamClose(id, deviceId, token, timestamp, streamId, expectedCount, responseMode)
             is PcControlCommand.PressKey -> PcProtocol.keyboardKey(id, deviceId, token, timestamp, key, responseMode)
             is PcControlCommand.KeyboardShortcut -> PcProtocol.keyboardShortcut(id, deviceId, token, timestamp, keys, responseMode)
+            is PcControlCommand.ModifierDown -> PcProtocol.keyboardModifierDown(id, deviceId, token, timestamp, key, responseMode)
+            is PcControlCommand.ModifierUp -> PcProtocol.keyboardModifierUp(id, deviceId, token, timestamp, key, responseMode)
             is PcControlCommand.WindowControl -> PcProtocol.windowControl(id, deviceId, token, timestamp, action, responseMode)
         }
     }
@@ -402,6 +404,8 @@ private fun PcControlCommand.protocolType(): String {
         is PcControlCommand.TextStreamClose -> "keyboard.textStream.close"
         is PcControlCommand.PressKey -> "keyboard.key"
         is PcControlCommand.KeyboardShortcut -> "keyboard.shortcut"
+        is PcControlCommand.ModifierDown -> "keyboard.modifierDown"
+        is PcControlCommand.ModifierUp -> "keyboard.modifierUp"
         is PcControlCommand.WindowControl -> "window.control"
     }
 }

app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGrid.kt

@@ -74,7 +74,8 @@ data class PcCompactCommandCell(
     val onClick: () -> Unit,
     val icon: ImageVector? = null,
     val iconRotationDegrees: Float = 0f,
-    val tone: PcCommandTone = PcCommandTone.Neutral
+    val tone: PcCommandTone = PcCommandTone.Neutral,
+    val selected: Boolean = false
 )
 
 /**
@@ -213,6 +214,7 @@ fun PcCompactCommandGrid(
                         icon = cell.icon,
                         iconRotationDegrees = cell.iconRotationDegrees,
                         tone = cell.tone,
+                        selected = cell.selected,
                         minHeightDp = minTileHeightDp,
                         modifier = itemModifier
                     )
@@ -240,6 +242,7 @@ fun PcScannedCommandTile(
     icon: ImageVector? = null,
     iconRotationDegrees: Float = 0f,
     tone: PcCommandTone = PcCommandTone.Neutral,
+    selected: Boolean = false,
     minHeightDp: Int = 52,
     square: Boolean = false
 ) {
@@ -248,24 +251,27 @@ fun PcScannedCommandTile(
     val backgroundColor = when {
         !enabled -> MaterialTheme.colorScheme.surfaceVariant
         pressed -> MaterialTheme.colorScheme.primaryContainer
+        selected -> MaterialTheme.colorScheme.primaryContainer
         tone == PcCommandTone.Primary -> MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.56f)
         tone == PcCommandTone.Destructive -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.48f)
         else -> MaterialTheme.colorScheme.surface
     }
     val borderColor = if (enabled) {
-        when (tone) {
-            PcCommandTone.Primary -> MaterialTheme.colorScheme.primary.copy(alpha = 0.62f)
-            PcCommandTone.Destructive -> MaterialTheme.colorScheme.error.copy(alpha = 0.62f)
-            PcCommandTone.Neutral -> MaterialTheme.colorScheme.outline
+        when {
+            selected -> MaterialTheme.colorScheme.primary
+            tone == PcCommandTone.Primary -> MaterialTheme.colorScheme.primary.copy(alpha = 0.62f)
+            tone == PcCommandTone.Destructive -> MaterialTheme.colorScheme.error.copy(alpha = 0.62f)
+            else -> MaterialTheme.colorScheme.outline
         }
     } else {
         MaterialTheme.colorScheme.outlineVariant
     }
     val contentColor = if (enabled) {
-        when (tone) {
-            PcCommandTone.Primary -> MaterialTheme.colorScheme.onPrimaryContainer
-            PcCommandTone.Destructive -> MaterialTheme.colorScheme.onErrorContainer
-            PcCommandTone.Neutral -> MaterialTheme.colorScheme.onSurface
+        when {
+            selected -> MaterialTheme.colorScheme.onPrimaryContainer
+            tone == PcCommandTone.Primary -> MaterialTheme.colorScheme.onPrimaryContainer
+            tone == PcCommandTone.Destructive -> MaterialTheme.colorScheme.onErrorContainer
+            else -> MaterialTheme.colorScheme.onSurface
         }
     } else {
         MaterialTheme.colorScheme.onSurfaceVariant

app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseControlActivity.kt

@@ -182,6 +182,8 @@ private fun PcMouseControlScreen(
                     PcTransientMessage(message = uiState.message)
                     PcWindowControlScreen(
                         enabled = surfaceEnabled,
+                        activeModifiers = uiState.activeModifiers,
+                        onModifierSelected = viewModel::toggleModifier,
                         onCommandSelected = viewModel::send
                     )
                 }