Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed multiline text field in rebase interactive

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-10-25 19:56:23 +02:00
parent d934b83c4e
commit f2412616af
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
View File

@ -139,7 +139,7 @@ fun RebaseCommit(
AdjustableOutlinedTextField( AdjustableOutlinedTextField(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.height(40.dp), .heightIn(min = 40.dp),
enabled = rebaseLine.action == Action.REWORD, enabled = rebaseLine.action == Action.REWORD,
value = newMessage, value = newMessage,
onValueChange = { onValueChange = {
@ -147,6 +147,10 @@ fun RebaseCommit(
onMessageChanged(it) onMessageChanged(it)
}, },
textStyle = MaterialTheme.typography.body2, textStyle = MaterialTheme.typography.body2,
backgroundColor = if(rebaseLine.action == Action.REWORD) {
MaterialTheme.colors.background
} else
MaterialTheme.colors.surface
) )
} }

1
src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
View File

@ -57,7 +57,6 @@ fun AdjustableOutlinedTextField(
Box( Box(
modifier = modifier modifier = modifier
.height(IntrinsicSize.Min) .height(IntrinsicSize.Min)
.background(Color.Red)
) { ) {
BasicTextField( BasicTextField(
modifier = Modifier modifier = Modifier