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

Reorganized settings

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2023-05-21 17:26:40 +02:00
parent 37a65ffc11
commit fbec92bf24
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt
View File

@ -16,6 +16,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.AppIcons import com.jetpackduba.gitnuro.AppIcons
import com.jetpackduba.gitnuro.extensions.handMouseClickable import com.jetpackduba.gitnuro.extensions.handMouseClickable
import com.jetpackduba.gitnuro.extensions.handOnHover
import com.jetpackduba.gitnuro.managers.Error import com.jetpackduba.gitnuro.managers.Error
import com.jetpackduba.gitnuro.preferences.DEFAULT_UI_SCALE import com.jetpackduba.gitnuro.preferences.DEFAULT_UI_SCALE
import com.jetpackduba.gitnuro.theme.* import com.jetpackduba.gitnuro.theme.*
@ -39,13 +40,13 @@ sealed interface SettingsEntry {
val settings = listOf( val settings = listOf(
SettingsEntry.Section("User interface"), SettingsEntry.Section("User interface"),
SettingsEntry.Entry(AppIcons.PALETTE, "Appearance") { UiSettings(it) }, SettingsEntry.Entry(AppIcons.PALETTE, "Appearance") { Appearance(it) },
SettingsEntry.Entry(AppIcons.LAYOUT, "Layout") { Layout(it) }, SettingsEntry.Entry(AppIcons.LAYOUT, "Layout") { Layout(it) },
SettingsEntry.Section("GIT"), SettingsEntry.Section("GIT"),
SettingsEntry.Entry(AppIcons.LIST, "Commits history") { GitSettings(it) }, SettingsEntry.Entry(AppIcons.LIST, "Commits history") { CommitsHistory(it) },
SettingsEntry.Entry(AppIcons.BRANCH, "Branches") { }, SettingsEntry.Entry(AppIcons.BRANCH, "Branches") { Branches(it) },
SettingsEntry.Entry(AppIcons.CLOUD, "Remote actions") { }, SettingsEntry.Entry(AppIcons.CLOUD, "Remote actions") { RemoteActions(it) },
SettingsEntry.Section("Network"), SettingsEntry.Section("Network"),
SettingsEntry.Entry(AppIcons.NETWORK, "Proxy") { }, SettingsEntry.Entry(AppIcons.NETWORK, "Proxy") { },
@ -188,11 +189,10 @@ private fun Section(name: String) {
) )
} }
@Composable @Composable
fun GitSettings(settingsViewModel: SettingsViewModel) { private fun CommitsHistory(settingsViewModel: SettingsViewModel) {
val commitsLimitEnabled by settingsViewModel.commitsLimitEnabledFlow.collectAsState() val commitsLimitEnabled by settingsViewModel.commitsLimitEnabledFlow.collectAsState()
val ffMerge by settingsViewModel.ffMergeFlow.collectAsState()
val pullRebase by settingsViewModel.pullRebaseFlow.collectAsState()
var commitsLimit by remember { mutableStateOf(settingsViewModel.commitsLimit) } var commitsLimit by remember { mutableStateOf(settingsViewModel.commitsLimit) }
SettingToggle( SettingToggle(
@ -214,15 +214,11 @@ fun GitSettings(settingsViewModel: SettingsViewModel) {
settingsViewModel.commitsLimit = value settingsViewModel.commitsLimit = value
} }
) )
}
SettingToggle( @Composable
title = "Fast-forward merge", private fun RemoteActions(settingsViewModel: SettingsViewModel) {
subtitle = "Try to fast-forward merges when possible", val pullRebase by settingsViewModel.pullRebaseFlow.collectAsState()
value = ffMerge,
onValueChanged = { value ->
settingsViewModel.ffMerge = value
}
)
SettingToggle( SettingToggle(
title = "Pull with rebase as default", title = "Pull with rebase as default",
@ -233,9 +229,22 @@ fun GitSettings(settingsViewModel: SettingsViewModel) {
} }
) )
} }
@Composable
private fun Branches(settingsViewModel: SettingsViewModel) {
val ffMerge by settingsViewModel.ffMergeFlow.collectAsState()
SettingToggle(
title = "Fast-forward merge",
subtitle = "Try to fast-forward merges when possible",
value = ffMerge,
onValueChanged = { value ->
settingsViewModel.ffMerge = value
}
)
}
@Composable @Composable
fun Layout(settingsViewModel: SettingsViewModel) { private fun Layout(settingsViewModel: SettingsViewModel) {
val swapUncommitedChanges by settingsViewModel.swapUncommitedChangesFlow.collectAsState() val swapUncommitedChanges by settingsViewModel.swapUncommitedChangesFlow.collectAsState()
SettingToggle( SettingToggle(
@ -249,7 +258,7 @@ fun Layout(settingsViewModel: SettingsViewModel) {
} }
@Composable @Composable
fun UiSettings(settingsViewModel: SettingsViewModel) { private fun Appearance(settingsViewModel: SettingsViewModel) {
val currentTheme by settingsViewModel.themeState.collectAsState() val currentTheme by settingsViewModel.themeState.collectAsState()
val (errorToDisplay, setErrorToDisplay) = remember { mutableStateOf<Error?>(null) } val (errorToDisplay, setErrorToDisplay) = remember { mutableStateOf<Error?>(null) }
@ -438,7 +447,8 @@ fun SettingToggle(
Switch( Switch(
checked = value, checked = value,
onCheckedChange = onValueChanged, onCheckedChange = onValueChanged,
colors = SwitchDefaults.colors(uncheckedThumbColor = MaterialTheme.colors.secondary) colors = SwitchDefaults.colors(uncheckedThumbColor = MaterialTheme.colors.secondary),
modifier = Modifier.handOnHover(),
) )
} }
} }