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

Improved rebase interactive UI

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2023-09-21 21:19:02 +02:00
parent 9e0b5eef62
commit 068f42b6e0
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import androidx.compose.material.*
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusEvent import androidx.compose.ui.focus.onFocusEvent
@ -83,11 +84,13 @@ fun RebaseStateLoaded(
Column( Column(
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
.clip(RoundedCornerShape(4.dp))
.background(MaterialTheme.colors.background)
) { ) {
Text( Text(
text = "Rebase interactive", text = "Rebase interactive",
color = MaterialTheme.colors.onBackground, color = MaterialTheme.colors.onBackground,
modifier = Modifier.padding(start = 16.dp, top = 16.dp), modifier = Modifier.padding(start = 16.dp, top = 16.dp, bottom = 8.dp),
fontSize = 20.sp, fontSize = 20.sp,
) )
@ -168,7 +171,9 @@ fun RebaseCommit(
focusRequester.requestFocus() focusRequester.requestFocus()
} }
} }
.clickable { onFocusLine() } .clickable {
onFocusLine()
}
.run { .run {
if (isSelected) { if (isSelected) {
background(MaterialTheme.colors.backgroundSelected) background(MaterialTheme.colors.backgroundSelected)