From e38c4669c1afb3174d67cc8bb1fcd8939f079e01 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Thu, 10 Nov 2022 20:22:24 +0000 Subject: [PATCH] Automatic Lint --- .../ui/settings/SettingsAppearanceScreen.kt | 2 +- .../ca/gosyer/jui/uicore/theme/Themes.kt | 46 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt index f18fb770..fdab0cf4 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/settings/SettingsAppearanceScreen.kt @@ -200,7 +200,7 @@ fun SettingsAppearanceScreenContent( .padding(top = 8.dp) ) { val isSelected = (isLight && currentLightTheme == theme.id) || - (!isLight && currentDarkTheme == theme.id) + (!isLight && currentDarkTheme == theme.id) MaterialTheme( colors = if (isSelected) customColors else theme.colors ) { diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt index f794410e..540c38d3 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/theme/Themes.kt @@ -168,7 +168,7 @@ val themes = listOf( background = Color(0xFFFBFDF7), surface = Color(0xFFFBFDF7), onBackground = Color(0xFF1A1C19), - onSurface = Color(0xFF1A1C19), + onSurface = Color(0xFF1A1C19) ), extraColors( tertiary = Color(0xFFB91D22) @@ -187,7 +187,7 @@ val themes = listOf( onPrimary = Color(0xFF003915), onSecondary = Color(0xFF003915), onBackground = Color(0xFFE1E3DD), - onSurface = Color(0xFFE1E3DD), + onSurface = Color(0xFFE1E3DD) ), extraColors( tertiary = Color(0xFFFFB3AA), @@ -211,7 +211,7 @@ val themes = listOf( onPrimary = Color(0xFFEDE2FF), onSecondary = Color(0xFFEDE2FF), onBackground = Color(0xFF1B1B22), - onSurface = Color(0xFF1B1B22), + onSurface = Color(0xFF1B1B22) ), extraColors( tertiary = Color(0xFFEDE2FF), @@ -231,7 +231,7 @@ val themes = listOf( onPrimary = Color(0xFF111129), onSecondary = Color(0xFF111129), onBackground = Color(0xFFDEE8FF), - onSurface = Color(0xFFDEE8FF), + onSurface = Color(0xFFDEE8FF) ), extraColors( tertiary = Color(0xFF5E25E1), @@ -253,10 +253,10 @@ val themes = listOf( background = Color(0xFFFFFBFF), surface = Color(0xFFFFFBFF), onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F) ), extraColors( - tertiary = Color(0xFF006638), + tertiary = Color(0xFF006638) ) ), Theme( @@ -272,10 +272,10 @@ val themes = listOf( onPrimary = Color(0xFFFFFFFF), onSecondary = Color(0xFFFFFFFF), onBackground = Color(0xFFE5E1E5), - onSurface = Color(0xFFE5E1E5), + onSurface = Color(0xFFE5E1E5) ), extraColors( - tertiary = Color(0xFF55971C), + tertiary = Color(0xFF55971C) ) ), /** @@ -293,10 +293,10 @@ val themes = listOf( background = Color(0xFFFCFCFC), surface = Color(0xFFFCFCFC), onBackground = Color(0xFF201A1A), - onSurface = Color(0xFF201A1A), + onSurface = Color(0xFF201A1A) ), extraColors( - tertiary = Color(0xFF775930), + tertiary = Color(0xFF775930) ) ), Theme( @@ -312,7 +312,7 @@ val themes = listOf( onPrimary = Color(0xFF67001B), onSecondary = Color(0xFF67001B), onBackground = Color(0xFFECDFDF), - onSurface = Color(0xFFECDFDF), + onSurface = Color(0xFFECDFDF) ), extraColors( tertiary = Color(0xFFE8C08E), @@ -336,7 +336,7 @@ val themes = listOf( onPrimary = Color(0xFFF3B375), onSecondary = Color(0xFFF3B375), onBackground = Color(0xFF1B1B22), - onSurface = Color(0xFF1B1B22), + onSurface = Color(0xFF1B1B22) ), extraColors( tertiary = Color(0xFFF3B375), @@ -356,7 +356,7 @@ val themes = listOf( onPrimary = Color(0xFF38294E), onSecondary = Color(0xFF38294E), onBackground = Color(0xFFE3E0F2), - onSurface = Color(0xFFE3E0F2), + onSurface = Color(0xFFE3E0F2) ), extraColors( tertiary = Color(0xFF66577E), @@ -377,7 +377,7 @@ val themes = listOf( background = Color(0xFFFAFAFA), surface = Color(0xFFFAFAFA), onBackground = Color(0xFF050505), - onSurface = Color(0xFF050505), + onSurface = Color(0xFF050505) ), extraColors( tertiary = Color(0xFFFF7F7F), @@ -397,10 +397,10 @@ val themes = listOf( onPrimary = Color.Black, onSecondary = Color.Black, onBackground = Color(0xFFDFDEDA), - onSurface = Color(0xFFDFDEDA), + onSurface = Color(0xFFDFDEDA) ), extraColors( - tertiary = Color(0xFFBF1F2F), + tertiary = Color(0xFFBF1F2F) ) ), /** @@ -418,7 +418,7 @@ val themes = listOf( background = Color(0xFFFDFBFF), surface = Color(0xFFFDFBFF), onBackground = Color(0xFF001C3b), - onSurface = Color(0xFF001C3b), + onSurface = Color(0xFF001C3b) ), extraColors( tertiary = Color(0xFF92F7BC), @@ -438,7 +438,7 @@ val themes = listOf( onPrimary = Color(0xFF003544), onSecondary = Color(0xFF003544), onBackground = Color(0xFFD5E3FF), - onSurface = Color(0xFFD5E3FF), + onSurface = Color(0xFFD5E3FF) ), extraColors( tertiary = Color(0xFF004D61), @@ -462,7 +462,7 @@ val themes = listOf( onPrimary = Color.White, onSecondary = Color.White, onBackground = Color(0xFF222222), - onSurface = Color(0xFF222222), + onSurface = Color(0xFF222222) ), extraColors( tertiary = Color.White, @@ -482,7 +482,7 @@ val themes = listOf( onPrimary = Color(0xFF5A5A5A), onSecondary = Color(0xFF5A5A5A), onBackground = Color(0xFFE6E6E6), - onSurface = Color(0xFFE6E6E6), + onSurface = Color(0xFFE6E6E6) ), extraColors( tertiary = Color.Black, @@ -504,10 +504,10 @@ val themes = listOf( background = Color(0xFFFCFCFC), surface = Color(0xFFFCFCFC), onBackground = Color(0xFF211A18), - onSurface = Color(0xFF211A18), + onSurface = Color(0xFF211A18) ), extraColors( - tertiary = Color(0xFF6B5E2F), + tertiary = Color(0xFF6B5E2F) ) ), Theme( @@ -523,7 +523,7 @@ val themes = listOf( onPrimary = Color(0xFF5F1600), onSecondary = Color(0xFF5F1600), onBackground = Color(0xFFEDE0DD), - onSurface = Color(0xFFEDE0DD), + onSurface = Color(0xFFEDE0DD) ), extraColors( tertiary = Color(0xFFD7C68D),