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

Changed abort button colors

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-02-18 12:30:30 +01:00
parent 902626f04b
commit 7a86ed8227
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/kotlin/app/ui/UncommitedChanges.kt
View File

@ -288,17 +288,12 @@ fun MergeButtons(
Row(
modifier = Modifier.fillMaxWidth()
) {
Button(
onClick = onAbort,
AbortButton(
modifier = Modifier
.weight(1f)
.padding(start = 8.dp, end = 4.dp),
) {
Text(
text = "Abort",
fontSize = 14.sp,
)
}
onClick = onAbort
)
Button(
onClick = onMerge,
@ -327,17 +322,12 @@ fun RebasingButtons(
Row(
modifier = Modifier.fillMaxWidth()
) {
Button(
onClick = onAbort,
AbortButton(
modifier = Modifier
.weight(1f)
.padding(start = 8.dp, end = 4.dp),
) {
Text(
text = "Abort",
fontSize = 14.sp,
)
}
onClick = onAbort
)
if (canContinue) {
Button(
@ -369,6 +359,23 @@ fun RebasingButtons(
}
}
@Composable
fun AbortButton(modifier: Modifier, onClick: () -> Unit) {
Button(
onClick = onClick,
modifier = modifier,
colors = ButtonDefaults.buttonColors(
backgroundColor = MaterialTheme.colors.unstageButton,
contentColor = Color.White
)
) {
Text(
text = "Abort",
fontSize = 14.sp,
)
}
}
// TODO: This logic should be part of the diffViewModel where it gets the latest version of the diffEntry
fun checkIfSelectedEntryShouldBeUpdated(
selectedEntryType: DiffEntryType,