Fix theming dark/light

This commit is contained in:
ganfra 2022-11-02 20:03:31 +01:00
parent 9a05ad13c6
commit 87e6bd1210
4 changed files with 22 additions and 23 deletions

View file

@ -2,12 +2,5 @@ package io.element.android.x.designsystem
import androidx.compose.ui.graphics.Color
val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)
val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
val LightGrey = Color(0x993C3C43)
val DarkGrey = Color(0x99EBEBF5)

View file

@ -6,21 +6,30 @@ import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat
private val DarkColorScheme = darkColorScheme(
primary = Purple80,
secondary = PurpleGrey80,
tertiary = Pink80
primary = Color.White,
secondary = DarkGrey,
tertiary = Color.White,
background = Color.Black,
onBackground = Color.White,
surface = Color.Black,
onSurface = Color.White
)
private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40
primary = Color.Black,
secondary = LightGrey,
tertiary = Color.Black,
background = Color.White,
onBackground = Color.Black,
surface = Color.White,
onSurface = Color.Black
/* Other default colors to override
background = Color(0xFFFFFBFE),
@ -33,6 +42,7 @@ private val LightColorScheme = lightColorScheme(
*/
)
@Composable
fun ElementXTheme(
darkTheme: Boolean = isSystemInDarkTheme(),