mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Fix some theming
This commit is contained in:
@@ -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)
|
||||||
|
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user