diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt index c7d60b3a0..0feef2b29 100644 --- a/app/src/main/java/com/jerboa/Utils.kt +++ b/app/src/main/java/com/jerboa/Utils.kt @@ -778,11 +778,16 @@ enum class ThemeMode(val mode: Int) { Black(R.string.look_and_feel_theme_black), } -enum class ThemeColor { - Dynamic, - Green, - Pink, - Blue, +enum class ThemeColor(val mode: Int) { + Dynamic(R.string.look_and_feel_theme_color_dynamic), + Beach(R.string.look_and_feel_theme_color_beach), + Blue(R.string.look_and_feel_theme_color_blue), + Crimson(R.string.look_and_feel_theme_color_crimson), + Green(R.string.look_and_feel_theme_color_green), + Grey(R.string.look_and_feel_theme_color_grey), + Pink(R.string.look_and_feel_theme_color_pink), + Purple(R.string.look_and_feel_theme_color_purple), + Woodland(R.string.look_and_feel_theme_color_woodland), } enum class PostViewMode(val mode: Int) { diff --git a/app/src/main/java/com/jerboa/ui/theme/Color.kt b/app/src/main/java/com/jerboa/ui/theme/Color.kt index 1a09c2507..05d997b4f 100644 --- a/app/src/main/java/com/jerboa/ui/theme/Color.kt +++ b/app/src/main/java/com/jerboa/ui/theme/Color.kt @@ -8,6 +8,661 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color +fun beach(): Pair { + val md_theme_light_primary = Color(0xFF006FD1) + val md_theme_light_onPrimary = Color(0xFFFFFFFF) + val md_theme_light_primaryContainer = Color(0xFFFFEBB8) + val md_theme_light_onPrimaryContainer = Color(0xFF000000) + val md_theme_light_secondary = Color(0xFF566274) + val md_theme_light_onSecondary = Color(0xFFFFFFFF) + val md_theme_light_secondaryContainer = Color(0xFFFFEBB8) + val md_theme_light_onSecondaryContainer = Color(0xFF000000) + val md_theme_light_tertiary = Color(0xFF0037FD) + val md_theme_light_onTertiary = Color(0xFF000000) + val md_theme_light_tertiaryContainer = Color(0xFFDEE1E4) + val md_theme_light_onTertiaryContainer = Color(0xFF1A1C20) + val md_theme_light_error = Color(0xFF1A1C20) + val md_theme_light_errorContainer = Color(0xFFD6E7FF) + val md_theme_light_onError = Color(0xFFFFFFFF) + val md_theme_light_onErrorContainer = Color(0xFF1A1C20) + val md_theme_light_background = Color(0xFFD7F3FF) + val md_theme_light_onBackground = Color(0xFF001150) + val md_theme_light_surface = Color(0xFFD7F3FF) + val md_theme_light_onSurface = Color(0xFF000000) + val md_theme_light_surfaceVariant = Color(0xFFDDE5F2) + val md_theme_light_onSurfaceVariant = Color(0xFF442A2A) + val md_theme_light_outline = Color(0xFF737983) + val md_theme_light_inverseOnSurface = Color(0xFFFFEBB8) + val md_theme_light_inverseSurface = Color(0xFF576274) + val md_theme_light_inversePrimary = Color(0xFFFFFFFF) +// val md_theme_light_shadow = Color(0xFF000000) + val md_theme_light_surfaceTint = Color(0xFFFFEBB8) + val md_theme_light_outlineVariant = Color(0xFFFFFFFF) + val md_theme_light_scrim = Color(0xFF000000) + + val md_theme_dark_primary = Color(0xFFDA8304) + val md_theme_dark_onPrimary = Color(0xFFFFFFFF) + val md_theme_dark_primaryContainer = Color(0xFFDA8304) + val md_theme_dark_onPrimaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_secondary = Color(0xFFBDCCE2) + val md_theme_dark_onSecondary = Color(0xFF293342) + val md_theme_dark_secondaryContainer = Color(0xFFDA8304) + val md_theme_dark_onSecondaryContainer = Color(0xFFFFFFFF) + val md_theme_dark_tertiary = Color(0xFFDA8304) + val md_theme_dark_onTertiary = Color(0xFF293342) + val md_theme_dark_tertiaryContainer = Color(0xFF2C323C) + val md_theme_dark_onTertiaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_error = Color(0xFFE0E4EB) + val md_theme_dark_errorContainer = Color(0xFF434851) + val md_theme_dark_onError = Color(0xFF434851) + val md_theme_dark_onErrorContainer = Color(0xFFE0E4EB) + val md_theme_dark_background = Color(0xFF00234D) + val md_theme_dark_onBackground = Color(0xFFFFFFFF) + val md_theme_dark_surface = Color(0xFF00234D) + val md_theme_dark_onSurface = Color(0xFFE0E4EB) + val md_theme_dark_surfaceVariant = Color(0xFF434851) + val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9D5) + val md_theme_dark_outline = Color(0xFF8C939E) + val md_theme_dark_inverseOnSurface = Color(0xFFDA8304) + val md_theme_dark_inverseSurface = Color(0xFFE0E4EB) + val md_theme_dark_inversePrimary = Color(0xFF101113) +// val md_theme_dark_shadow = Color(0xFF000000) + val md_theme_dark_surfaceTint = Color(0xFF00234D) + val md_theme_dark_outlineVariant = Color(0xFF002991) + val md_theme_dark_scrim = Color(0xFF000000) + +// val seed = Color(0xFF78B0FF) + + val light = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, + ) + + val dark = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, + ) + return Pair(light, dark) +} + +fun blue(): Pair { + val md_theme_light_primary = Color(0xFF3161A6) + val md_theme_light_onPrimary = Color(0xFFFFFFFF) + val md_theme_light_primaryContainer = Color(0xFFD9E8FF) + val md_theme_light_onPrimaryContainer = Color(0xFF00193E) + val md_theme_light_secondary = Color(0xFF566274) + val md_theme_light_onSecondary = Color(0xFFFFFFFF) + val md_theme_light_secondaryContainer = Color(0xFFD9E8FF) + val md_theme_light_onSecondaryContainer = Color(0xFF151D2A) + val md_theme_light_tertiary = Color(0xFF35537D) + val md_theme_light_onTertiary = Color(0xFFFFFFFF) + val md_theme_light_tertiaryContainer = Color(0xFFC3DCFF) + val md_theme_light_onTertiaryContainer = Color(0xFF00132F) + val md_theme_light_error = Color(0xFF195CBA) + val md_theme_light_errorContainer = Color(0xFFD6E7FF) + val md_theme_light_onError = Color(0xFFFFFFFF) + val md_theme_light_onErrorContainer = Color(0xFF001B41) + val md_theme_light_background = Color(0xFFFBFCFF) + val md_theme_light_onBackground = Color(0xFF1A1C20) + val md_theme_light_surface = Color(0xFFFBFCFF) + val md_theme_light_onSurface = Color(0xFF1A1C20) + val md_theme_light_surfaceVariant = Color(0xFFDDE5F2) + val md_theme_light_onSurfaceVariant = Color(0xFF434851) + val md_theme_light_outline = Color(0xFF737983) + val md_theme_light_inverseOnSurface = Color(0xFFEEF3FA) + val md_theme_light_inverseSurface = Color(0xFF2F3135) + val md_theme_light_inversePrimary = Color(0xFFB0D0FF) +// val md_theme_light_shadow = Color(0xFF000000) + val md_theme_light_surfaceTint = Color(0xFF3161A6) + val md_theme_light_outlineVariant = Color(0xFFC2C9D5) + val md_theme_light_scrim = Color(0xFF000000) + + val md_theme_dark_primary = Color(0xFFB0D0FF) + val md_theme_dark_onPrimary = Color(0xFF002964) + val md_theme_dark_primaryContainer = Color(0xFF164587) + val md_theme_dark_onPrimaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_secondary = Color(0xFFBDCCE2) + val md_theme_dark_onSecondary = Color(0xFF293342) + val md_theme_dark_secondaryContainer = Color(0xFF3F4A5A) + val md_theme_dark_onSecondaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_tertiary = Color(0xFF95BAF0) + val md_theme_dark_onTertiary = Color(0xFF0C2548) + val md_theme_dark_tertiaryContainer = Color(0xFF213C62) + val md_theme_dark_onTertiaryContainer = Color(0xFFC3DCFF) + val md_theme_dark_error = Color(0xFFABCEFF) + val md_theme_dark_errorContainer = Color(0xFF003D93) + val md_theme_dark_onError = Color(0xFF002B69) + val md_theme_dark_onErrorContainer = Color(0xFFD6E7FF) + val md_theme_dark_background = Color(0xFF1A1C20) + val md_theme_dark_onBackground = Color(0xFFE0E4EB) + val md_theme_dark_surface = Color(0xFF1A1C20) + val md_theme_dark_onSurface = Color(0xFFE0E4EB) + val md_theme_dark_surfaceVariant = Color(0xFF434851) + val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9D5) + val md_theme_dark_outline = Color(0xFF8C939E) + val md_theme_dark_inverseOnSurface = Color(0xFF1A1C20) + val md_theme_dark_inverseSurface = Color(0xFFE0E4EB) + val md_theme_dark_inversePrimary = Color(0xFF3161A6) +// val md_theme_dark_shadow = Color(0xFF000000) + val md_theme_dark_surfaceTint = Color(0xFFB0D0FF) + val md_theme_dark_outlineVariant = Color(0xFF434851) + val md_theme_dark_scrim = Color(0xFF000000) + +// val seed = Color(0xFF78B0FF) + + val light = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, + ) + + val dark = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, + ) + return Pair(light, dark) +} + +fun crimson(): Pair { + val md_theme_light_primary = Color(0xFFFF5252) + val md_theme_light_onPrimary = Color(0xFF000000) + val md_theme_light_primaryContainer = Color(0xFFEC8F8F) + val md_theme_light_onPrimaryContainer = Color(0xFF000000) + val md_theme_light_secondary = Color(0xFF566274) + val md_theme_light_onSecondary = Color(0xFFFFFFFF) + val md_theme_light_secondaryContainer = Color(0xFFFFC3C3) + val md_theme_light_onSecondaryContainer = Color(0xFF151D2A) + val md_theme_light_tertiary = Color(0xFFFF5252) + val md_theme_light_onTertiary = Color(0xFFFFFFFF) + val md_theme_light_tertiaryContainer = Color(0xFFC3DCFF) + val md_theme_light_onTertiaryContainer = Color(0xFF00132F) + val md_theme_light_error = Color(0xFFFF5252) + val md_theme_light_errorContainer = Color(0xFFD6E7FF) + val md_theme_light_onError = Color(0xFFFFFFFF) + val md_theme_light_onErrorContainer = Color(0xFF001B41) + val md_theme_light_background = Color(0xFFFFFFFF) + val md_theme_light_onBackground = Color(0xFF1A1C20) + val md_theme_light_surface = Color(0xFFF87575) + val md_theme_light_onSurface = Color(0xFF151D2A) + val md_theme_light_surfaceVariant = Color(0xFFDDE5F2) + val md_theme_light_onSurfaceVariant = Color(0xFF151D2A) + val md_theme_light_outline = Color(0xFF737983) + val md_theme_light_inverseOnSurface = Color(0xFFFFC3C3) + val md_theme_light_inverseSurface = Color(0xFF2F3135) + val md_theme_light_inversePrimary = Color(0xFFB0D0FF) +// val md_theme_light_shadow = Color(0xFF000000) + val md_theme_light_surfaceTint = Color(0xFFFF5252) + val md_theme_light_outlineVariant = Color(0xFFFFD4D4) + val md_theme_light_scrim = Color(0xFF000000) + + val md_theme_dark_primary = Color(0xFFFF5252) + val md_theme_dark_onPrimary = Color(0xFFFFFFFF) + val md_theme_dark_primaryContainer = Color(0xFF7E2839) + val md_theme_dark_onPrimaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_secondary = Color(0xFFBDCCE2) + val md_theme_dark_onSecondary = Color(0xFF293342) + val md_theme_dark_secondaryContainer = Color(0xFF7E2839) + val md_theme_dark_onSecondaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_tertiary = Color(0xFFFF5252) + val md_theme_dark_onTertiary = Color(0xFF0C2548) + val md_theme_dark_tertiaryContainer = Color(0xFF213C62) + val md_theme_dark_onTertiaryContainer = Color(0xFFC3DCFF) + val md_theme_dark_error = Color(0xFFD9E8FF) + val md_theme_dark_errorContainer = Color(0xFF630A1B) + val md_theme_dark_onError = Color(0xFFFF5252) + val md_theme_dark_onErrorContainer = Color(0xFFD6E7FF) + val md_theme_dark_background = Color(0xFF630A1B) + val md_theme_dark_onBackground = Color(0xFFFFFFFF) + val md_theme_dark_surface = Color(0xFF630A1B) + val md_theme_dark_onSurface = Color(0xFFE0E4EB) + val md_theme_dark_surfaceVariant = Color(0xFF434851) + val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9D5) + val md_theme_dark_outline = Color(0xFF8C939E) + val md_theme_dark_inverseOnSurface = Color(0xFF7E2839) + val md_theme_dark_inverseSurface = Color(0xFFE0E4EB) + val md_theme_dark_inversePrimary = Color(0xFF3161A6) +// val md_theme_dark_shadow = Color(0xFF000000) + val md_theme_dark_surfaceTint = Color(0xFF630A1B) + val md_theme_dark_outlineVariant = Color(0xFF7E2839) + val md_theme_dark_scrim = Color(0xFF000000) + +// val seed = Color(0xFF78B0FF) + + val light = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, + ) + + val dark = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, + ) + return Pair(light, dark) +} + +fun green(): Pair { + val md_theme_light_primary = Color(0xFF216C29) + val md_theme_light_onPrimary = Color(0xFFFFFFFF) + val md_theme_light_primaryContainer = Color(0xFFA7F5A1) + val md_theme_light_onPrimaryContainer = Color(0xFF002204) + val md_theme_light_secondary = Color(0xFF52634F) + val md_theme_light_onSecondary = Color(0xFFFFFFFF) + val md_theme_light_secondaryContainer = Color(0xFFD5E8CF) + val md_theme_light_onSecondaryContainer = Color(0xFF101F10) + val md_theme_light_tertiary = Color(0xFF38656A) + val md_theme_light_onTertiary = Color(0xFFFFFFFF) + val md_theme_light_tertiaryContainer = Color(0xFFBCEBF1) + val md_theme_light_onTertiaryContainer = Color(0xFF002023) + val md_theme_light_error = Color(0xFFBA1A1A) + val md_theme_light_errorContainer = Color(0xFFFFDAD6) + val md_theme_light_onError = Color(0xFFFFFFFF) + val md_theme_light_onErrorContainer = Color(0xFF410002) + val md_theme_light_background = Color(0xFFFCFDF6) + val md_theme_light_onBackground = Color(0xFF1A1C19) + val md_theme_light_surface = Color(0xFFFCFDF6) + val md_theme_light_onSurface = Color(0xFF1A1C19) + val md_theme_light_surfaceVariant = Color(0xFFDEE5D8) + val md_theme_light_onSurfaceVariant = Color(0xFF424940) + val md_theme_light_outline = Color(0xFF72796F) + val md_theme_light_inverseOnSurface = Color(0xFFF0F1EB) + val md_theme_light_inverseSurface = Color(0xFF2F312D) + val md_theme_light_inversePrimary = Color(0xFF8BD987) +// val md_theme_light_shadow = Color(0xFF000000) + val md_theme_light_surfaceTint = Color(0xFF216C29) + val md_theme_light_outlineVariant = Color(0xFFC2C9BD) + val md_theme_light_scrim = Color(0xFF000000) + + val md_theme_dark_primary = Color(0xFF8BD987) + val md_theme_dark_onPrimary = Color(0xFF00390B) + val md_theme_dark_primaryContainer = Color(0xFF005314) + val md_theme_dark_onPrimaryContainer = Color(0xFFA7F5A1) + val md_theme_dark_secondary = Color(0xFFB9CCB3) + val md_theme_dark_onSecondary = Color(0xFF253423) + val md_theme_dark_secondaryContainer = Color(0xFF3B4B38) + val md_theme_dark_onSecondaryContainer = Color(0xFFD5E8CF) + val md_theme_dark_tertiary = Color(0xFFA0CFD4) + val md_theme_dark_onTertiary = Color(0xFF00363B) + val md_theme_dark_tertiaryContainer = Color(0xFF1F4D52) + val md_theme_dark_onTertiaryContainer = Color(0xFFBCEBF1) + val md_theme_dark_error = Color(0xFFFFB4AB) + val md_theme_dark_errorContainer = Color(0xFF93000A) + val md_theme_dark_onError = Color(0xFF690005) + val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) + val md_theme_dark_background = Color(0xFF1A1C19) + val md_theme_dark_onBackground = Color(0xFFE2E3DD) + val md_theme_dark_surface = Color(0xFF1A1C19) + val md_theme_dark_onSurface = Color(0xFFE2E3DD) + val md_theme_dark_surfaceVariant = Color(0xFF424940) + val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9BD) + val md_theme_dark_outline = Color(0xFF8C9388) + val md_theme_dark_inverseOnSurface = Color(0xFF1A1C19) + val md_theme_dark_inverseSurface = Color(0xFFE2E3DD) + val md_theme_dark_inversePrimary = Color(0xFF216C29) +// val md_theme_dark_shadow = Color(0xFF000000) + val md_theme_dark_surfaceTint = Color(0xFF8BD987) + val md_theme_dark_outlineVariant = Color(0xFF424940) + val md_theme_dark_scrim = Color(0xFF000000) + +// val seed = Color(0xFF78C475) + + val light = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, + ) + + val dark = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, + ) + return Pair(light, dark) +} + +fun grey(): Pair { + val md_theme_light_primary = Color(0xFF576274) + val md_theme_light_onPrimary = Color(0xFFFFFFFF) + val md_theme_light_primaryContainer = Color(0xFFDEE1E4) + val md_theme_light_onPrimaryContainer = Color(0xFF151D2A) + val md_theme_light_secondary = Color(0xFF566274) + val md_theme_light_onSecondary = Color(0xFFFFFFFF) + val md_theme_light_secondaryContainer = Color(0xFFDEE1E4) + val md_theme_light_onSecondaryContainer = Color(0xFF151D2A) + val md_theme_light_tertiary = Color(0xFF576274) + val md_theme_light_onTertiary = Color(0xFFFFFFFF) + val md_theme_light_tertiaryContainer = Color(0xFFDEE1E4) + val md_theme_light_onTertiaryContainer = Color(0xFF1A1C20) + val md_theme_light_error = Color(0xFF1A1C20) + val md_theme_light_errorContainer = Color(0xFFD6E7FF) + val md_theme_light_onError = Color(0xFFFFFFFF) + val md_theme_light_onErrorContainer = Color(0xFF1A1C20) + val md_theme_light_background = Color(0xFFFBFCFF) + val md_theme_light_onBackground = Color(0xFF1A1C20) + val md_theme_light_surface = Color(0xFFFBFCFF) + val md_theme_light_onSurface = Color(0xFF1A1C20) + val md_theme_light_surfaceVariant = Color(0xFFDDE5F2) + val md_theme_light_onSurfaceVariant = Color(0xFF434851) + val md_theme_light_outline = Color(0xFF737983) + val md_theme_light_inverseOnSurface = Color(0xFFF3F3F3) + val md_theme_light_inverseSurface = Color(0xFF576274) + val md_theme_light_inversePrimary = Color(0xFFFFFFFF) +// val md_theme_light_shadow = Color(0xFF000000) + val md_theme_light_surfaceTint = Color(0xFFFBFCFF) + val md_theme_light_outlineVariant = Color(0xFFC2C2C2) + val md_theme_light_scrim = Color(0xFF000000) + + val md_theme_dark_primary = Color(0xFFB2D3F3) + val md_theme_dark_onPrimary = Color(0xFF293342) + val md_theme_dark_primaryContainer = Color(0xFF2C323C) + val md_theme_dark_onPrimaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_secondary = Color(0xFFBDCCE2) + val md_theme_dark_onSecondary = Color(0xFF293342) + val md_theme_dark_secondaryContainer = Color(0xFF2C323C) + val md_theme_dark_onSecondaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_tertiary = Color(0xFFD3D3D3) + val md_theme_dark_onTertiary = Color(0xFF293342) + val md_theme_dark_tertiaryContainer = Color(0xFF2C323C) + val md_theme_dark_onTertiaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_error = Color(0xFFE0E4EB) + val md_theme_dark_errorContainer = Color(0xFF434851) + val md_theme_dark_onError = Color(0xFF434851) + val md_theme_dark_onErrorContainer = Color(0xFFE0E4EB) + val md_theme_dark_background = Color(0xFF101113) + val md_theme_dark_onBackground = Color(0xFFE0E4EB) + val md_theme_dark_surface = Color(0xFF101113) + val md_theme_dark_onSurface = Color(0xFFE0E4EB) + val md_theme_dark_surfaceVariant = Color(0xFF434851) + val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9D5) + val md_theme_dark_outline = Color(0xFF8C939E) + val md_theme_dark_inverseOnSurface = Color(0xFF1A1C20) + val md_theme_dark_inverseSurface = Color(0xFFE0E4EB) + val md_theme_dark_inversePrimary = Color(0xFF101113) +// val md_theme_dark_shadow = Color(0xFF000000) + val md_theme_dark_surfaceTint = Color(0xFF1A1C20) + val md_theme_dark_outlineVariant = Color(0xFF434851) + val md_theme_dark_scrim = Color(0xFF000000) + +// val seed = Color(0xFF78B0FF) + + val light = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, + ) + + val dark = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, + ) + return Pair(light, dark) +} + fun pink(): Pair { val md_theme_light_primary = Color(0xFFA63166) val md_theme_light_onPrimary = Color(0xFFFFFFFF) @@ -139,70 +794,70 @@ fun pink(): Pair { return Pair(light, dark) } -fun green(): Pair { - val md_theme_light_primary = Color(0xFF216C29) +fun purple(): Pair { + val md_theme_light_primary = Color(0xFFC5009B) val md_theme_light_onPrimary = Color(0xFFFFFFFF) - val md_theme_light_primaryContainer = Color(0xFFA7F5A1) - val md_theme_light_onPrimaryContainer = Color(0xFF002204) - val md_theme_light_secondary = Color(0xFF52634F) + val md_theme_light_primaryContainer = Color(0xFFCA8EFF) + val md_theme_light_onPrimaryContainer = Color(0xFF151D2A) + val md_theme_light_secondary = Color(0xFF566274) val md_theme_light_onSecondary = Color(0xFFFFFFFF) - val md_theme_light_secondaryContainer = Color(0xFFD5E8CF) - val md_theme_light_onSecondaryContainer = Color(0xFF101F10) - val md_theme_light_tertiary = Color(0xFF38656A) + val md_theme_light_secondaryContainer = Color(0xFFCA8EFF) + val md_theme_light_onSecondaryContainer = Color(0xFF151D2A) + val md_theme_light_tertiary = Color(0xFF576274) val md_theme_light_onTertiary = Color(0xFFFFFFFF) - val md_theme_light_tertiaryContainer = Color(0xFFBCEBF1) - val md_theme_light_onTertiaryContainer = Color(0xFF002023) - val md_theme_light_error = Color(0xFFBA1A1A) - val md_theme_light_errorContainer = Color(0xFFFFDAD6) + val md_theme_light_tertiaryContainer = Color(0xFFDEE1E4) + val md_theme_light_onTertiaryContainer = Color(0xFF1A1C20) + val md_theme_light_error = Color(0xFF1A1C20) + val md_theme_light_errorContainer = Color(0xFFD6E7FF) val md_theme_light_onError = Color(0xFFFFFFFF) - val md_theme_light_onErrorContainer = Color(0xFF410002) - val md_theme_light_background = Color(0xFFFCFDF6) - val md_theme_light_onBackground = Color(0xFF1A1C19) - val md_theme_light_surface = Color(0xFFFCFDF6) - val md_theme_light_onSurface = Color(0xFF1A1C19) - val md_theme_light_surfaceVariant = Color(0xFFDEE5D8) - val md_theme_light_onSurfaceVariant = Color(0xFF424940) - val md_theme_light_outline = Color(0xFF72796F) - val md_theme_light_inverseOnSurface = Color(0xFFF0F1EB) - val md_theme_light_inverseSurface = Color(0xFF2F312D) - val md_theme_light_inversePrimary = Color(0xFF8BD987) + val md_theme_light_onErrorContainer = Color(0xFF1A1C20) + val md_theme_light_background = Color(0xFFDDB8FF) + val md_theme_light_onBackground = Color(0xFF000000) + val md_theme_light_surface = Color(0xFFE7C5FF) + val md_theme_light_onSurface = Color(0xFF1A1C20) + val md_theme_light_surfaceVariant = Color(0xFFDDE5F2) + val md_theme_light_onSurfaceVariant = Color(0xFF434851) + val md_theme_light_outline = Color(0xFF737983) + val md_theme_light_inverseOnSurface = Color(0xFFCA8EFF) + val md_theme_light_inverseSurface = Color(0xFF576274) + val md_theme_light_inversePrimary = Color(0xFFFFFFFF) // val md_theme_light_shadow = Color(0xFF000000) - val md_theme_light_surfaceTint = Color(0xFF216C29) - val md_theme_light_outlineVariant = Color(0xFFC2C9BD) + val md_theme_light_surfaceTint = Color(0xFFE7C5FF) + val md_theme_light_outlineVariant = Color(0xFFC2C2C2) val md_theme_light_scrim = Color(0xFF000000) - val md_theme_dark_primary = Color(0xFF8BD987) - val md_theme_dark_onPrimary = Color(0xFF00390B) - val md_theme_dark_primaryContainer = Color(0xFF005314) - val md_theme_dark_onPrimaryContainer = Color(0xFFA7F5A1) - val md_theme_dark_secondary = Color(0xFFB9CCB3) - val md_theme_dark_onSecondary = Color(0xFF253423) - val md_theme_dark_secondaryContainer = Color(0xFF3B4B38) - val md_theme_dark_onSecondaryContainer = Color(0xFFD5E8CF) - val md_theme_dark_tertiary = Color(0xFFA0CFD4) - val md_theme_dark_onTertiary = Color(0xFF00363B) - val md_theme_dark_tertiaryContainer = Color(0xFF1F4D52) - val md_theme_dark_onTertiaryContainer = Color(0xFFBCEBF1) - val md_theme_dark_error = Color(0xFFFFB4AB) - val md_theme_dark_errorContainer = Color(0xFF93000A) - val md_theme_dark_onError = Color(0xFF690005) - val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) - val md_theme_dark_background = Color(0xFF1A1C19) - val md_theme_dark_onBackground = Color(0xFFE2E3DD) - val md_theme_dark_surface = Color(0xFF1A1C19) - val md_theme_dark_onSurface = Color(0xFFE2E3DD) - val md_theme_dark_surfaceVariant = Color(0xFF424940) - val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9BD) - val md_theme_dark_outline = Color(0xFF8C9388) - val md_theme_dark_inverseOnSurface = Color(0xFF1A1C19) - val md_theme_dark_inverseSurface = Color(0xFFE2E3DD) - val md_theme_dark_inversePrimary = Color(0xFF216C29) + val md_theme_dark_primary = Color(0xFFFF00C8) + val md_theme_dark_onPrimary = Color(0xFF293342) + val md_theme_dark_primaryContainer = Color(0xFF54068B) + val md_theme_dark_onPrimaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_secondary = Color(0xFFBDCCE2) + val md_theme_dark_onSecondary = Color(0xFF293342) + val md_theme_dark_secondaryContainer = Color(0xFF7925B4) + val md_theme_dark_onSecondaryContainer = Color(0xFFFF00C8) + val md_theme_dark_tertiary = Color(0xFFFF00C8) + val md_theme_dark_onTertiary = Color(0xFF293342) + val md_theme_dark_tertiaryContainer = Color(0xFF2C323C) + val md_theme_dark_onTertiaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_error = Color(0xFFE0E4EB) + val md_theme_dark_errorContainer = Color(0xFF434851) + val md_theme_dark_onError = Color(0xFF434851) + val md_theme_dark_onErrorContainer = Color(0xFFE0E4EB) + val md_theme_dark_background = Color(0xFF2F146D) + val md_theme_dark_onBackground = Color(0xFFFFFFFF) + val md_theme_dark_surface = Color(0xFF54068B) + val md_theme_dark_onSurface = Color(0xFFE0E4EB) + val md_theme_dark_surfaceVariant = Color(0xFF434851) + val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9D5) + val md_theme_dark_outline = Color(0xFF8C939E) + val md_theme_dark_inverseOnSurface = Color(0xFF54068B) + val md_theme_dark_inverseSurface = Color(0xFFE0E4EB) + val md_theme_dark_inversePrimary = Color(0xFF101113) // val md_theme_dark_shadow = Color(0xFF000000) - val md_theme_dark_surfaceTint = Color(0xFF8BD987) - val md_theme_dark_outlineVariant = Color(0xFF424940) + val md_theme_dark_surfaceTint = Color(0xFF54068B) + val md_theme_dark_outlineVariant = Color(0xFF434851) val md_theme_dark_scrim = Color(0xFF000000) -// val seed = Color(0xFF78C475) +// val seed = Color(0xFF78B0FF) val light = lightColorScheme( primary = md_theme_light_primary, @@ -270,66 +925,66 @@ fun green(): Pair { return Pair(light, dark) } -fun blue(): Pair { - val md_theme_light_primary = Color(0xFF3161A6) +fun woodland(): Pair { + val md_theme_light_primary = Color(0xFF442A2A) val md_theme_light_onPrimary = Color(0xFFFFFFFF) - val md_theme_light_primaryContainer = Color(0xFFD9E8FF) - val md_theme_light_onPrimaryContainer = Color(0xFF00193E) + val md_theme_light_primaryContainer = Color(0xFF33C490) + val md_theme_light_onPrimaryContainer = Color(0xFF000000) val md_theme_light_secondary = Color(0xFF566274) val md_theme_light_onSecondary = Color(0xFFFFFFFF) - val md_theme_light_secondaryContainer = Color(0xFFD9E8FF) - val md_theme_light_onSecondaryContainer = Color(0xFF151D2A) - val md_theme_light_tertiary = Color(0xFF35537D) + val md_theme_light_secondaryContainer = Color(0xFF33C490) + val md_theme_light_onSecondaryContainer = Color(0xFFFFFFFF) + val md_theme_light_tertiary = Color(0xFF442A2A) val md_theme_light_onTertiary = Color(0xFFFFFFFF) - val md_theme_light_tertiaryContainer = Color(0xFFC3DCFF) - val md_theme_light_onTertiaryContainer = Color(0xFF00132F) - val md_theme_light_error = Color(0xFF195CBA) + val md_theme_light_tertiaryContainer = Color(0xFFDEE1E4) + val md_theme_light_onTertiaryContainer = Color(0xFF1A1C20) + val md_theme_light_error = Color(0xFF1A1C20) val md_theme_light_errorContainer = Color(0xFFD6E7FF) val md_theme_light_onError = Color(0xFFFFFFFF) - val md_theme_light_onErrorContainer = Color(0xFF001B41) - val md_theme_light_background = Color(0xFFFBFCFF) - val md_theme_light_onBackground = Color(0xFF1A1C20) - val md_theme_light_surface = Color(0xFFFBFCFF) - val md_theme_light_onSurface = Color(0xFF1A1C20) + val md_theme_light_onErrorContainer = Color(0xFF1A1C20) + val md_theme_light_background = Color(0xFFF2FFCC) + val md_theme_light_onBackground = Color(0xFF000000) + val md_theme_light_surface = Color(0xFF03AA6E) + val md_theme_light_onSurface = Color(0xFF000000) val md_theme_light_surfaceVariant = Color(0xFFDDE5F2) - val md_theme_light_onSurfaceVariant = Color(0xFF434851) + val md_theme_light_onSurfaceVariant = Color(0xFF442A2A) val md_theme_light_outline = Color(0xFF737983) - val md_theme_light_inverseOnSurface = Color(0xFFEEF3FA) - val md_theme_light_inverseSurface = Color(0xFF2F3135) - val md_theme_light_inversePrimary = Color(0xFFB0D0FF) + val md_theme_light_inverseOnSurface = Color(0xFF8A7171) + val md_theme_light_inverseSurface = Color(0xFF576274) + val md_theme_light_inversePrimary = Color(0xFFFFFFFF) // val md_theme_light_shadow = Color(0xFF000000) - val md_theme_light_surfaceTint = Color(0xFF3161A6) - val md_theme_light_outlineVariant = Color(0xFFC2C9D5) + val md_theme_light_surfaceTint = Color(0xFF33C490) + val md_theme_light_outlineVariant = Color(0xFFC2C2C2) val md_theme_light_scrim = Color(0xFF000000) - val md_theme_dark_primary = Color(0xFFB0D0FF) - val md_theme_dark_onPrimary = Color(0xFF002964) - val md_theme_dark_primaryContainer = Color(0xFF164587) + val md_theme_dark_primary = Color(0xFFBD897E) + val md_theme_dark_onPrimary = Color(0xFF293342) + val md_theme_dark_primaryContainer = Color(0xFF834737) val md_theme_dark_onPrimaryContainer = Color(0xFFD9E8FF) val md_theme_dark_secondary = Color(0xFFBDCCE2) val md_theme_dark_onSecondary = Color(0xFF293342) - val md_theme_dark_secondaryContainer = Color(0xFF3F4A5A) - val md_theme_dark_onSecondaryContainer = Color(0xFFD9E8FF) - val md_theme_dark_tertiary = Color(0xFF95BAF0) - val md_theme_dark_onTertiary = Color(0xFF0C2548) - val md_theme_dark_tertiaryContainer = Color(0xFF213C62) - val md_theme_dark_onTertiaryContainer = Color(0xFFC3DCFF) - val md_theme_dark_error = Color(0xFFABCEFF) - val md_theme_dark_errorContainer = Color(0xFF003D93) - val md_theme_dark_onError = Color(0xFF002B69) - val md_theme_dark_onErrorContainer = Color(0xFFD6E7FF) - val md_theme_dark_background = Color(0xFF1A1C20) - val md_theme_dark_onBackground = Color(0xFFE0E4EB) - val md_theme_dark_surface = Color(0xFF1A1C20) + val md_theme_dark_secondaryContainer = Color(0xFF834737) + val md_theme_dark_onSecondaryContainer = Color(0xFFFFFFFF) + val md_theme_dark_tertiary = Color(0xFFBD897E) + val md_theme_dark_onTertiary = Color(0xFF293342) + val md_theme_dark_tertiaryContainer = Color(0xFF2C323C) + val md_theme_dark_onTertiaryContainer = Color(0xFFD9E8FF) + val md_theme_dark_error = Color(0xFFE0E4EB) + val md_theme_dark_errorContainer = Color(0xFF434851) + val md_theme_dark_onError = Color(0xFF434851) + val md_theme_dark_onErrorContainer = Color(0xFFE0E4EB) + val md_theme_dark_background = Color(0xFF143B2D) + val md_theme_dark_onBackground = Color(0xFFFFFFFF) + val md_theme_dark_surface = Color(0xFF5E3023) val md_theme_dark_onSurface = Color(0xFFE0E4EB) val md_theme_dark_surfaceVariant = Color(0xFF434851) val md_theme_dark_onSurfaceVariant = Color(0xFFC2C9D5) val md_theme_dark_outline = Color(0xFF8C939E) - val md_theme_dark_inverseOnSurface = Color(0xFF1A1C20) + val md_theme_dark_inverseOnSurface = Color(0xFF834737) val md_theme_dark_inverseSurface = Color(0xFFE0E4EB) - val md_theme_dark_inversePrimary = Color(0xFF3161A6) + val md_theme_dark_inversePrimary = Color(0xFF101113) // val md_theme_dark_shadow = Color(0xFF000000) - val md_theme_dark_surfaceTint = Color(0xFFB0D0FF) + val md_theme_dark_surfaceTint = Color(0xFF54068B) val md_theme_dark_outlineVariant = Color(0xFF434851) val md_theme_dark_scrim = Color(0xFF000000) diff --git a/app/src/main/java/com/jerboa/ui/theme/Theme.kt b/app/src/main/java/com/jerboa/ui/theme/Theme.kt index 1e5a5d905..10f659cdc 100644 --- a/app/src/main/java/com/jerboa/ui/theme/Theme.kt +++ b/app/src/main/java/com/jerboa/ui/theme/Theme.kt @@ -42,9 +42,14 @@ fun JerboaTheme( val colorPair = when (themeColor) { ThemeColor.Dynamic -> dynamicPair + ThemeColor.Beach -> beach() + ThemeColor.Blue -> blue() + ThemeColor.Crimson -> crimson() ThemeColor.Green -> green() + ThemeColor.Grey -> grey() ThemeColor.Pink -> pink() - ThemeColor.Blue -> blue() + ThemeColor.Purple -> purple() + ThemeColor.Woodland -> woodland() } fun makeBlack(darkTheme: ColorScheme): ColorScheme { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 443a27bfb..abbc8f9d5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -193,6 +193,15 @@ Light System System Black + Dynamic + Beach + Blue + Crimson + Green + Grey + Pink + Purple + Woodland Use custom tabs Use private custom tabs if available Mark as read