💄 Updates theme
This commit is contained in:
parent
0c4b039e10
commit
d1ddd7be3b
@ -2,10 +2,74 @@ package dev.svitan.antifed.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
val Purple80 = Color(0xFFD0BCFF)
|
||||
val PurpleGrey80 = Color(0xFFCCC2DC)
|
||||
val Pink80 = Color(0xFFEFB8C8)
|
||||
val primaryLight = Color(0xFF5C5891)
|
||||
val onPrimaryLight = Color(0xFFFFFFFF)
|
||||
val primaryContainerLight = Color(0xFFE4DFFF)
|
||||
val onPrimaryContainerLight = Color(0xFF444078)
|
||||
val secondaryLight = Color(0xFF5E5C71)
|
||||
val onSecondaryLight = Color(0xFFFFFFFF)
|
||||
val secondaryContainerLight = Color(0xFFE4DFF9)
|
||||
val onSecondaryContainerLight = Color(0xFF474559)
|
||||
val tertiaryLight = Color(0xFF7B5266)
|
||||
val onTertiaryLight = Color(0xFFFFFFFF)
|
||||
val tertiaryContainerLight = Color(0xFFFFD8E9)
|
||||
val onTertiaryContainerLight = Color(0xFF613B4E)
|
||||
val errorLight = Color(0xFFBA1A1A)
|
||||
val onErrorLight = Color(0xFFFFFFFF)
|
||||
val errorContainerLight = Color(0xFFFFDAD6)
|
||||
val onErrorContainerLight = Color(0xFF93000A)
|
||||
val backgroundLight = Color(0xFFFCF8FF)
|
||||
val onBackgroundLight = Color(0xFF1C1B20)
|
||||
val surfaceLight = Color(0xFFFCF8FF)
|
||||
val onSurfaceLight = Color(0xFF1C1B20)
|
||||
val surfaceVariantLight = Color(0xFFE5E1EC)
|
||||
val onSurfaceVariantLight = Color(0xFF47464F)
|
||||
val outlineLight = Color(0xFF787680)
|
||||
val outlineVariantLight = Color(0xFFC8C5D0)
|
||||
val scrimLight = Color(0xFF000000)
|
||||
val inverseSurfaceLight = Color(0xFF313036)
|
||||
val inverseOnSurfaceLight = Color(0xFFF3EFF7)
|
||||
val inversePrimaryLight = Color(0xFFC5C0FF)
|
||||
val surfaceDimLight = Color(0xFFDCD8E0)
|
||||
val surfaceBrightLight = Color(0xFFFCF8FF)
|
||||
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
|
||||
val surfaceContainerLowLight = Color(0xFFF6F2FA)
|
||||
val surfaceContainerLight = Color(0xFFF0ECF4)
|
||||
val surfaceContainerHighLight = Color(0xFFEBE7EF)
|
||||
val surfaceContainerHighestLight = Color(0xFFE5E1E9)
|
||||
|
||||
val Purple40 = Color(0xFF6650a4)
|
||||
val PurpleGrey40 = Color(0xFF625b71)
|
||||
val Pink40 = Color(0xFF7D5260)
|
||||
val primaryDark = Color(0xFFC5C0FF)
|
||||
val onPrimaryDark = Color(0xFF2E2960)
|
||||
val primaryContainerDark = Color(0xFF444078)
|
||||
val onPrimaryContainerDark = Color(0xFFE4DFFF)
|
||||
val secondaryDark = Color(0xFFC8C4DC)
|
||||
val onSecondaryDark = Color(0xFF302E41)
|
||||
val secondaryContainerDark = Color(0xFF474559)
|
||||
val onSecondaryContainerDark = Color(0xFFE4DFF9)
|
||||
val tertiaryDark = Color(0xFFEBB8D0)
|
||||
val onTertiaryDark = Color(0xFF472538)
|
||||
val tertiaryContainerDark = Color(0xFF613B4E)
|
||||
val onTertiaryContainerDark = Color(0xFFFFD8E9)
|
||||
val errorDark = Color(0xFFFFB4AB)
|
||||
val onErrorDark = Color(0xFF690005)
|
||||
val errorContainerDark = Color(0xFF93000A)
|
||||
val onErrorContainerDark = Color(0xFFFFDAD6)
|
||||
val backgroundDark = Color(0xFF131318)
|
||||
val onBackgroundDark = Color(0xFFE5E1E9)
|
||||
val surfaceDark = Color(0xFF131318)
|
||||
val onSurfaceDark = Color(0xFFE5E1E9)
|
||||
val surfaceVariantDark = Color(0xFF47464F)
|
||||
val onSurfaceVariantDark = Color(0xFFC8C5D0)
|
||||
val outlineDark = Color(0xFF928F99)
|
||||
val outlineVariantDark = Color(0xFF47464F)
|
||||
val scrimDark = Color(0xFF000000)
|
||||
val inverseSurfaceDark = Color(0xFFE5E1E9)
|
||||
val inverseOnSurfaceDark = Color(0xFF313036)
|
||||
val inversePrimaryDark = Color(0xFF5C5891)
|
||||
val surfaceDimDark = Color(0xFF131318)
|
||||
val surfaceBrightDark = Color(0xFF3A383F)
|
||||
val surfaceContainerLowestDark = Color(0xFF0E0E13)
|
||||
val surfaceContainerLowDark = Color(0xFF1C1B20)
|
||||
val surfaceContainerDark = Color(0xFF201F25)
|
||||
val surfaceContainerHighDark = Color(0xFF2A292F)
|
||||
val surfaceContainerHighestDark = Color(0xFF35343A)
|
||||
|
@ -9,26 +9,80 @@ import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = Purple80,
|
||||
secondary = PurpleGrey80,
|
||||
tertiary = Pink80
|
||||
private val lightScheme = lightColorScheme(
|
||||
primary = primaryLight,
|
||||
onPrimary = onPrimaryLight,
|
||||
primaryContainer = primaryContainerLight,
|
||||
onPrimaryContainer = onPrimaryContainerLight,
|
||||
secondary = secondaryLight,
|
||||
onSecondary = onSecondaryLight,
|
||||
secondaryContainer = secondaryContainerLight,
|
||||
onSecondaryContainer = onSecondaryContainerLight,
|
||||
tertiary = tertiaryLight,
|
||||
onTertiary = onTertiaryLight,
|
||||
tertiaryContainer = tertiaryContainerLight,
|
||||
onTertiaryContainer = onTertiaryContainerLight,
|
||||
error = errorLight,
|
||||
onError = onErrorLight,
|
||||
errorContainer = errorContainerLight,
|
||||
onErrorContainer = onErrorContainerLight,
|
||||
background = backgroundLight,
|
||||
onBackground = onBackgroundLight,
|
||||
surface = surfaceLight,
|
||||
onSurface = onSurfaceLight,
|
||||
surfaceVariant = surfaceVariantLight,
|
||||
onSurfaceVariant = onSurfaceVariantLight,
|
||||
outline = outlineLight,
|
||||
outlineVariant = outlineVariantLight,
|
||||
scrim = scrimLight,
|
||||
inverseSurface = inverseSurfaceLight,
|
||||
inverseOnSurface = inverseOnSurfaceLight,
|
||||
inversePrimary = inversePrimaryLight,
|
||||
surfaceDim = surfaceDimLight,
|
||||
surfaceBright = surfaceBrightLight,
|
||||
surfaceContainerLowest = surfaceContainerLowestLight,
|
||||
surfaceContainerLow = surfaceContainerLowLight,
|
||||
surfaceContainer = surfaceContainerLight,
|
||||
surfaceContainerHigh = surfaceContainerHighLight,
|
||||
surfaceContainerHighest = surfaceContainerHighestLight,
|
||||
)
|
||||
|
||||
private val LightColorScheme = lightColorScheme(
|
||||
primary = Purple40,
|
||||
secondary = PurpleGrey40,
|
||||
tertiary = Pink40
|
||||
|
||||
/* Other default colors to override
|
||||
background = Color(0xFFFFFBFE),
|
||||
surface = Color(0xFFFFFBFE),
|
||||
onPrimary = Color.White,
|
||||
onSecondary = Color.White,
|
||||
onTertiary = Color.White,
|
||||
onBackground = Color(0xFF1C1B1F),
|
||||
onSurface = Color(0xFF1C1B1F),
|
||||
*/
|
||||
private val darkScheme = darkColorScheme(
|
||||
primary = primaryDark,
|
||||
onPrimary = onPrimaryDark,
|
||||
primaryContainer = primaryContainerDark,
|
||||
onPrimaryContainer = onPrimaryContainerDark,
|
||||
secondary = secondaryDark,
|
||||
onSecondary = onSecondaryDark,
|
||||
secondaryContainer = secondaryContainerDark,
|
||||
onSecondaryContainer = onSecondaryContainerDark,
|
||||
tertiary = tertiaryDark,
|
||||
onTertiary = onTertiaryDark,
|
||||
tertiaryContainer = tertiaryContainerDark,
|
||||
onTertiaryContainer = onTertiaryContainerDark,
|
||||
error = errorDark,
|
||||
onError = onErrorDark,
|
||||
errorContainer = errorContainerDark,
|
||||
onErrorContainer = onErrorContainerDark,
|
||||
background = backgroundDark,
|
||||
onBackground = onBackgroundDark,
|
||||
surface = surfaceDark,
|
||||
onSurface = onSurfaceDark,
|
||||
surfaceVariant = surfaceVariantDark,
|
||||
onSurfaceVariant = onSurfaceVariantDark,
|
||||
outline = outlineDark,
|
||||
outlineVariant = outlineVariantDark,
|
||||
scrim = scrimDark,
|
||||
inverseSurface = inverseSurfaceDark,
|
||||
inverseOnSurface = inverseOnSurfaceDark,
|
||||
inversePrimary = inversePrimaryDark,
|
||||
surfaceDim = surfaceDimDark,
|
||||
surfaceBright = surfaceBrightDark,
|
||||
surfaceContainerLowest = surfaceContainerLowestDark,
|
||||
surfaceContainerLow = surfaceContainerLowDark,
|
||||
surfaceContainer = surfaceContainerDark,
|
||||
surfaceContainerHigh = surfaceContainerHighDark,
|
||||
surfaceContainerHighest = surfaceContainerHighestDark,
|
||||
)
|
||||
|
||||
@Composable
|
||||
@ -44,8 +98,8 @@ fun AntiFedTheme(
|
||||
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||
}
|
||||
|
||||
darkTheme -> DarkColorScheme
|
||||
else -> LightColorScheme
|
||||
darkTheme -> darkScheme
|
||||
else -> lightScheme
|
||||
}
|
||||
|
||||
MaterialTheme(
|
||||
|
Loading…
x
Reference in New Issue
Block a user