From 876a3265fe52b8c1be1e4d3a4aeea2fa79b57f0c Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Thu, 29 Sep 2022 17:48:47 +0200 Subject: [PATCH] Adjusted dialog colors to use surface color --- src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt | 2 +- .../com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt | 5 ++++- .../gitnuro/ui/dialogs/settings/SettingsDialog.kt | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt index 72d73c6..613faa1 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt @@ -15,7 +15,7 @@ val lightTheme = ColorsScheme( backgroundSelected = Color(0xC0cee1f2), surface = Color(0xFFf1f3fa), secondarySurface = Color(0xFFedeef2), - headerBackground = Color(0xFFe9eaed), + headerBackground = Color(0xFFeaedf4), borderColor = Color(0xFF989898), addFile = Color(0xFF32A852), deletedFile = Color(0xFFc93838), diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt index b6377c0..cef6f9f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt @@ -36,7 +36,10 @@ fun CloneDialog( val cloneStatus = cloneViewModel.cloneStatus.collectAsState() val cloneStatusValue = cloneStatus.value - MaterialDialog(onCloseRequested = onClose) { + MaterialDialog( + onCloseRequested = onClose, + background = MaterialTheme.colors.surface, + ) { Box( modifier = Modifier .width(720.dp) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt index c5fc7bb..8d616da 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt @@ -268,7 +268,11 @@ fun SettingDropDown( Spacer(modifier = Modifier.weight(1f)) Box { - OutlinedButton(onClick = { showThemeDropdown = true }) { + OutlinedButton( + onClick = { showThemeDropdown = true }, + colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.background), + modifier = Modifier.widthIn(min = 120.dp) + ) { Text( text = currentOption.optionName, style = MaterialTheme.typography.body1,