mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 15:50:16 +02:00
Add two new themes (#266)
Adds "Bold Blue" and Black/OLED themes Also tweaks Orange & Green a bit to make the borders stronger and backgrounds darker/less colored Related to #91
This commit is contained in:
parent
6d338bde59
commit
4bd202e013
8 changed files with 428 additions and 8 deletions
|
|
@ -485,6 +485,7 @@ fun HomePageHeader(
|
||||||
Text(
|
Text(
|
||||||
text = title,
|
text = title,
|
||||||
style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.SemiBold),
|
style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.SemiBold),
|
||||||
|
color = MaterialTheme.colorScheme.onBackground,
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
)
|
)
|
||||||
|
|
@ -493,6 +494,7 @@ fun HomePageHeader(
|
||||||
Text(
|
Text(
|
||||||
text = subtitle,
|
text = subtitle,
|
||||||
style = MaterialTheme.typography.headlineSmall,
|
style = MaterialTheme.typography.headlineSmall,
|
||||||
|
color = MaterialTheme.colorScheme.onBackground,
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,9 @@ import androidx.compose.ui.graphics.Color
|
||||||
import androidx.tv.material3.MaterialTheme
|
import androidx.tv.material3.MaterialTheme
|
||||||
import com.github.damontecres.wholphin.preferences.AppThemeColors
|
import com.github.damontecres.wholphin.preferences.AppThemeColors
|
||||||
import com.github.damontecres.wholphin.ui.theme.colors.BlueThemeColors
|
import com.github.damontecres.wholphin.ui.theme.colors.BlueThemeColors
|
||||||
|
import com.github.damontecres.wholphin.ui.theme.colors.BoldBlueThemeColors
|
||||||
import com.github.damontecres.wholphin.ui.theme.colors.GreenThemeColors
|
import com.github.damontecres.wholphin.ui.theme.colors.GreenThemeColors
|
||||||
|
import com.github.damontecres.wholphin.ui.theme.colors.OledThemeColors
|
||||||
import com.github.damontecres.wholphin.ui.theme.colors.OrangeThemeColors
|
import com.github.damontecres.wholphin.ui.theme.colors.OrangeThemeColors
|
||||||
import com.github.damontecres.wholphin.ui.theme.colors.PurpleThemeColors
|
import com.github.damontecres.wholphin.ui.theme.colors.PurpleThemeColors
|
||||||
|
|
||||||
|
|
@ -38,6 +40,8 @@ fun WholphinTheme(
|
||||||
AppThemeColors.BLUE -> BlueThemeColors
|
AppThemeColors.BLUE -> BlueThemeColors
|
||||||
AppThemeColors.GREEN -> GreenThemeColors
|
AppThemeColors.GREEN -> GreenThemeColors
|
||||||
AppThemeColors.ORANGE -> OrangeThemeColors
|
AppThemeColors.ORANGE -> OrangeThemeColors
|
||||||
|
AppThemeColors.OLED_BLACK -> OledThemeColors
|
||||||
|
AppThemeColors.BOLD_BLUE -> BoldBlueThemeColors
|
||||||
AppThemeColors.UNRECOGNIZED -> PurpleThemeColors
|
AppThemeColors.UNRECOGNIZED -> PurpleThemeColors
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,204 @@
|
||||||
|
package com.github.damontecres.wholphin.ui.theme.colors
|
||||||
|
|
||||||
|
import androidx.compose.material3.ColorScheme
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.tv.material3.darkColorScheme
|
||||||
|
import androidx.tv.material3.lightColorScheme
|
||||||
|
import com.github.damontecres.wholphin.ui.theme.ThemeColors
|
||||||
|
|
||||||
|
val BoldBlueThemeColors =
|
||||||
|
object : ThemeColors {
|
||||||
|
val primaryLight = Color(0xFF405F90)
|
||||||
|
val onPrimaryLight = Color(0xFFFFFFFF)
|
||||||
|
val primaryContainerLight = Color(0xFFD6E3FF)
|
||||||
|
val onPrimaryContainerLight = Color(0xFF274777)
|
||||||
|
val secondaryLight = Color(0xFF565F71)
|
||||||
|
val onSecondaryLight = Color(0xFFFFFFFF)
|
||||||
|
val secondaryContainerLight = Color(0xFFDAE2F9)
|
||||||
|
val onSecondaryContainerLight = Color(0xFF3E4759)
|
||||||
|
val tertiaryLight = Color(0xFF605690)
|
||||||
|
val onTertiaryLight = Color(0xFFFFFFFF)
|
||||||
|
val tertiaryContainerLight = Color(0xFFE6DEFF)
|
||||||
|
val onTertiaryContainerLight = Color(0xFF483F77)
|
||||||
|
val errorLight = Color(0xFFBA1A1A)
|
||||||
|
val onErrorLight = Color(0xFFFFFFFF)
|
||||||
|
val errorContainerLight = Color(0xFFFFDAD6)
|
||||||
|
val onErrorContainerLight = Color(0xFF93000A)
|
||||||
|
val backgroundLight = Color(0xFFF9F9FF)
|
||||||
|
val onBackgroundLight = Color(0xFF191C20)
|
||||||
|
val surfaceLight = Color(0xFFFAF8FF)
|
||||||
|
val onSurfaceLight = Color(0xFF1A1B21)
|
||||||
|
val surfaceVariantLight = Color(0xFFE1E2EC)
|
||||||
|
val onSurfaceVariantLight = Color(0xFF44474F)
|
||||||
|
val outlineLight = Color(0xFF75777F)
|
||||||
|
val outlineVariantLight = Color(0xFFC4C6D0)
|
||||||
|
val scrimLight = Color(0xFF000000)
|
||||||
|
val inverseSurfaceLight = Color(0xFF2F3036)
|
||||||
|
val inverseOnSurfaceLight = Color(0xFFF1F0F7)
|
||||||
|
val inversePrimaryLight = Color(0xFFAAC7FF)
|
||||||
|
val surfaceDimLight = Color(0xFFDAD9E0)
|
||||||
|
val surfaceBrightLight = Color(0xFFFAF8FF)
|
||||||
|
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
|
||||||
|
val surfaceContainerLowLight = Color(0xFFF4F3FA)
|
||||||
|
val surfaceContainerLight = Color(0xFFEEEDF4)
|
||||||
|
val surfaceContainerHighLight = Color(0xFFE8E7EF)
|
||||||
|
val surfaceContainerHighestLight = Color(0xFFE3E2E9)
|
||||||
|
|
||||||
|
val primaryDark = Color(0xFF0C2A67)
|
||||||
|
val onPrimaryDark = Color(0xFF558DD0)
|
||||||
|
val primaryContainerDark = Color(0xFF192E4F)
|
||||||
|
val onPrimaryContainerDark = Color(0xFFB4C9F6)
|
||||||
|
val secondaryDark = Color(0xFFBEC7DC)
|
||||||
|
val onSecondaryDark = Color(0xFF283141)
|
||||||
|
val secondaryContainerDark = Color(0xFF3E4759)
|
||||||
|
val onSecondaryContainerDark = Color(0xFFDAE2F9)
|
||||||
|
val tertiaryDark = Color(0xFFCABEFF)
|
||||||
|
val onTertiaryDark = Color(0xFF28345F)
|
||||||
|
val tertiaryContainerDark = Color(0xFF8CDDE8)
|
||||||
|
val onTertiaryContainerDark = Color(0xFFE6DEFF)
|
||||||
|
val errorDark = Color(0xFFFFB4AB)
|
||||||
|
val onErrorDark = Color(0xFF690005)
|
||||||
|
val errorContainerDark = Color(0xFF93000A)
|
||||||
|
val onErrorContainerDark = Color(0xFFFFDAD6)
|
||||||
|
val backgroundDark = Color(0xFF111318)
|
||||||
|
val onBackgroundDark = Color(0xFFE2E2E9)
|
||||||
|
val surfaceDark = Color(0xFF0A1017)
|
||||||
|
val onSurfaceDark = Color(0xFFDAE3FA)
|
||||||
|
val surfaceVariantDark = Color(0xFF44474F)
|
||||||
|
val onSurfaceVariantDark = Color(0xFFC4C6D0)
|
||||||
|
val outlineDark = Color(0xFF8E9099)
|
||||||
|
val outlineVariantDark = Color(0xFF44474F)
|
||||||
|
val scrimDark = Color(0xFF000000)
|
||||||
|
val inverseSurfaceDark = Color(0xFFE3E2E9)
|
||||||
|
val inverseOnSurfaceDark = Color(0xFF2F3036)
|
||||||
|
val inversePrimaryDark = Color(0xFF152986)
|
||||||
|
val surfaceDimDark = Color(0xFF121318)
|
||||||
|
val surfaceBrightDark = Color(0xFF38393F)
|
||||||
|
val surfaceContainerLowestDark = Color(0xFF0D0E13)
|
||||||
|
val surfaceContainerLowDark = Color(0xFF1A1B21)
|
||||||
|
val surfaceContainerDark = Color(0xFF1E1F25)
|
||||||
|
val surfaceContainerHighDark = Color(0xFF292A2F)
|
||||||
|
val surfaceContainerHighestDark = Color(0xFF33343A)
|
||||||
|
|
||||||
|
override val lightSchemeMaterial: ColorScheme =
|
||||||
|
androidx.compose.material3.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,
|
||||||
|
scrim = scrimLight,
|
||||||
|
inverseSurface = inverseSurfaceLight,
|
||||||
|
inverseOnSurface = inverseOnSurfaceLight,
|
||||||
|
inversePrimary = inversePrimaryLight,
|
||||||
|
)
|
||||||
|
|
||||||
|
override 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,
|
||||||
|
scrim = scrimLight,
|
||||||
|
inverseSurface = inverseSurfaceLight,
|
||||||
|
inverseOnSurface = inverseOnSurfaceLight,
|
||||||
|
inversePrimary = inversePrimaryLight,
|
||||||
|
border = inversePrimaryLight,
|
||||||
|
)
|
||||||
|
|
||||||
|
override val darkSchemeMaterial =
|
||||||
|
androidx.compose.material3.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,
|
||||||
|
scrim = scrimDark,
|
||||||
|
inverseSurface = inverseSurfaceDark,
|
||||||
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
|
inversePrimary = inversePrimaryDark,
|
||||||
|
)
|
||||||
|
|
||||||
|
override 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,
|
||||||
|
scrim = scrimDark,
|
||||||
|
inverseSurface = inverseSurfaceDark,
|
||||||
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
|
inversePrimary = inversePrimaryDark,
|
||||||
|
border = inversePrimaryDark,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -70,7 +70,7 @@ val GreenThemeColors =
|
||||||
val scrimDark = Color(0xFF000000)
|
val scrimDark = Color(0xFF000000)
|
||||||
val inverseSurfaceDark = Color(0xFFDFE4DC)
|
val inverseSurfaceDark = Color(0xFFDFE4DC)
|
||||||
val inverseOnSurfaceDark = Color(0xFF2D322D)
|
val inverseOnSurfaceDark = Color(0xFF2D322D)
|
||||||
val inversePrimaryDark = Color(0xFF316A42)
|
val inversePrimaryDark = Color(0xFF39912F)
|
||||||
val surfaceDimDark = Color(0xFF101510)
|
val surfaceDimDark = Color(0xFF101510)
|
||||||
val surfaceBrightDark = Color(0xFF353A35)
|
val surfaceBrightDark = Color(0xFF353A35)
|
||||||
val surfaceContainerLowestDark = Color(0xFF0B0F0B)
|
val surfaceContainerLowestDark = Color(0xFF0B0F0B)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,206 @@
|
||||||
|
package com.github.damontecres.wholphin.ui.theme.colors
|
||||||
|
|
||||||
|
import androidx.compose.material3.ColorScheme
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.tv.material3.darkColorScheme
|
||||||
|
import androidx.tv.material3.lightColorScheme
|
||||||
|
import com.github.damontecres.wholphin.ui.theme.ThemeColors
|
||||||
|
|
||||||
|
val OledThemeColors =
|
||||||
|
object : ThemeColors {
|
||||||
|
val primaryLight = Color(0xFF405F90)
|
||||||
|
val onPrimaryLight = Color(0xFFFFFFFF)
|
||||||
|
val primaryContainerLight = Color(0xFFD6E3FF)
|
||||||
|
val onPrimaryContainerLight = Color(0xFF274777)
|
||||||
|
val secondaryLight = Color(0xFF565F71)
|
||||||
|
val onSecondaryLight = Color(0xFFFFFFFF)
|
||||||
|
val secondaryContainerLight = Color(0xFFDAE2F9)
|
||||||
|
val onSecondaryContainerLight = Color(0xFF3E4759)
|
||||||
|
val tertiaryLight = Color(0xFF605690)
|
||||||
|
val onTertiaryLight = Color(0xFFFFFFFF)
|
||||||
|
val tertiaryContainerLight = Color(0xFFE6DEFF)
|
||||||
|
val onTertiaryContainerLight = Color(0xFF483F77)
|
||||||
|
val errorLight = Color(0xFFBA1A1A)
|
||||||
|
val onErrorLight = Color(0xFFFFFFFF)
|
||||||
|
val errorContainerLight = Color(0xFFFFDAD6)
|
||||||
|
val onErrorContainerLight = Color(0xFF93000A)
|
||||||
|
val backgroundLight = Color(0xFFF9F9FF)
|
||||||
|
val onBackgroundLight = Color(0xFF191C20)
|
||||||
|
val surfaceLight = Color(0xFFFAF8FF)
|
||||||
|
val onSurfaceLight = Color(0xFF1A1B21)
|
||||||
|
val surfaceVariantLight = Color(0xFFE1E2EC)
|
||||||
|
val onSurfaceVariantLight = Color(0xFF44474F)
|
||||||
|
val outlineLight = Color(0xFF75777F)
|
||||||
|
val outlineVariantLight = Color(0xFFC4C6D0)
|
||||||
|
val scrimLight = Color(0xFF000000)
|
||||||
|
val inverseSurfaceLight = Color(0xFF2F3036)
|
||||||
|
val inverseOnSurfaceLight = Color(0xFFF1F0F7)
|
||||||
|
val inversePrimaryLight = Color(0xFFAAC7FF)
|
||||||
|
val surfaceDimLight = Color(0xFFDAD9E0)
|
||||||
|
val surfaceBrightLight = Color(0xFFFAF8FF)
|
||||||
|
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
|
||||||
|
val surfaceContainerLowLight = Color(0xFFF4F3FA)
|
||||||
|
val surfaceContainerLight = Color(0xFFEEEDF4)
|
||||||
|
val surfaceContainerHighLight = Color(0xFFE8E7EF)
|
||||||
|
val surfaceContainerHighestLight = Color(0xFFE3E2E9)
|
||||||
|
|
||||||
|
val onDark = Color(0xC0FFFFFF)
|
||||||
|
|
||||||
|
val primaryDark = Color(0xFFFFFFFF)
|
||||||
|
val onPrimaryDark = Color(0xC04D4B4B)
|
||||||
|
val primaryContainerDark = Color(0xFF505050)
|
||||||
|
val onPrimaryContainerDark = onDark
|
||||||
|
val secondaryDark = Color(0xFF808080)
|
||||||
|
val onSecondaryDark = onDark
|
||||||
|
val secondaryContainerDark = Color(0xFF3E4759)
|
||||||
|
val onSecondaryContainerDark = onDark
|
||||||
|
val tertiaryDark = Color(0xFFDEDEDE)
|
||||||
|
val onTertiaryDark = Color(0xFF363535)
|
||||||
|
val tertiaryContainerDark = Color(0xFF909090)
|
||||||
|
val onTertiaryContainerDark = onPrimaryDark
|
||||||
|
val errorDark = Color(0xFFFFB4AB)
|
||||||
|
val onErrorDark = Color(0xFF690005)
|
||||||
|
val errorContainerDark = Color(0xFF93000A)
|
||||||
|
val onErrorContainerDark = Color(0xFFFFFFFF)
|
||||||
|
val backgroundDark = Color(0xFF000000)
|
||||||
|
val onBackgroundDark = onDark
|
||||||
|
val surfaceDark = Color(0xFF000000)
|
||||||
|
val onSurfaceDark = Color(0xC0FFFFFF)
|
||||||
|
val surfaceVariantDark = Color(0xFF303030)
|
||||||
|
val onSurfaceVariantDark = onDark
|
||||||
|
val outlineDark = Color(0xFF8E9099)
|
||||||
|
val outlineVariantDark = Color(0xFF44474F)
|
||||||
|
val scrimDark = Color(0xFF000000)
|
||||||
|
val inverseSurfaceDark = onDark
|
||||||
|
val inverseOnSurfaceDark = Color(0xFF000000)
|
||||||
|
val inversePrimaryDark = Color(0xC0F9F4FF)
|
||||||
|
val surfaceDimDark = Color(0xFF121318)
|
||||||
|
val surfaceBrightDark = Color(0xFF38393F)
|
||||||
|
val surfaceContainerLowestDark = Color(0xFF0D0E13)
|
||||||
|
val surfaceContainerLowDark = Color(0xFF1A1B21)
|
||||||
|
val surfaceContainerDark = Color(0xFF1E1F25)
|
||||||
|
val surfaceContainerHighDark = Color(0xFF292A2F)
|
||||||
|
val surfaceContainerHighestDark = Color(0xFF33343A)
|
||||||
|
|
||||||
|
override val lightSchemeMaterial: ColorScheme =
|
||||||
|
androidx.compose.material3.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,
|
||||||
|
scrim = scrimLight,
|
||||||
|
inverseSurface = inverseSurfaceLight,
|
||||||
|
inverseOnSurface = inverseOnSurfaceLight,
|
||||||
|
inversePrimary = inversePrimaryLight,
|
||||||
|
)
|
||||||
|
|
||||||
|
override 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,
|
||||||
|
scrim = scrimLight,
|
||||||
|
inverseSurface = inverseSurfaceLight,
|
||||||
|
inverseOnSurface = inverseOnSurfaceLight,
|
||||||
|
inversePrimary = inversePrimaryLight,
|
||||||
|
border = inversePrimaryLight,
|
||||||
|
)
|
||||||
|
|
||||||
|
override val darkSchemeMaterial =
|
||||||
|
androidx.compose.material3.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,
|
||||||
|
scrim = scrimDark,
|
||||||
|
inverseSurface = inverseSurfaceDark,
|
||||||
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
|
inversePrimary = inversePrimaryDark,
|
||||||
|
)
|
||||||
|
|
||||||
|
override 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,
|
||||||
|
scrim = scrimDark,
|
||||||
|
inverseSurface = inverseSurfaceDark,
|
||||||
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
|
inversePrimary = inversePrimaryDark,
|
||||||
|
border = inversePrimaryDark,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -44,15 +44,15 @@ val OrangeThemeColors =
|
||||||
val surfaceContainerHighLight = Color(0xFFEFE7D9)
|
val surfaceContainerHighLight = Color(0xFFEFE7D9)
|
||||||
val surfaceContainerHighestLight = Color(0xFFEAE2D4)
|
val surfaceContainerHighestLight = Color(0xFFEAE2D4)
|
||||||
|
|
||||||
val primaryDark = Color(0xFFE1C46D)
|
val primaryDark = Color(0xFFB67F12)
|
||||||
val onPrimaryDark = Color(0xFF3C2F00)
|
val onPrimaryDark = Color(0xFFE0CB7F)
|
||||||
val primaryContainerDark = Color(0xFF574500)
|
val primaryContainerDark = Color(0xFF574500)
|
||||||
val onPrimaryContainerDark = Color(0xFFFFE086)
|
val onPrimaryContainerDark = Color(0xFFFFE086)
|
||||||
val secondaryDark = Color(0xFFD4C5A1)
|
val secondaryDark = Color(0xFFD4C5A1)
|
||||||
val onSecondaryDark = Color(0xFF383016)
|
val onSecondaryDark = Color(0xFF383016)
|
||||||
val secondaryContainerDark = Color(0xFF50462A)
|
val secondaryContainerDark = Color(0xFF50462A)
|
||||||
val onSecondaryContainerDark = Color(0xFFF1E1BB)
|
val onSecondaryContainerDark = Color(0xFFF1E1BB)
|
||||||
val tertiaryDark = Color(0xFFFCB974)
|
val tertiaryDark = Color(0xFFFCE574)
|
||||||
val onTertiaryDark = Color(0xFF492900)
|
val onTertiaryDark = Color(0xFF492900)
|
||||||
val tertiaryContainerDark = Color(0xFF693C00)
|
val tertiaryContainerDark = Color(0xFF693C00)
|
||||||
val onTertiaryContainerDark = Color(0xFFFFDCBD)
|
val onTertiaryContainerDark = Color(0xFFFFDCBD)
|
||||||
|
|
@ -60,9 +60,9 @@ val OrangeThemeColors =
|
||||||
val onErrorDark = Color(0xFF690005)
|
val onErrorDark = Color(0xFF690005)
|
||||||
val errorContainerDark = Color(0xFF93000A)
|
val errorContainerDark = Color(0xFF93000A)
|
||||||
val onErrorContainerDark = Color(0xFFFFDAD6)
|
val onErrorContainerDark = Color(0xFFFFDAD6)
|
||||||
val backgroundDark = Color(0xFF16130B)
|
val backgroundDark = Color(0xFF1C1715)
|
||||||
val onBackgroundDark = Color(0xFFEAE2D4)
|
val onBackgroundDark = Color(0xFFEAE2D4)
|
||||||
val surfaceDark = Color(0xFF16130B)
|
val surfaceDark = backgroundDark
|
||||||
val onSurfaceDark = Color(0xFFEAE2D4)
|
val onSurfaceDark = Color(0xFFEAE2D4)
|
||||||
val surfaceVariantDark = Color(0xFF4C4639)
|
val surfaceVariantDark = Color(0xFF4C4639)
|
||||||
val onSurfaceVariantDark = Color(0xFFCEC6B4)
|
val onSurfaceVariantDark = Color(0xFFCEC6B4)
|
||||||
|
|
@ -71,7 +71,7 @@ val OrangeThemeColors =
|
||||||
val scrimDark = Color(0xFF000000)
|
val scrimDark = Color(0xFF000000)
|
||||||
val inverseSurfaceDark = Color(0xFFEAE2D4)
|
val inverseSurfaceDark = Color(0xFFEAE2D4)
|
||||||
val inverseOnSurfaceDark = Color(0xFF343027)
|
val inverseOnSurfaceDark = Color(0xFF343027)
|
||||||
val inversePrimaryDark = Color(0xFF725C0C)
|
val inversePrimaryDark = Color(0xFFE39012)
|
||||||
val surfaceDimDark = Color(0xFF16130B)
|
val surfaceDimDark = Color(0xFF16130B)
|
||||||
val surfaceBrightDark = Color(0xFF3D392F)
|
val surfaceBrightDark = Color(0xFF3D392F)
|
||||||
val surfaceContainerLowestDark = Color(0xFF110E07)
|
val surfaceContainerLowestDark = Color(0xFF110E07)
|
||||||
|
|
@ -199,6 +199,6 @@ val OrangeThemeColors =
|
||||||
inverseSurface = inverseSurfaceDark,
|
inverseSurface = inverseSurfaceDark,
|
||||||
inverseOnSurface = inverseOnSurfaceDark,
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
inversePrimary = inversePrimaryDark,
|
inversePrimary = inversePrimaryDark,
|
||||||
border = primaryDark,
|
border = inversePrimaryDark,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,8 @@ enum AppThemeColors {
|
||||||
BLUE = 1;
|
BLUE = 1;
|
||||||
GREEN = 2;
|
GREEN = 2;
|
||||||
ORANGE = 3;
|
ORANGE = 3;
|
||||||
|
BOLD_BLUE = 4;
|
||||||
|
OLED_BLACK = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum EdgeStyle{
|
enum EdgeStyle{
|
||||||
|
|
|
||||||
|
|
@ -328,6 +328,8 @@
|
||||||
<item>Blue</item>
|
<item>Blue</item>
|
||||||
<item>Green</item>
|
<item>Green</item>
|
||||||
<item>Orange</item>
|
<item>Orange</item>
|
||||||
|
<item>Bold Blue</item>
|
||||||
|
<item>Black</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<string-array name="skip_behaviors">
|
<string-array name="skip_behaviors">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue