Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix some theming

Browse source
This commit is contained in:
ganfra 2022-11-22 20:12:47 +01:00
parent 68b788a75d
commit fd075344db
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt
View file

@ -17,7 +17,7 @@ val SystemGrey3Dark = Color(0xFF48484A)
val SystemGrey4Light = Color(0xFFD1D1D6) val SystemGrey4Light = Color(0xFFD1D1D6)
val SystemGrey4Dark = Color(0xFF3A3A3C) val SystemGrey4Dark = Color(0xFF3A3A3C)
val SystemGrey5Light = Color(0xFFE5E5EA) val SystemGrey5Light = Color(0xFFE5E5EA)
val SystemGrey5Dark = Color(0xFF2C2C2E) val SystemGrey5Dark = Color(0xFF1C1C1E)
val SystemGrey6Light = Color(0xFFF2F2F7) val SystemGrey6Light = Color(0xFFF2F2F7)
val SystemGrey6Dark = Color(0xFF1C1C1E) val SystemGrey6Dark = Color(0xFF1C1C1E)

6
libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt
View file

@ -16,7 +16,7 @@ private val DarkColorScheme = darkColorScheme(
background = Color.Black, background = Color.Black,
onBackground = Color.White, onBackground = Color.White,
surface = Color.Black, surface = Color.Black,
surfaceVariant = SystemGrey6Dark, surfaceVariant = SystemGrey5Dark,
onSurface = Color.White, onSurface = Color.White,
onSurfaceVariant = Color.White, onSurfaceVariant = Color.White,
) )
@ -28,7 +28,7 @@ private val LightColorScheme = lightColorScheme(
background = Color.White, background = Color.White,
onBackground = Color.Black, onBackground = Color.Black,
surface = Color.White, surface = Color.White,
surfaceVariant = SystemGrey6Light, surfaceVariant = SystemGrey5Light,
onSurface = Color.Black, onSurface = Color.Black,
onSurfaceVariant = Color.Black, onSurfaceVariant = Color.Black,
@ -48,7 +48,7 @@ private val LightColorScheme = lightColorScheme(
fun ElementXTheme( fun ElementXTheme(
darkTheme: Boolean = isSystemInDarkTheme(), darkTheme: Boolean = isSystemInDarkTheme(),
// Dynamic color is available on Android 12+ // Dynamic color is available on Android 12+
dynamicColor: Boolean = true, dynamicColor: Boolean = false,
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
val colorScheme = when { val colorScheme = when {