diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d75f2d4..9c77de1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "com.kawomi.githugandroid" minSdk = 26 targetSdk = 34 - versionCode = 25 - versionName = "0.1.24" + versionCode = 26 + versionName = "0.1.25" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt b/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt index 67e9d3a..c6c05ff 100644 --- a/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt +++ b/app/src/main/java/com/kawomi/githugandroid/GitHugApp.kt @@ -525,7 +525,7 @@ private fun PaneWorkspace( PaneDivider( enabled = upper !in paneLayout.collapsed && lower !in paneLayout.collapsed, onDrag = { deltaPx -> - val fraction = deltaPx / (heightBasis * 4f) + val fraction = deltaPx / heightBasis onResize(upper, lower, fraction) }, onDragFinished = onResizeFinished, @@ -725,8 +725,8 @@ private fun RowScope.TerminalInputField( textStyle = TextStyle( color = TextPrimary, fontFamily = FontFamily.Monospace, - fontSize = 17.sp, - fontWeight = FontWeight.Medium, + fontSize = 15.sp, + fontWeight = FontWeight.Normal, ), cursorBrush = SolidColor(Accent), keyboardOptions = KeyboardOptions( @@ -740,7 +740,7 @@ private fun RowScope.TerminalInputField( modifier = Modifier .fillMaxWidth() .background(Color.Transparent) - .padding(vertical = 10.dp), + .padding(vertical = 2.dp), contentAlignment = Alignment.CenterStart, ) { if (commandInput.text.isEmpty()) { @@ -748,7 +748,7 @@ private fun RowScope.TerminalInputField( text = "Enter git command", color = TextMuted.copy(alpha = 0.7f), fontFamily = FontFamily.Monospace, - fontSize = 17.sp, + fontSize = 15.sp, ) } innerTextField() @@ -944,7 +944,7 @@ private fun TerminalPane( val keyboardController = LocalSoftwareKeyboardController.current val horizontalScroll = rememberScrollState() val outputVerticalScroll = rememberScrollState() - val terminalMinWidth = 640.dp + val terminalMinWidth = 80.dp * 7.2f LaunchedEffect(inputFieldVersion) { focusRequester.requestFocus() @@ -1004,8 +1004,9 @@ private fun TerminalPane( modifier = Modifier .bringIntoViewRequester(bringIntoViewRequester) .fillMaxWidth() + .widthIn(min = terminalMinWidth) .background(PanelPrimary, RoundedCornerShape(8.dp)) - .padding(horizontal = 8.dp, vertical = 4.dp), + .padding(horizontal = 8.dp, vertical = 3.dp), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -1014,7 +1015,7 @@ private fun TerminalPane( color = Accent, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold, - fontSize = 17.sp, + fontSize = 15.sp, ) TerminalInputField( inputFieldVersion = inputFieldVersion,