From c4afb9e457b2b9d8463dd2603d078eec69d0aa21 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Fri, 19 Nov 2021 20:08:35 +0100 Subject: [PATCH] Added new possible color scheme --- src/main/kotlin/app/theme/Color.kt | 6 ++++-- src/main/kotlin/app/ui/AppTab.kt | 3 ++- src/main/kotlin/app/ui/Log.kt | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/app/theme/Color.kt b/src/main/kotlin/app/theme/Color.kt index 8c77815..ad01876 100644 --- a/src/main/kotlin/app/theme/Color.kt +++ b/src/main/kotlin/app/theme/Color.kt @@ -14,12 +14,14 @@ val errorColor = Color(0xFFFA4B4B) val primaryGrayLight = Color(0xFF464646) val accentGrayLight = Color(0xFFCCCCCC) -val backgroundColorLight = Color(0xFFEBEFF7) -val surfaceColorLight = Color(0xFFFFFFFF) +val backgroundColorLight = Color(0xFFFFFFFF ) +val surfaceColorLight = Color(0xFFEBEFF7) val surfaceColorDark = Color(0xFF1C1D1E) val headerBackgroundLight = Color(0xFFF4F6FA) val headerBackgroundDark = Color(0xFF303132) +val tabBackground = Color(0xFFf0f2f7) + val addFileLight = Color(0xFF32A852) val deleteFileLight = errorColor val modifyFileLight = primary diff --git a/src/main/kotlin/app/ui/AppTab.kt b/src/main/kotlin/app/ui/AppTab.kt index 33868a9..e892133 100644 --- a/src/main/kotlin/app/ui/AppTab.kt +++ b/src/main/kotlin/app/ui/AppTab.kt @@ -24,6 +24,7 @@ import app.DialogManager import app.LoadingRepository import app.git.GitManager import app.git.RepositorySelectionStatus +import app.theme.tabBackground import app.ui.components.DialogBox import kotlinx.coroutines.delay @@ -69,7 +70,7 @@ fun AppTab( Box { Column( modifier = Modifier - .background(MaterialTheme.colors.background) + .background(tabBackground) .fillMaxSize() ) { diff --git a/src/main/kotlin/app/ui/Log.kt b/src/main/kotlin/app/ui/Log.kt index a415b80..e483bd2 100644 --- a/src/main/kotlin/app/ui/Log.kt +++ b/src/main/kotlin/app/ui/Log.kt @@ -82,7 +82,7 @@ fun Log( Card( modifier = Modifier .padding(8.dp) - .background(MaterialTheme.colors.surface) + .background(MaterialTheme.colors.background) .fillMaxSize() ) { val hasUncommitedChanges by gitManager.hasUncommitedChanges.collectAsState() @@ -94,7 +94,7 @@ fun Log( ScrollableLazyColumn( modifier = Modifier - .background(MaterialTheme.colors.surface) + .background(MaterialTheme.colors.background) .fillMaxSize(), ) {