From 3de433986058a93d512f55597becb2e9a580fea3 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Thu, 4 Aug 2022 00:52:19 +0200 Subject: [PATCH] Fixed colors scheme of remotes and settings dialogs --- .../kotlin/app/ui/dialogs/AuthorDialog.kt | 2 -- .../app/ui/dialogs/EditRemotesDialog.kt | 20 +++++++------------ .../kotlin/app/ui/dialogs/MaterialDialog.kt | 4 +++- .../kotlin/app/ui/dialogs/NewBranchDialog.kt | 2 -- .../app/ui/dialogs/settings/SettingsDialog.kt | 16 ++++++++++----- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main/kotlin/app/ui/dialogs/AuthorDialog.kt b/src/main/kotlin/app/ui/dialogs/AuthorDialog.kt index 6b9add2..799d95c 100644 --- a/src/main/kotlin/app/ui/dialogs/AuthorDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/AuthorDialog.kt @@ -1,7 +1,6 @@ package app.ui.dialogs import androidx.compose.animation.core.animateFloatAsState -import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.* import androidx.compose.runtime.* @@ -33,7 +32,6 @@ fun AuthorDialog( MaterialDialog(onCloseRequested = onClose) { Column( modifier = Modifier - .background(MaterialTheme.colors.background) .padding(horizontal = 8.dp), ) { diff --git a/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt b/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt index 71bde36..155dfd1 100644 --- a/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt @@ -66,6 +66,7 @@ fun EditRemotesDialog( MaterialDialog( paddingVertical = 8.dp, paddingHorizontal = 16.dp, + background = MaterialTheme.colors.surface, onCloseRequested = onDismiss ) { Column( @@ -101,21 +102,21 @@ fun EditRemotesDialog( Row( modifier = Modifier .padding(bottom = 8.dp) - .background(MaterialTheme.colors.surface) ) { Column( modifier = Modifier .width(200.dp) - .fillMaxHeight(), + .fillMaxHeight() + .background(MaterialTheme.colors.background), ) { LazyColumn( modifier = Modifier.weight(1f) ) { items(remotesEditorData.listRemotes) { remote -> val background = if (remote == selectedRemote) { - MaterialTheme.colors.background + MaterialTheme.colors.backgroundSelected } else - MaterialTheme.colors.surface + MaterialTheme.colors.background Text( text = remote.remoteName, @@ -134,7 +135,7 @@ fun EditRemotesDialog( Row( modifier = Modifier .fillMaxWidth() - .background(MaterialTheme.colors.background) +// .background(MaterialTheme.colors.background) ) { IconButton( modifier = Modifier.size(36.dp) @@ -185,17 +186,10 @@ fun EditRemotesDialog( } } - Box( - modifier = Modifier - .fillMaxHeight() - .width(1.dp) - .background(MaterialTheme.colors.borderColor) - ) - Column( modifier = Modifier .fillMaxWidth() - .background(MaterialTheme.colors.surface) +// .background(MaterialTheme.colors.background) .padding(horizontal = 16.dp) ) { if (selectedRemote != null) { diff --git a/src/main/kotlin/app/ui/dialogs/MaterialDialog.kt b/src/main/kotlin/app/ui/dialogs/MaterialDialog.kt index 9c212fb..bbf6132 100644 --- a/src/main/kotlin/app/ui/dialogs/MaterialDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/MaterialDialog.kt @@ -19,6 +19,7 @@ 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.graphics.Color import androidx.compose.ui.input.key.Key import androidx.compose.ui.input.key.key import androidx.compose.ui.input.key.onPreviewKeyEvent @@ -35,6 +36,7 @@ fun MaterialDialog( alignment: Alignment = Alignment.Center, paddingHorizontal: Dp = 16.dp, paddingVertical: Dp = 16.dp, + background: Color = MaterialTheme.colors.background, onCloseRequested: () -> Unit = {}, content: @Composable () -> Unit ) { @@ -75,7 +77,7 @@ fun MaterialDialog( modifier = Modifier .border(1.dp, MaterialTheme.colors.onBackground.copy(alpha = 0.1f), RoundedCornerShape(16.dp)) .clip(RoundedCornerShape(16.dp)) - .background(MaterialTheme.colors.background) + .background(background) .padding( horizontal = paddingHorizontal, vertical = paddingVertical, diff --git a/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt b/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt index 44b119d..5692a03 100644 --- a/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt @@ -34,8 +34,6 @@ fun NewBranchDialog( MaterialDialog(onCloseRequested = onReject) { Column( - modifier = Modifier - .background(MaterialTheme.colors.background), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, ) { diff --git a/src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt b/src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt index cb915bb..e675ead 100644 --- a/src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt @@ -52,6 +52,7 @@ fun SettingsDialog( var selectedCategory by remember { mutableStateOf(SettingsCategory.UI) } MaterialDialog( + background = MaterialTheme.colors.surface, onCloseRequested = { settingsViewModel.savePendingChanges() @@ -71,6 +72,7 @@ fun SettingsDialog( modifier = Modifier .width(200.dp) .fillMaxHeight() + .background(MaterialTheme.colors.background) ) { categories.forEach { category -> Category( @@ -82,7 +84,11 @@ fun SettingsDialog( } - Column(modifier = Modifier.width(720.dp)) { + Column( + modifier = Modifier + .width(720.dp) + .padding(horizontal = 16.dp) + ) { when (selectedCategory) { SettingsCategory.UI -> UiSettings(settingsViewModel) SettingsCategory.GIT -> GitSettings(settingsViewModel) @@ -237,7 +243,7 @@ fun SettingDropDown( ) { var showThemeDropdown by remember { mutableStateOf(false) } Row( - modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), + modifier = Modifier.padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically ) { FieldTitles(title, subtitle) @@ -306,7 +312,7 @@ fun SettingToggle( onValueChanged: (Boolean) -> Unit, ) { Row( - modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), + modifier = Modifier.padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically ) { FieldTitles(title, subtitle) @@ -329,7 +335,7 @@ fun SettingSlider( onValueChangeFinished: () -> Unit, ) { Row( - modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), + modifier = Modifier.padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically ) { FieldTitles(title, subtitle) @@ -366,7 +372,7 @@ fun SettingIntInput( onValueChanged: (Int) -> Unit, ) { Row( - modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), + modifier = Modifier.padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically ) { FieldTitles(title, subtitle)