diff --git a/android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalKeyBar.kt b/android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalKeyBar.kt new file mode 100644 index 0000000..ee925bf --- /dev/null +++ b/android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalKeyBar.kt @@ -0,0 +1,76 @@ +package pt.naps.maestro.ui.terminal + +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +/** One button on the [TerminalKeyBar]. A [Modifier] toggles Ctrl/Alt state + * in the terminal page's own JS instead of sending a byte sequence. */ +sealed class TerminalKeyAction(val label: String) { + data class Modifier(val name: String, val display: String) : TerminalKeyAction(display) + data class Send(val display: String, val key: String) : TerminalKeyAction(display) +} + +/** + * Termux-style extra key row for the on-screen keyboard (issue #266): Tab, + * Esc, Ctrl/Alt, and the four cursor arrows. Ctrl/Alt are one-shot modifiers + * — armed here, then folded into the very next key (tapped on this bar or + * typed on the soft keyboard) by `assets/terminal/index.html`'s own JS. + */ +val TERMINAL_KEY_ACTIONS: List = listOf( + TerminalKeyAction.Send("Esc", "Esc"), + TerminalKeyAction.Send("Tab", "Tab"), + TerminalKeyAction.Modifier("ctrl", "Ctrl"), + TerminalKeyAction.Modifier("alt", "Alt"), + TerminalKeyAction.Send("↑", "Up"), + TerminalKeyAction.Send("↓", "Down"), + TerminalKeyAction.Send("←", "Left"), + TerminalKeyAction.Send("→", "Right"), +) + +@Composable +fun TerminalKeyBar( + armed: Set, + onSend: (String) -> Unit, + onToggleModifier: (String) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier + .background(MaterialTheme.colorScheme.surfaceVariant) + .horizontalScroll(rememberScrollState()) + .padding(horizontal = 4.dp, vertical = 2.dp), + ) { + for (action in TERMINAL_KEY_ACTIONS) { + when (action) { + is TerminalKeyAction.Modifier -> { + val isArmed = action.name in armed + TextButton(onClick = { onToggleModifier(action.name) }) { + Text( + text = action.display, + color = if (isArmed) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + } + } + + is TerminalKeyAction.Send -> { + TextButton(onClick = { onSend(action.key) }) { + Text(text = action.display) + } + } + } + } + } +} diff --git a/android/app/src/test/java/pt/naps/maestro/ui/terminal/TerminalKeyBarActionsTest.kt b/android/app/src/test/java/pt/naps/maestro/ui/terminal/TerminalKeyBarActionsTest.kt new file mode 100644 index 0000000..99e2821 --- /dev/null +++ b/android/app/src/test/java/pt/naps/maestro/ui/terminal/TerminalKeyBarActionsTest.kt @@ -0,0 +1,24 @@ +package pt.naps.maestro.ui.terminal + +import org.junit.Assert.assertTrue +import org.junit.Test + +class TerminalKeyBarActionsTest { + @Test + fun `contains tab esc and all four arrows`() { + val labels = TERMINAL_KEY_ACTIONS.map { it.label } + assertTrue(labels.containsAll(listOf("Tab", "Esc", "↑", "↓", "←", "→"))) + } + + @Test + fun `ctrl and alt are modifiers rather than sends`() { + val modifierNames = TERMINAL_KEY_ACTIONS.filterIsInstance().map { it.name } + assertTrue(modifierNames.containsAll(listOf("ctrl", "alt"))) + } + + @Test + fun `arrow keys carry the maestroKey names the terminal page expects`() { + val sendKeys = TERMINAL_KEY_ACTIONS.filterIsInstance().map { it.key } + assertTrue(sendKeys.containsAll(listOf("Up", "Down", "Left", "Right", "Tab", "Esc"))) + } +}