Update app theme
This commit is contained in:
parent
f2b5bff669
commit
3a093b60b4
3 changed files with 322 additions and 165 deletions
|
|
@ -2,37 +2,218 @@ package ing.bikeshedengineer.debtpirate.theme
|
||||||
|
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
|
||||||
val primary = Color(0xFF86D6BF)
|
val primaryLight = Color(0xFF306388)
|
||||||
val onPrimary = Color(0xFF00382D)
|
val onPrimaryLight = Color(0xFFFFFFFF)
|
||||||
val primaryContainer = Color(0xFF005142)
|
val primaryContainerLight = Color(0xFF79A9D1)
|
||||||
val onPrimaryContainer = Color(0xFFA2F2DA)
|
val onPrimaryContainerLight = Color(0xFF001B2C)
|
||||||
val secondary = Color(0xFF9CCBFB)
|
val secondaryLight = Color(0xFF4F6070)
|
||||||
val onSecondary = Color(0xFF003354)
|
val onSecondaryLight = Color(0xFFFFFFFF)
|
||||||
val secondaryContainer = Color(0xFF104A73)
|
val secondaryContainerLight = Color(0xFFD7E9FC)
|
||||||
val onSecondaryContainer = Color(0xFFCEE5FF)
|
val onSecondaryContainerLight = Color(0xFF3B4C5C)
|
||||||
val tertiary = Color(0xFF98D5A4)
|
val tertiaryLight = Color(0xFF493675)
|
||||||
val onTertiary = Color(0xFF00391A)
|
val onTertiaryLight = Color(0xFFFFFFFF)
|
||||||
val tertiaryContainer = Color(0xFF16512C)
|
val tertiaryContainerLight = Color(0xFF6D5A9B)
|
||||||
val onTertiaryContainer = Color(0xFFB3F1BF)
|
val onTertiaryContainerLight = Color(0xFFFFFFFF)
|
||||||
val error = Color(0xFFFFB4A9)
|
val errorLight = Color(0xFF9C0040)
|
||||||
val onError = Color(0xFF561E17)
|
val onErrorLight = Color(0xFFFFFFFF)
|
||||||
val errorContainer = Color(0xFF73342B)
|
val errorContainerLight = Color(0xFFDA1B61)
|
||||||
val onErrorContainer = Color(0xFFFFDAD5)
|
val onErrorContainerLight = Color(0xFFFFFFFF)
|
||||||
val background = Color(0xFF101418)
|
val backgroundLight = Color(0xFFF9F9FC)
|
||||||
val onBackground = Color(0xFFE0E2E8)
|
val onBackgroundLight = Color(0xFF191C1E)
|
||||||
val surface = Color(0xFF101418)
|
val surfaceLight = Color(0xFFFBF9F8)
|
||||||
val onSurface = Color(0xFFE0E2E8)
|
val onSurfaceLight = Color(0xFF1B1C1C)
|
||||||
val surfaceVariant = Color(0xFF42474E)
|
val surfaceVariantLight = Color(0xFFDFE3E4)
|
||||||
val onSurfaceVariant = Color(0xFFC2C7CF)
|
val onSurfaceVariantLight = Color(0xFF434848)
|
||||||
val outline = Color(0xFF8C9199)
|
val outlineLight = Color(0xFF737879)
|
||||||
val outlineVariant = Color(0xFF42474E)
|
val outlineVariantLight = Color(0xFFC3C7C8)
|
||||||
val scrim = Color(0xFF000000)
|
val scrimLight = Color(0xFF000000)
|
||||||
val inverseSurface = Color(0xFFE0E2E8)
|
val inverseSurfaceLight = Color(0xFF303030)
|
||||||
val inverseOnSurface = Color(0xFF2D3135)
|
val inverseOnSurfaceLight = Color(0xFFF2F0F0)
|
||||||
val surfaceDim = Color(0xFF101418)
|
val inversePrimaryLight = Color(0xFF9BCCF6)
|
||||||
val surfaceBright = Color(0xFF36393E)
|
val surfaceDimLight = Color(0xFFDBD9D9)
|
||||||
val surfaceContainerLowest = Color(0xFF0B0E12)
|
val surfaceBrightLight = Color(0xFFFBF9F8)
|
||||||
val surfaceContainerLow = Color(0xFF181C20)
|
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
|
||||||
val surfaceContainer = Color(0xFF1C2024)
|
val surfaceContainerLowLight = Color(0xFFF5F3F3)
|
||||||
val surfaceContainerHigh = Color(0xFF272A2F)
|
val surfaceContainerLight = Color(0xFFEFEDED)
|
||||||
val surfaceContainerHighest = Color(0xFF323539)
|
val surfaceContainerHighLight = Color(0xFFEAE8E7)
|
||||||
|
val surfaceContainerHighestLight = Color(0xFFE4E2E1)
|
||||||
|
|
||||||
|
val primaryLightMediumContrast = Color(0xFF08476A)
|
||||||
|
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val primaryContainerLightMediumContrast = Color(0xFF48799F)
|
||||||
|
val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val secondaryLightMediumContrast = Color(0xFF344554)
|
||||||
|
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val secondaryContainerLightMediumContrast = Color(0xFF657687)
|
||||||
|
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val tertiaryLightMediumContrast = Color(0xFF493675)
|
||||||
|
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val tertiaryContainerLightMediumContrast = Color(0xFF6D5A9B)
|
||||||
|
val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val errorLightMediumContrast = Color(0xFF890038)
|
||||||
|
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val errorContainerLightMediumContrast = Color(0xFFDA1B61)
|
||||||
|
val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val backgroundLightMediumContrast = Color(0xFFF9F9FC)
|
||||||
|
val onBackgroundLightMediumContrast = Color(0xFF191C1E)
|
||||||
|
val surfaceLightMediumContrast = Color(0xFFFBF9F8)
|
||||||
|
val onSurfaceLightMediumContrast = Color(0xFF1B1C1C)
|
||||||
|
val surfaceVariantLightMediumContrast = Color(0xFFDFE3E4)
|
||||||
|
val onSurfaceVariantLightMediumContrast = Color(0xFF3F4444)
|
||||||
|
val outlineLightMediumContrast = Color(0xFF5B6061)
|
||||||
|
val outlineVariantLightMediumContrast = Color(0xFF777C7C)
|
||||||
|
val scrimLightMediumContrast = Color(0xFF000000)
|
||||||
|
val inverseSurfaceLightMediumContrast = Color(0xFF303030)
|
||||||
|
val inverseOnSurfaceLightMediumContrast = Color(0xFFF2F0F0)
|
||||||
|
val inversePrimaryLightMediumContrast = Color(0xFF9BCCF6)
|
||||||
|
val surfaceDimLightMediumContrast = Color(0xFFDBD9D9)
|
||||||
|
val surfaceBrightLightMediumContrast = Color(0xFFFBF9F8)
|
||||||
|
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
|
||||||
|
val surfaceContainerLowLightMediumContrast = Color(0xFFF5F3F3)
|
||||||
|
val surfaceContainerLightMediumContrast = Color(0xFFEFEDED)
|
||||||
|
val surfaceContainerHighLightMediumContrast = Color(0xFFEAE8E7)
|
||||||
|
val surfaceContainerHighestLightMediumContrast = Color(0xFFE4E2E1)
|
||||||
|
|
||||||
|
val primaryLightHighContrast = Color(0xFF00253B)
|
||||||
|
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val primaryContainerLightHighContrast = Color(0xFF08476A)
|
||||||
|
val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val secondaryLightHighContrast = Color(0xFF122432)
|
||||||
|
val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val secondaryContainerLightHighContrast = Color(0xFF344554)
|
||||||
|
val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val tertiaryLightHighContrast = Color(0xFF291453)
|
||||||
|
val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val tertiaryContainerLightHighContrast = Color(0xFF4A3876)
|
||||||
|
val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val errorLightHighContrast = Color(0xFF4C001C)
|
||||||
|
val onErrorLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val errorContainerLightHighContrast = Color(0xFF890038)
|
||||||
|
val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val backgroundLightHighContrast = Color(0xFFF9F9FC)
|
||||||
|
val onBackgroundLightHighContrast = Color(0xFF191C1E)
|
||||||
|
val surfaceLightHighContrast = Color(0xFFFBF9F8)
|
||||||
|
val onSurfaceLightHighContrast = Color(0xFF000000)
|
||||||
|
val surfaceVariantLightHighContrast = Color(0xFFDFE3E4)
|
||||||
|
val onSurfaceVariantLightHighContrast = Color(0xFF202526)
|
||||||
|
val outlineLightHighContrast = Color(0xFF3F4444)
|
||||||
|
val outlineVariantLightHighContrast = Color(0xFF3F4444)
|
||||||
|
val scrimLightHighContrast = Color(0xFF000000)
|
||||||
|
val inverseSurfaceLightHighContrast = Color(0xFF303030)
|
||||||
|
val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val inversePrimaryLightHighContrast = Color(0xFFDEEEFF)
|
||||||
|
val surfaceDimLightHighContrast = Color(0xFFDBD9D9)
|
||||||
|
val surfaceBrightLightHighContrast = Color(0xFFFBF9F8)
|
||||||
|
val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val surfaceContainerLowLightHighContrast = Color(0xFFF5F3F3)
|
||||||
|
val surfaceContainerLightHighContrast = Color(0xFFEFEDED)
|
||||||
|
val surfaceContainerHighLightHighContrast = Color(0xFFEAE8E7)
|
||||||
|
val surfaceContainerHighestLightHighContrast = Color(0xFFE4E2E1)
|
||||||
|
|
||||||
|
val primaryDark = Color(0xFF9BCCF6)
|
||||||
|
val onPrimaryDark = Color(0xFF003350)
|
||||||
|
val primaryContainerDark = Color(0xFF6595BD)
|
||||||
|
val onPrimaryContainerDark = Color(0xFF000000)
|
||||||
|
val secondaryDark = Color(0xFFB7C9DB)
|
||||||
|
val onSecondaryDark = Color(0xFF213240)
|
||||||
|
val secondaryContainerDark = Color(0xFF304150)
|
||||||
|
val onSecondaryContainerDark = Color(0xFFC4D6E9)
|
||||||
|
val tertiaryDark = Color(0xFFD1BCFF)
|
||||||
|
val onTertiaryDark = Color(0xFF372462)
|
||||||
|
val tertiaryContainerDark = Color(0xFF544281)
|
||||||
|
val onTertiaryContainerDark = Color(0xFFF0E6FF)
|
||||||
|
val errorDark = Color(0xFFFFB1BF)
|
||||||
|
val onErrorDark = Color(0xFF660028)
|
||||||
|
val errorContainerDark = Color(0xFFCE0B59)
|
||||||
|
val onErrorContainerDark = Color(0xFFFFFFFF)
|
||||||
|
val backgroundDark = Color(0xFF111416)
|
||||||
|
val onBackgroundDark = Color(0xFFE2E2E6)
|
||||||
|
val surfaceDark = Color(0xFF131313)
|
||||||
|
val onSurfaceDark = Color(0xFFE4E2E1)
|
||||||
|
val surfaceVariantDark = Color(0xFF434848)
|
||||||
|
val onSurfaceVariantDark = Color(0xFFC3C7C8)
|
||||||
|
val outlineDark = Color(0xFF8D9292)
|
||||||
|
val outlineVariantDark = Color(0xFF434848)
|
||||||
|
val scrimDark = Color(0xFF000000)
|
||||||
|
val inverseSurfaceDark = Color(0xFFE4E2E1)
|
||||||
|
val inverseOnSurfaceDark = Color(0xFF303030)
|
||||||
|
val inversePrimaryDark = Color(0xFF306388)
|
||||||
|
val surfaceDimDark = Color(0xFF131313)
|
||||||
|
val surfaceBrightDark = Color(0xFF393939)
|
||||||
|
val surfaceContainerLowestDark = Color(0xFF0E0E0E)
|
||||||
|
val surfaceContainerLowDark = Color(0xFF1B1C1C)
|
||||||
|
val surfaceContainerDark = Color(0xFF1F2020)
|
||||||
|
val surfaceContainerHighDark = Color(0xFF2A2A2A)
|
||||||
|
val surfaceContainerHighestDark = Color(0xFF343535)
|
||||||
|
|
||||||
|
val primaryDarkMediumContrast = Color(0xFFA0D0FA)
|
||||||
|
val onPrimaryDarkMediumContrast = Color(0xFF001829)
|
||||||
|
val primaryContainerDarkMediumContrast = Color(0xFF6595BD)
|
||||||
|
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
|
||||||
|
val secondaryDarkMediumContrast = Color(0xFFBBCDDF)
|
||||||
|
val onSecondaryDarkMediumContrast = Color(0xFF051825)
|
||||||
|
val secondaryContainerDarkMediumContrast = Color(0xFF8193A4)
|
||||||
|
val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
|
||||||
|
val tertiaryDarkMediumContrast = Color(0xFFD4C1FF)
|
||||||
|
val onTertiaryDarkMediumContrast = Color(0xFF1C0547)
|
||||||
|
val tertiaryContainerDarkMediumContrast = Color(0xFF9A86CA)
|
||||||
|
val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
|
||||||
|
val errorDarkMediumContrast = Color(0xFFFFB8C4)
|
||||||
|
val onErrorDarkMediumContrast = Color(0xFF360011)
|
||||||
|
val errorContainerDarkMediumContrast = Color(0xFFFF4D81)
|
||||||
|
val onErrorContainerDarkMediumContrast = Color(0xFF000000)
|
||||||
|
val backgroundDarkMediumContrast = Color(0xFF111416)
|
||||||
|
val onBackgroundDarkMediumContrast = Color(0xFFE2E2E6)
|
||||||
|
val surfaceDarkMediumContrast = Color(0xFF131313)
|
||||||
|
val onSurfaceDarkMediumContrast = Color(0xFFFCFAFA)
|
||||||
|
val surfaceVariantDarkMediumContrast = Color(0xFF434848)
|
||||||
|
val onSurfaceVariantDarkMediumContrast = Color(0xFFC7CBCC)
|
||||||
|
val outlineDarkMediumContrast = Color(0xFF9FA4A4)
|
||||||
|
val outlineVariantDarkMediumContrast = Color(0xFF7F8485)
|
||||||
|
val scrimDarkMediumContrast = Color(0xFF000000)
|
||||||
|
val inverseSurfaceDarkMediumContrast = Color(0xFFE4E2E1)
|
||||||
|
val inverseOnSurfaceDarkMediumContrast = Color(0xFF2A2A2A)
|
||||||
|
val inversePrimaryDarkMediumContrast = Color(0xFF124C70)
|
||||||
|
val surfaceDimDarkMediumContrast = Color(0xFF131313)
|
||||||
|
val surfaceBrightDarkMediumContrast = Color(0xFF393939)
|
||||||
|
val surfaceContainerLowestDarkMediumContrast = Color(0xFF0E0E0E)
|
||||||
|
val surfaceContainerLowDarkMediumContrast = Color(0xFF1B1C1C)
|
||||||
|
val surfaceContainerDarkMediumContrast = Color(0xFF1F2020)
|
||||||
|
val surfaceContainerHighDarkMediumContrast = Color(0xFF2A2A2A)
|
||||||
|
val surfaceContainerHighestDarkMediumContrast = Color(0xFF343535)
|
||||||
|
|
||||||
|
val primaryDarkHighContrast = Color(0xFFF9FBFF)
|
||||||
|
val onPrimaryDarkHighContrast = Color(0xFF000000)
|
||||||
|
val primaryContainerDarkHighContrast = Color(0xFFA0D0FA)
|
||||||
|
val onPrimaryContainerDarkHighContrast = Color(0xFF000000)
|
||||||
|
val secondaryDarkHighContrast = Color(0xFFF9FBFF)
|
||||||
|
val onSecondaryDarkHighContrast = Color(0xFF000000)
|
||||||
|
val secondaryContainerDarkHighContrast = Color(0xFFBBCDDF)
|
||||||
|
val onSecondaryContainerDarkHighContrast = Color(0xFF000000)
|
||||||
|
val tertiaryDarkHighContrast = Color(0xFFFFF9FF)
|
||||||
|
val onTertiaryDarkHighContrast = Color(0xFF000000)
|
||||||
|
val tertiaryContainerDarkHighContrast = Color(0xFFD4C1FF)
|
||||||
|
val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
|
||||||
|
val errorDarkHighContrast = Color(0xFFFFF9F9)
|
||||||
|
val onErrorDarkHighContrast = Color(0xFF000000)
|
||||||
|
val errorContainerDarkHighContrast = Color(0xFFFFB8C4)
|
||||||
|
val onErrorContainerDarkHighContrast = Color(0xFF000000)
|
||||||
|
val backgroundDarkHighContrast = Color(0xFF111416)
|
||||||
|
val onBackgroundDarkHighContrast = Color(0xFFE2E2E6)
|
||||||
|
val surfaceDarkHighContrast = Color(0xFF131313)
|
||||||
|
val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
|
||||||
|
val surfaceVariantDarkHighContrast = Color(0xFF434848)
|
||||||
|
val onSurfaceVariantDarkHighContrast = Color(0xFFF7FBFC)
|
||||||
|
val outlineDarkHighContrast = Color(0xFFC7CBCC)
|
||||||
|
val outlineVariantDarkHighContrast = Color(0xFFC7CBCC)
|
||||||
|
val scrimDarkHighContrast = Color(0xFF000000)
|
||||||
|
val inverseSurfaceDarkHighContrast = Color(0xFFE4E2E1)
|
||||||
|
val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
|
||||||
|
val inversePrimaryDarkHighContrast = Color(0xFF002D47)
|
||||||
|
val surfaceDimDarkHighContrast = Color(0xFF131313)
|
||||||
|
val surfaceBrightDarkHighContrast = Color(0xFF393939)
|
||||||
|
val surfaceContainerLowestDarkHighContrast = Color(0xFF0E0E0E)
|
||||||
|
val surfaceContainerLowDarkHighContrast = Color(0xFF1B1C1C)
|
||||||
|
val surfaceContainerDarkHighContrast = Color(0xFF1F2020)
|
||||||
|
val surfaceContainerHighDarkHighContrast = Color(0xFF2A2A2A)
|
||||||
|
val surfaceContainerHighestDarkHighContrast = Color(0xFF343535)
|
||||||
|
|
@ -3,51 +3,104 @@ package ing.bikeshedengineer.debtpirate.theme
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
import androidx.compose.foundation.isSystemInDarkTheme
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.darkColorScheme
|
import androidx.compose.material3.darkColorScheme
|
||||||
|
import androidx.compose.material3.dynamicDarkColorScheme
|
||||||
|
import androidx.compose.material3.dynamicLightColorScheme
|
||||||
|
import androidx.compose.material3.lightColorScheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
|
||||||
|
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 darkScheme = darkColorScheme(
|
private val darkScheme = darkColorScheme(
|
||||||
primary = primary,
|
primary = primaryDark,
|
||||||
onPrimary = onPrimary,
|
onPrimary = onPrimaryDark,
|
||||||
primaryContainer = primaryContainer,
|
primaryContainer = primaryContainerDark,
|
||||||
onPrimaryContainer = onPrimaryContainer,
|
onPrimaryContainer = onPrimaryContainerDark,
|
||||||
secondary = secondary,
|
secondary = secondaryDark,
|
||||||
onSecondary = onSecondary,
|
onSecondary = onSecondaryDark,
|
||||||
secondaryContainer = secondaryContainer,
|
secondaryContainer = secondaryContainerDark,
|
||||||
onSecondaryContainer = onSecondaryContainer,
|
onSecondaryContainer = onSecondaryContainerDark,
|
||||||
tertiary = tertiary,
|
tertiary = tertiaryDark,
|
||||||
onTertiary = onTertiary,
|
onTertiary = onTertiaryDark,
|
||||||
tertiaryContainer = tertiaryContainer,
|
tertiaryContainer = tertiaryContainerDark,
|
||||||
onTertiaryContainer = onTertiaryContainer,
|
onTertiaryContainer = onTertiaryContainerDark,
|
||||||
error = error,
|
error = errorDark,
|
||||||
onError = onError,
|
onError = onErrorDark,
|
||||||
errorContainer = errorContainer,
|
errorContainer = errorContainerDark,
|
||||||
onErrorContainer = onErrorContainer,
|
onErrorContainer = onErrorContainerDark,
|
||||||
background = background,
|
background = backgroundDark,
|
||||||
onBackground = onBackground,
|
onBackground = onBackgroundDark,
|
||||||
surface = surface,
|
surface = surfaceDark,
|
||||||
onSurface = onSurface,
|
onSurface = onSurfaceDark,
|
||||||
surfaceVariant = surfaceVariant,
|
surfaceVariant = surfaceVariantDark,
|
||||||
onSurfaceVariant = onSurfaceVariant,
|
onSurfaceVariant = onSurfaceVariantDark,
|
||||||
outline = outline,
|
outline = outlineDark,
|
||||||
outlineVariant = outlineVariant,
|
outlineVariant = outlineVariantDark,
|
||||||
scrim = scrim,
|
scrim = scrimDark,
|
||||||
inverseSurface = inverseSurface,
|
inverseSurface = inverseSurfaceDark,
|
||||||
inverseOnSurface = inverseOnSurface,
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
surfaceDim = surfaceDim,
|
inversePrimary = inversePrimaryDark,
|
||||||
surfaceBright = surfaceBright,
|
surfaceDim = surfaceDimDark,
|
||||||
surfaceContainerLowest = surfaceContainerLowest,
|
surfaceBright = surfaceBrightDark,
|
||||||
surfaceContainerLow = surfaceContainerLow,
|
surfaceContainerLowest = surfaceContainerLowestDark,
|
||||||
surfaceContainer = surfaceContainer,
|
surfaceContainerLow = surfaceContainerLowDark,
|
||||||
surfaceContainerHigh = surfaceContainerHigh,
|
surfaceContainer = surfaceContainerDark,
|
||||||
surfaceContainerHighest = surfaceContainerHighest,
|
surfaceContainerHigh = surfaceContainerHighDark,
|
||||||
|
surfaceContainerHighest = surfaceContainerHighestDark,
|
||||||
)
|
)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DebtPirateTheme(
|
fun DebtPirateTheme(
|
||||||
darkTheme: Boolean = isSystemInDarkTheme(),
|
darkTheme: Boolean = isSystemInDarkTheme(),
|
||||||
|
// dynamicColor: Boolean = true,
|
||||||
content: @Composable() () -> Unit
|
content: @Composable() () -> Unit
|
||||||
) {
|
) {
|
||||||
val colorScheme = darkScheme
|
val colorScheme = when {
|
||||||
|
// dynamicColor -> {
|
||||||
|
// val context = LocalContext.current
|
||||||
|
// if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||||
|
// }
|
||||||
|
|
||||||
|
darkTheme -> darkScheme
|
||||||
|
else -> lightScheme
|
||||||
|
}
|
||||||
|
|
||||||
MaterialTheme(
|
MaterialTheme(
|
||||||
colorScheme = colorScheme,
|
colorScheme = colorScheme,
|
||||||
typography = Typography,
|
typography = Typography,
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,8 @@ package ing.bikeshedengineer.debtpirate.theme
|
||||||
|
|
||||||
import androidx.compose.material3.Typography
|
import androidx.compose.material3.Typography
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
import androidx.compose.ui.text.font.FontFamily
|
||||||
import androidx.compose.ui.text.font.FontStyle
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
|
||||||
import androidx.compose.ui.text.googlefonts.Font
|
import androidx.compose.ui.text.googlefonts.Font
|
||||||
import androidx.compose.ui.text.googlefonts.GoogleFont
|
import androidx.compose.ui.text.googlefonts.GoogleFont
|
||||||
import androidx.compose.ui.unit.TextUnit
|
|
||||||
import androidx.compose.ui.unit.TextUnitType
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import ing.bikeshedengineer.debtpirate.R
|
import ing.bikeshedengineer.debtpirate.R
|
||||||
|
|
||||||
val googleFontsProvider = GoogleFont.Provider(
|
val googleFontsProvider = GoogleFont.Provider(
|
||||||
|
|
@ -17,107 +12,35 @@ val googleFontsProvider = GoogleFont.Provider(
|
||||||
certificates = R.array.com_google_android_gms_fonts_certs
|
certificates = R.array.com_google_android_gms_fonts_certs
|
||||||
)
|
)
|
||||||
|
|
||||||
val robotoCondensedFontName = GoogleFont("Roboto Condensed")
|
val bodyFontFamily = FontFamily(
|
||||||
val robotoCondensedFontFamily = FontFamily(
|
|
||||||
Font(
|
Font(
|
||||||
googleFont = robotoCondensedFontName,
|
googleFont = GoogleFont("Roboto Condensed"),
|
||||||
fontProvider = googleFontsProvider,
|
fontProvider = googleFontsProvider,
|
||||||
weight = FontWeight.Light,
|
|
||||||
style = FontStyle.Normal
|
|
||||||
),
|
|
||||||
Font(
|
|
||||||
googleFont = robotoCondensedFontName,
|
|
||||||
fontProvider = googleFontsProvider,
|
|
||||||
weight = FontWeight.Normal,
|
|
||||||
style = FontStyle.Normal
|
|
||||||
),
|
|
||||||
Font(
|
|
||||||
googleFont = robotoCondensedFontName,
|
|
||||||
fontProvider = googleFontsProvider,
|
|
||||||
weight = FontWeight.Medium,
|
|
||||||
style = FontStyle.Normal
|
|
||||||
),
|
|
||||||
Font(
|
|
||||||
googleFont = robotoCondensedFontName,
|
|
||||||
fontProvider = googleFontsProvider,
|
|
||||||
weight = FontWeight.Bold,
|
|
||||||
style = FontStyle.Normal
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
val eczarFontName = GoogleFont("Eczar")
|
val displayFontFamily = FontFamily(
|
||||||
val eczarFontFamily = FontFamily(
|
|
||||||
Font(
|
Font(
|
||||||
googleFont = eczarFontName,
|
googleFont = GoogleFont("Eczar"),
|
||||||
fontProvider = googleFontsProvider,
|
fontProvider = googleFontsProvider,
|
||||||
weight = FontWeight.Normal,
|
|
||||||
style = FontStyle.Normal
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
val baseline = Typography()
|
val baseline = Typography()
|
||||||
|
|
||||||
// Set of Material typography styles to start with
|
|
||||||
val Typography = Typography(
|
val Typography = Typography(
|
||||||
displayLarge = baseline.displayLarge.copy(
|
displayLarge = baseline.displayLarge.copy(fontFamily = displayFontFamily),
|
||||||
fontFamily = robotoCondensedFontFamily,
|
displayMedium = baseline.displayMedium.copy(fontFamily = displayFontFamily),
|
||||||
fontWeight = FontWeight.Light
|
displaySmall = baseline.displaySmall.copy(fontFamily = displayFontFamily),
|
||||||
),
|
headlineLarge = baseline.headlineLarge.copy(fontFamily = displayFontFamily),
|
||||||
displayMedium = baseline.displayMedium.copy(
|
headlineMedium = baseline.headlineMedium.copy(fontFamily = displayFontFamily),
|
||||||
fontFamily = robotoCondensedFontFamily,
|
headlineSmall = baseline.headlineSmall.copy(fontFamily = displayFontFamily),
|
||||||
fontWeight = FontWeight.Light
|
titleLarge = baseline.titleLarge.copy(fontFamily = displayFontFamily),
|
||||||
),
|
titleMedium = baseline.titleMedium.copy(fontFamily = displayFontFamily),
|
||||||
displaySmall = baseline.displaySmall.copy(
|
titleSmall = baseline.titleSmall.copy(fontFamily = displayFontFamily),
|
||||||
fontFamily = robotoCondensedFontFamily,
|
bodyLarge = baseline.bodyLarge.copy(fontFamily = bodyFontFamily),
|
||||||
fontWeight = FontWeight.Light
|
bodyMedium = baseline.bodyMedium.copy(fontFamily = bodyFontFamily),
|
||||||
),
|
bodySmall = baseline.bodySmall.copy(fontFamily = bodyFontFamily),
|
||||||
headlineLarge = baseline.headlineLarge.copy(
|
labelLarge = baseline.labelLarge.copy(fontFamily = bodyFontFamily),
|
||||||
fontFamily = eczarFontFamily,
|
labelMedium = baseline.labelMedium.copy(fontFamily = bodyFontFamily),
|
||||||
fontWeight = FontWeight.Bold
|
labelSmall = baseline.labelSmall.copy(fontFamily = bodyFontFamily),
|
||||||
),
|
|
||||||
headlineMedium = baseline.headlineMedium.copy(
|
|
||||||
fontFamily = eczarFontFamily,
|
|
||||||
fontWeight = FontWeight.Bold
|
|
||||||
),
|
|
||||||
headlineSmall = baseline.headlineSmall.copy(
|
|
||||||
fontFamily = eczarFontFamily,
|
|
||||||
fontWeight = FontWeight.Bold
|
|
||||||
),
|
|
||||||
titleLarge = baseline.titleLarge.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal,
|
|
||||||
letterSpacing = 0.8F.sp
|
|
||||||
),
|
|
||||||
titleMedium = baseline.titleMedium.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal
|
|
||||||
),
|
|
||||||
titleSmall = baseline.titleSmall.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal
|
|
||||||
),
|
|
||||||
bodyLarge = baseline.bodyLarge.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal
|
|
||||||
),
|
|
||||||
bodyMedium = baseline.bodyMedium.copy(
|
|
||||||
fontFamily = eczarFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal
|
|
||||||
),
|
|
||||||
bodySmall = baseline.bodySmall.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Light
|
|
||||||
),
|
|
||||||
labelLarge = baseline.labelLarge.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Bold
|
|
||||||
),
|
|
||||||
labelMedium = baseline.labelMedium.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal
|
|
||||||
),
|
|
||||||
labelSmall = baseline.labelSmall.copy(
|
|
||||||
fontFamily = robotoCondensedFontFamily,
|
|
||||||
fontWeight = FontWeight.Normal
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
Loading…
Add table
Reference in a new issue