From 7335499f97a9778184f1118d86afd0ebf6d65c4f Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sun, 5 Jun 2022 21:27:25 +0200 Subject: [PATCH] Updated themes --- src/main/kotlin/app/theme/Color.kt | 8 ++++---- src/main/kotlin/app/theme/Theme.kt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/app/theme/Color.kt b/src/main/kotlin/app/theme/Color.kt index 18e1cb0..d918bba 100644 --- a/src/main/kotlin/app/theme/Color.kt +++ b/src/main/kotlin/app/theme/Color.kt @@ -51,7 +51,7 @@ val darkBlueTheme = ColorsScheme( hoverScrollbar = Color(0xFF888888) ) -val darkTheme = ColorsScheme( +val darkGrayTheme = ColorsScheme( primary = Color(0xFF014F97), primaryVariant = Color(0xFFCDEAFF), onPrimary = Color(0xFFFFFFFFF), @@ -61,9 +61,9 @@ val darkTheme = ColorsScheme( error = Color(0xFFc93838), onError = Color(0xFFFFFFFF), background = Color(0xFF16181F), - backgroundSelected = Color(0xFF2f3640), - surface = Color(0xFF202330), - headerBackground = Color(0xFF131E44), + backgroundSelected = Color(0xFF32373e), + surface = Color(0xFF212731), + headerBackground = Color(0xFF21303d), borderColor = Color(0xFF989898), graphHeaderBackground = Color(0xFF303132), addFile = Color(0xFF32A852), diff --git a/src/main/kotlin/app/theme/Theme.kt b/src/main/kotlin/app/theme/Theme.kt index fdc5acb..885d9e4 100644 --- a/src/main/kotlin/app/theme/Theme.kt +++ b/src/main/kotlin/app/theme/Theme.kt @@ -8,14 +8,14 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import app.DropDownOption -private var appTheme: ColorsScheme = darkTheme +private var appTheme: ColorsScheme = darkGrayTheme @Composable fun AppTheme(selectedTheme: Themes = Themes.DARK, content: @Composable() () -> Unit) { val theme = when (selectedTheme) { Themes.LIGHT -> lightTheme - Themes.DARK -> darkTheme - Themes.DARK_BLUE -> darkBlueTheme + Themes.DARK -> darkBlueTheme + Themes.DARK_GRAY -> darkGrayTheme } appTheme = theme @@ -93,7 +93,7 @@ val Colors.dialogOverlay: Color enum class Themes(val displayName: String) : DropDownOption { LIGHT("Light"), DARK("Dark"), - DARK_BLUE("Dark blue"); + DARK_GRAY("Dark gray"); override val optionName: String get() = displayName @@ -102,5 +102,5 @@ enum class Themes(val displayName: String) : DropDownOption { val themesList = listOf( Themes.LIGHT, Themes.DARK, - Themes.DARK_BLUE, + Themes.DARK_GRAY, ) \ No newline at end of file