mat.mey/CleverClass
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
matthias
2024-04-24 21:52:11 +02:00
parent 1012287c4c 98b68d2d70
commit f2779cb442
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt
View File

@@ -4,11 +4,14 @@ import androidx.compose.ui.graphics.Color
val Black100 = Color(0xFF000000) val Black100 = Color(0xFF000000)
val Black90 = Color(0xFF1F1F1F) val Black90 = Color(0xFF1F1F1F)
val Black70 = Color(0xFF333333) val Black80 = Color(0xFF333333)
val Black70 = Color(0xFF4B4B4B)
val White100 = Color(0xFFFFFFFF) val White100 = Color(0xFFFFFFFF)
val White90 = Color(0xFFEBEBEB) val White90 = Color(0xFFEBEBEB)
val White70 = Color(0xFFD3D3D3) val White80 = Color(0xFFD3D3D3)
val White70 = Color(0xFFBBBBBB)
val TextOnColouredButton = Color(0xFF121212) val TextOnColouredButton = Color(0xFF121212)
val MiddleColor = Color(0xFF808080) val MiddleColor = Color(0xFF808080)
@@ -16,4 +19,7 @@ val MiddleColor = Color(0xFF808080)
val dismissLight = Color(0xFF536DFE) val dismissLight = Color(0xFF536DFE)
val dismissDark = Color(0xFF448AFF) val dismissDark = Color(0xFF448AFF)
val InputPrimaryColor = Color(0xFF3F57E0)
val InputSecondaryColor = Color(0x7E4154FF)
val testColor = Color(0xFF00FF00) val testColor = Color(0xFF00FF00)

12
app/src/main/java/com/schoolapp/cleverclass/ui/theme/Theme.kt
View File

@@ -18,21 +18,23 @@ import androidx.core.view.WindowCompat
private val DarkColorScheme = darkColorScheme( private val DarkColorScheme = darkColorScheme(
background = Black90, background = Black90,
primaryContainer = Black70, primaryContainer = Black80,
secondaryContainer = Black70,
onPrimaryContainer = White100, onPrimaryContainer = White100,
secondary = dismissDark, secondary = dismissDark,
onBackground = White100, onBackground = White100,
outlineVariant = Black70, outlineVariant = Black80,
primary = Color(0xFF536DFE) primary = Color(0xFF536DFE)
) )
private val LightColorScheme = lightColorScheme( private val LightColorScheme = lightColorScheme(
background = White90, background = White90,
primaryContainer = White70, primaryContainer = White80,
secondaryContainer = White70,
onPrimaryContainer = Black100, onPrimaryContainer = Black100,
secondary = dismissLight, secondary = dismissLight,
onBackground = Black100, onBackground = Black100,
outlineVariant = White70, outlineVariant = White80,
primary = Color(0xFF8396FF) primary = Color(0xFF8396FF)
) )
@@ -56,7 +58,7 @@ fun CleverClassTheme(
if (!view.isInEditMode) { if (!view.isInEditMode) {
SideEffect { SideEffect {
val window = (view.context as Activity).window val window = (view.context as Activity).window
window.statusBarColor = Black70.toArgb() window.statusBarColor = Black80.toArgb()
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
} }
} }