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

Redesigned reset branch dialog

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-10-08 01:27:04 +02:00
parent e3c2a319ed
commit 21e1513d20
1 changed files with 97 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
View File

@ -2,19 +2,21 @@ package com.jetpackduba.gitnuro.ui.dialogs
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.onClick
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.git.log.ResetType
import com.jetpackduba.gitnuro.theme.secondaryTextColor
import com.jetpackduba.gitnuro.theme.textButtonColors
import com.jetpackduba.gitnuro.ui.components.PrimaryButton
@ -27,31 +29,64 @@ fun ResetBranchDialog(
MaterialDialog(onCloseRequested = onReject) {
Column(
modifier = Modifier
.background(MaterialTheme.colors.background),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
) {
RadioButtonText(
selected = resetType == ResetType.SOFT,
onClick = {
resetType = ResetType.SOFT
},
text = "Soft reset"
Icon(
painterResource("undo.svg"),
contentDescription = null,
modifier = Modifier
.size(64.dp)
.padding(vertical = 16.dp),
tint = MaterialTheme.colors.onBackground,
)
RadioButtonText(
selected = resetType == ResetType.MIXED,
onClick = {
resetType = ResetType.MIXED
},
text = "Mixed reset"
Text(
text = "Reset current branch",
modifier = Modifier
.padding(bottom = 8.dp),
color = MaterialTheme.colors.onBackground,
style = MaterialTheme.typography.body1,
)
RadioButtonText(
selected = resetType == ResetType.HARD,
onClick = {
resetType = ResetType.HARD
},
text = "Hard reset"
Text(
text = "Reset the changes of your current branch to a \nprevious or different commit",
modifier = Modifier
.padding(bottom = 16.dp),
color = MaterialTheme.colors.secondaryTextColor,
style = MaterialTheme.typography.body2,
textAlign = TextAlign.Center,
)
Column(
// modifier = Modifier
// .padding(horizontal = 16.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
RadioButtonText(
isSelected = resetType == ResetType.SOFT,
title = "Soft reset",
subtitle = "Keep the changes in the index (staged)",
onClick = {
resetType = ResetType.SOFT
},
)
RadioButtonText(
isSelected = resetType == ResetType.MIXED,
title = "Mixed reset",
subtitle = "Keep the changes (unstaged)",
onClick = {
resetType = ResetType.MIXED
},
)
RadioButtonText(
isSelected = resetType == ResetType.HARD,
title = "Hard",
subtitle = "Discard all the changes",
onClick = {
resetType = ResetType.HARD
},
)
}
Row(
modifier = Modifier
.padding(top = 16.dp)
@ -84,36 +119,53 @@ fun ResetBranchDialog(
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun RadioButtonText(
selected: Boolean,
text: String,
isSelected: Boolean,
title: String,
subtitle: String,
onClick: (() -> Unit)?,
modifier: Modifier = Modifier,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
colors: RadioButtonColors = RadioButtonDefaults.colors()
) {
val color = if (isSelected) {
MaterialTheme.colors.primary
} else {
MaterialTheme.colors.surface
}
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.width(380.dp)
.clip(RoundedCornerShape(8.dp))
.background(MaterialTheme.colors.background)
.border(2.dp, color, RoundedCornerShape(8.dp))
.onClick {
if (onClick != null) {
onClick()
}
}
) {
RadioButton(
selected,
onClick,
modifier,
enabled,
interactionSource,
colors
Box(
modifier = Modifier
.padding(start = 16.dp)
.clip(CircleShape)
.background(color)
.size(16.dp)
)
Text(
text = text,
modifier = Modifier.padding(horizontal = 8.dp),
color = MaterialTheme.colors.onBackground,
)
Column(
modifier = Modifier.padding(start = 16.dp, top = 8.dp, bottom = 8.dp),
) {
Text(
text = title,
color = MaterialTheme.colors.onBackground,
style = MaterialTheme.typography.body1,
)
Text(
text = subtitle,
color = MaterialTheme.colors.secondaryTextColor,
style = MaterialTheme.typography.body2,
)
}
}
}