avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Match themes' colors

Browse Source
This commit is contained in:
machiav3lli 2022-06-26 01:50:05 +02:00
parent 3a12c90d81
commit d79e5abb9f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt
View File

@ -24,7 +24,7 @@ val md_theme_light_onError = Color(0xFFFFFFFF)
val md_theme_light_onErrorContainer = Color(0xFF410002) val md_theme_light_onErrorContainer = Color(0xFF410002)
val md_theme_light_background = Color(0xFFFBFDF8) val md_theme_light_background = Color(0xFFFBFDF8)
val md_theme_light_onBackground = Color(0xFF191C1A) val md_theme_light_onBackground = Color(0xFF191C1A)
val md_theme_light_surface = Color(0xFFFBFDF8) val md_theme_light_surface = Color(0xFFE8F5E9)
val md_theme_light_onSurface = Color(0xFF191C1A) val md_theme_light_onSurface = Color(0xFF191C1A)
val md_theme_light_surfaceVariant = Color(0xFFDCE5DB) val md_theme_light_surfaceVariant = Color(0xFFDCE5DB)
val md_theme_light_onSurfaceVariant = Color(0xFF414942) val md_theme_light_onSurfaceVariant = Color(0xFF414942)

5
src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt
View File

@ -15,6 +15,7 @@ fun AppTheme(
) { ) {
MaterialTheme( MaterialTheme(
colorScheme = when { colorScheme = when {
//dynamicTheme -> dynamicDarkColorScheme(LocalContext.current)
darkTheme && blackTheme -> BlackColors darkTheme && blackTheme -> BlackColors
darkTheme -> DarkColors darkTheme -> DarkColors
else -> LightColors else -> LightColors
@ -73,7 +74,7 @@ private val DarkColors = darkColorScheme(
onErrorContainer = md_theme_dark_onErrorContainer, onErrorContainer = md_theme_dark_onErrorContainer,
background = md_theme_dark_background, background = md_theme_dark_background,
onBackground = md_theme_dark_onBackground, onBackground = md_theme_dark_onBackground,
surface = md_theme_dark_surface, surface = GreyDark,
onSurface = md_theme_dark_onSurface, onSurface = md_theme_dark_onSurface,
surfaceVariant = md_theme_dark_surfaceVariant, surfaceVariant = md_theme_dark_surfaceVariant,
onSurfaceVariant = md_theme_dark_onSurfaceVariant, onSurfaceVariant = md_theme_dark_onSurfaceVariant,
@ -102,7 +103,7 @@ private val BlackColors = darkColorScheme(
onErrorContainer = md_theme_dark_onErrorContainer, onErrorContainer = md_theme_dark_onErrorContainer,
background = PitchBlack, background = PitchBlack,
onBackground = md_theme_dark_onBackground, onBackground = md_theme_dark_onBackground,
surface = PitchBlack, surface = md_theme_dark_surface,
onSurface = md_theme_dark_onSurface, onSurface = md_theme_dark_onSurface,
surfaceVariant = md_theme_dark_surfaceVariant, surfaceVariant = md_theme_dark_surfaceVariant,
onSurfaceVariant = md_theme_dark_onSurfaceVariant, onSurfaceVariant = md_theme_dark_onSurfaceVariant,