diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6f7844b..6747c8a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,8 +19,8 @@ android { applicationId = "solutions.tretter.githugandroid" minSdk = 26 targetSdk = 35 - versionCode = 105 - versionName = "0.1.104" + versionCode = 106 + versionName = "0.1.105" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt b/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt index de36d4c..fc6d0af 100644 --- a/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt +++ b/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt @@ -255,16 +255,16 @@ private fun SpecialKeyBar( .horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp), ) { - TerminalKeyButton(label = "↹", onClick = onTab, modifier = Modifier.width(56.dp), fontFamily = FontFamily.Default) - TerminalKeyButton(label = ".", onClick = { onInsertText(".") }, modifier = Modifier.width(34.dp)) - TerminalKeyButton(label = "-", onClick = { onInsertText("-") }, modifier = Modifier.width(34.dp)) - TerminalKeyButton(label = "/", onClick = { onInsertText("/") }, modifier = Modifier.width(34.dp)) - TerminalKeyButton(label = "_", onClick = { onInsertText("_") }, modifier = Modifier.width(34.dp)) - TerminalKeyButton(label = "←", onClick = onCursorLeft, modifier = Modifier.width(40.dp)) - TerminalKeyButton(label = "→", onClick = onCursorRight, modifier = Modifier.width(40.dp)) - TerminalKeyButton(label = "↑", onClick = onHistoryUp, modifier = Modifier.width(40.dp)) - TerminalKeyButton(label = "↓", onClick = onHistoryDown, modifier = Modifier.width(40.dp)) - TerminalKeyButton(label = "?", onClick = onHelp, modifier = Modifier.width(40.dp), fontFamily = FontFamily.Default) + TerminalKeyButton(label = "?", onClick = onHelp, highlight = true, fontFamily = FontFamily.Default) + TerminalKeyButton(label = "↹", onClick = onTab, fontFamily = FontFamily.Default) + TerminalKeyButton(label = ".", onClick = { onInsertText(".") }) + TerminalKeyButton(label = "-", onClick = { onInsertText("-") }) + TerminalKeyButton(label = "/", onClick = { onInsertText("/") }) + TerminalKeyButton(label = "_", onClick = { onInsertText("_") }) + TerminalKeyButton(label = "←", onClick = onCursorLeft) + TerminalKeyButton(label = "→", onClick = onCursorRight) + TerminalKeyButton(label = "↑", onClick = onHistoryUp) + TerminalKeyButton(label = "↓", onClick = onHistoryDown) } } @@ -272,15 +272,18 @@ private fun SpecialKeyBar( private fun TerminalKeyButton( label: String, onClick: () -> Unit, - modifier: Modifier = Modifier, + highlight: Boolean = false, fontFamily: FontFamily = FontFamily.Monospace, ) { Button( onClick = onClick, - modifier = modifier.height(28.dp), - contentPadding = PaddingValues(horizontal = 8.dp, vertical = 2.dp), + modifier = Modifier + .width(32.dp) + .height(26.dp), + shape = RoundedCornerShape(0.dp), + contentPadding = PaddingValues(horizontal = 0.dp, vertical = 0.dp), colors = ButtonDefaults.buttonColors( - containerColor = PanelSecondary, + containerColor = if (highlight) Color(0xFF1976D2) else PanelSecondary, contentColor = TextPrimary, ), ) {