From 884103dab377d1d2d2075712271febe2e300b4d4 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 21 Feb 2023 19:04:09 +0100 Subject: [PATCH] Revert "Modify black and white themes" This reverts commit 065e6b828d813fad90426debc194a722125f19e1. --- .../ui/theme/colorscheme/BlackAndWhite.kt | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt index 2b74c717..06d30a95 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt @@ -6,64 +6,64 @@ import androidx.compose.ui.graphics.Color val LightBlackAndWhiteColorScheme = lightColorScheme( - primary = Color(0xFF5E5E5E), - onPrimary = Color(0xFFFFFFFF), - primaryContainer = Color(0xFFE2E2E2), - onPrimaryContainer = Color(0xFF1B1B1B), - inversePrimary = Color(0xFFC6C6C6), - secondary = Color(0xFF5E5E5E), - onSecondary = Color(0xFFFFFFFF), - secondaryContainer = Color(0xFFE2E2E2), - onSecondaryContainer = Color(0xFF1B1B1B), - tertiary = Color(0xFF5E5E5E), - onTertiary = Color(0xFFFFFFFF), - tertiaryContainer = Color(0xFFE2E2E2), - onTertiaryContainer = Color(0xFF1B1B1B), - background = Color(0xFFFFFFFF), - onBackground = Color(0xFF1B1B1B), - surface = Color(0xFFFFFFFF), - onSurface = Color(0xFF1B1B1B), - surfaceVariant = Color(0xFFE2E2E2), - onSurfaceVariant = Color(0xFF474747), - inverseSurface = Color(0xFF303030), - inverseOnSurface = Color(0xFFF1F1F1), - error = Color(0xFFBA1A1A), + primary = Color.Black, + onPrimary = Color.White, + primaryContainer = Color.White, + onPrimaryContainer = Color.Black, + inversePrimary = Color.White, + secondary = Color.Black, + onSecondary = Color.White, + secondaryContainer = Color.White, + onSecondaryContainer = Color.Black, + tertiary = Color.Black, + onTertiary = Color.White, + tertiaryContainer = Color.White, + onTertiaryContainer = Color.Black, + background = Color.White, + onBackground = Color.Black, + surface = Color.White, + onSurface = Color.Black, + surfaceVariant = Color.White, + onSurfaceVariant = Color.Black, + inverseSurface = Color.Black, + inverseOnSurface = Color.White, + error = Color(0xFFC10000), onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFFDAD5), - onErrorContainer = Color(0xFF410002), - outline = Color(0xFF777777), - outlineVariant = Color(0xFFC6C6C6), - scrim = Color(0xFF000000), - surfaceTint = Color(0xFFFFFFFF) + errorContainer = Color(0xFFFFDAD3), + onErrorContainer = Color(0xFF410000), + outline = Color.Black, + surfaceTint = Color.White, + outlineVariant = Color.Black, + scrim = Color.Black ) val DarkBlackAndWhiteColorScheme = darkColorScheme( - primary = Color(0xFFC6C6C6), - onPrimary = Color(0xFF303030), - primaryContainer = Color(0xFF474747), - onPrimaryContainer = Color(0xFFE2E2E2), - inversePrimary = Color(0xFF5E5E5E), - secondary = Color(0xFFC6C6C6), - onSecondary = Color(0xFF303030), - secondaryContainer = Color(0xFF474747), - onSecondaryContainer = Color(0xFFE2E2E2), - tertiary = Color(0xFFC6C6C6), - onTertiary = Color(0xFF303030), - tertiaryContainer = Color(0xFF474747), - onTertiaryContainer = Color(0xFFE2E2E2), - background = Color(0xFF000000), - onBackground = Color(0xFFE2E2E2), - surface = Color(0xFF000000), - onSurface = Color(0xFFE2E2E2), - surfaceVariant = Color(0xFF474747), - onSurfaceVariant = Color(0xFFC6C6C6), - inverseSurface = Color(0xFFE2E2E2), - inverseOnSurface = Color(0xFF303030), - error = Color(0xFFFFB4AB), - onError = Color(0xFF690004), - errorContainer = Color(0xFF930009), - onErrorContainer = Color(0xFFFFB4AB), - outline = Color(0xFF919191), - outlineVariant = Color(0xFF474747), - scrim = Color(0xFF000000), - surfaceTint = Color(0xFF000000) + primary = Color.White, + onPrimary = Color.Black, + primaryContainer = Color.Black, + onPrimaryContainer = Color.White, + inversePrimary = Color.Black, + secondary = Color.White, + onSecondary = Color.Black, + secondaryContainer = Color.Black, + onSecondaryContainer = Color.White, + tertiary = Color.White, + onTertiary = Color.Black, + tertiaryContainer = Color.Black, + onTertiaryContainer = Color.White, + background = Color.Black, + onBackground = Color.White, + surface = Color.Black, + onSurface = Color.White, + surfaceVariant = Color.Black, + onSurfaceVariant = Color.White, + inverseSurface = Color.White, + inverseOnSurface = Color.Black, + error = Color(0xffffb4a6), + onError = Color(0xff690000), + errorContainer = Color(0xff940000), + onErrorContainer = Color(0xffffb4a6), + outline = Color.White, + surfaceTint = Color.White, + outlineVariant = Color.White, + scrim = Color.White ) \ No newline at end of file