commit 58b2417dfaaa03cda3f0d85282aaeb413566f2f8
parent 1145de61d14950d8cebd20f2c1aa49dbe10e1b22
Author: Vlada Svirsh <svirv1@bfh.ch>
Date: Fri, 6 Nov 2026 18:20:42 +0100
Update Wallet and PoS theme colors
Diffstat:
2 files changed, 64 insertions(+), 55 deletions(-)
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/compose/PosTheme.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/compose/PosTheme.kt
@@ -28,17 +28,17 @@ private val PosLightColorScheme =
lightColorScheme(
primary = Color(0xFF0042B3),
onPrimary = Color(0xFFFFFFFF),
- primaryContainer = Color(0xFFD3DEFF),
+ primaryContainer = Color(0xFFF1F2F9),
onPrimaryContainer = Color(0xFF00134A),
inversePrimary = Color(0xFFB4C5FF),
secondary = Color(0xFF586A88),
onSecondary = Color(0xFFFFFFFF),
- secondaryContainer = Color(0xFFD9E3F9),
+ secondaryContainer = Color(0xFFB8D2FF),
onSecondaryContainer = Color(0xFF111C2B),
tertiary = Color(0xFF338AF0),
onTertiary = Color(0xFFFFFFFF),
- tertiaryContainer = Color(0xFFD1E4FF),
- onTertiaryContainer = Color(0xFF001C39),
+ tertiaryContainer = Color(0xFF62A0FF),
+ onTertiaryContainer = Color(0xFFFFFFFF),
error = Color(0xFFB3261E),
onError = Color(0xFFFFFFFF),
errorContainer = Color(0xFFF9DEDC),
@@ -51,8 +51,8 @@ private val PosLightColorScheme =
onSurfaceVariant = Color(0xFF45474F),
outline = Color(0xFF767880),
outlineVariant = Color(0xFFC4C6D0),
- inverseSurface = Color(0xFF2C2F3A),
- inverseOnSurface = Color(0xFFF0F2FF),
+ inverseSurface = Color(0xFF313033),
+ inverseOnSurface = Color(0xFFF4EFF4),
primaryFixed = Color(0xFFD3DEFF),
onPrimaryFixed = Color(0xFF00134A),
primaryFixedDim = Color(0xFFB4C5FF),
@@ -69,40 +69,40 @@ private val PosLightColorScheme =
surfaceBright = Color(0xFFFFFFFF),
surfaceContainerLowest = Color(0xFFFFFFFF),
surfaceContainerLow = Color(0xFFF5F7FC),
- surfaceContainer = Color(0xFFF0F2F7),
+ surfaceContainer = Color(0xFFF9FAFD),
surfaceContainerHigh = Color(0xFFEAECEF),
surfaceContainerHighest = Color(0xFFE3E6EB),
surfaceTint = Color(0xFF0042B3),
- scrim = Color(0xFF000000),
+ scrim = Color(0xFF000000).copy(alpha = 0.8f),
)
private val PosDarkColorScheme =
darkColorScheme(
primary = Color(0xFFB4C5FF),
onPrimary = Color(0xFF002A78),
- primaryContainer = Color(0xFF0042B3),
- onPrimaryContainer = Color(0xFFE5EBFF),
+ primaryContainer = Color(0xFF283E73),
+ onPrimaryContainer = Color(0xFFE6E8EC),
inversePrimary = Color(0xFF2756C7),
secondary = Color(0xFFA4C9FF),
onSecondary = Color(0xFF00315D),
- secondaryContainer = Color(0xFF72A3E5),
- onSecondaryContainer = Color(0xFF003869),
+ secondaryContainer = Color(0xFF414659),
+ onSecondaryContainer = Color(0xFFE3E2E9),
tertiary = Color(0xFF8DD1E5),
- onTertiary = Color(0xFF003641),
- tertiaryContainer = Color(0xFF166577),
+ onTertiary = Color(0xFFE6E8EC),
+ tertiaryContainer = Color(0xFF2B2E33),
onTertiaryContainer = Color(0xFF9CE0F5),
error = Color(0xFFFFB4AA),
onError = Color(0xFF690003),
errorContainer = Color(0xFFB3261E),
onErrorContainer = Color(0xFFFFCBC4),
- background = Color(0xFF11131A),
+ background = Color(0xFF18191D),
onBackground = Color(0xFFE2E2EB),
- surface = Color(0xFF11131A),
+ surface = Color(0xFF202226),
onSurface = Color(0xFFE5E2E1),
surfaceVariant = Color(0xFF45474B),
- onSurfaceVariant = Color(0xFFC6C6CB),
- outline = Color(0xFF8F9095),
- outlineVariant = Color(0xFF45474B),
+ onSurfaceVariant = Color(0xFFA7ADB7),
+ outline = Color(0xFF35383E),
+ outlineVariant = Color(0xFF566997),
inverseSurface = Color(0xFFE5E2E1),
inverseOnSurface = Color(0xFF313030),
primaryFixed = Color(0xFFDBE1FF),
@@ -125,7 +125,7 @@ private val PosDarkColorScheme =
surfaceContainerHigh = Color(0xFF2A2A2A),
surfaceContainerHighest = Color(0xFF353434),
surfaceTint = Color(0xFFB4C5FF),
- scrim = Color(0xFF000000),
+ scrim = Color(0xFF000000).copy(alpha = 0.8f),
)
@Composable
diff --git a/wallet/src/main/java/net/taler/wallet/ui/theme/Color.kt b/wallet/src/main/java/net/taler/wallet/ui/theme/Color.kt
@@ -20,16 +20,16 @@ import androidx.compose.ui.graphics.Color
val primaryLight = Color(0xFF0042B3)
val onPrimaryLight = Color(0xFFFFFFFF)
-val primaryContainerLight = Color(0xFFD3DEFF)
+val primaryContainerLight = Color(0xFFF1F2F9)
val onPrimaryContainerLight = Color(0xFF00134A)
val secondaryLight = Color(0xFF586A88)
val onSecondaryLight = Color(0xFFFFFFFF)
-val secondaryContainerLight = Color(0xFFD9E3F9)
+val secondaryContainerLight = Color(0xFFB8D2FF)
val onSecondaryContainerLight = Color(0xFF111C2B)
val tertiaryLight = Color(0xFF338AF0)
val onTertiaryLight = Color(0xFFFFFFFF)
-val tertiaryContainerLight = Color(0xFFD1E4FF)
-val onTertiaryContainerLight = Color(0xFF001C39)
+val tertiaryContainerLight = Color(0xFF62A0FF)
+val onTertiaryContainerLight = Color(0xFFFFFFFF)
val errorLight = Color(0xFFB3261E)
val onErrorLight = Color(0xFFFFFFFF)
val errorContainerLight = Color(0xFFF9DEDC)
@@ -42,54 +42,54 @@ val surfaceVariantLight = Color(0xFFE0E3EC)
val onSurfaceVariantLight = Color(0xFF45474F)
val outlineLight = Color(0xFF767880)
val outlineVariantLight = Color(0xFFC4C6D0)
-val scrimLight = Color(0xFF000000)
-val inverseSurfaceLight = Color(0xFF2C2F3A)
-val inverseOnSurfaceLight = Color(0xFFF0F2FF)
+val scrimLight = Color(0xFF000000).copy(alpha = 0.8f)
+val inverseSurfaceLight = Color(0xFF313033)
+val inverseOnSurfaceLight = Color(0xFFF4EFF4)
val inversePrimaryLight = Color(0xFFB4C5FF)
val surfaceDimLight = Color(0xFFDADDE5)
val surfaceBrightLight = Color(0xFFFFFFFF)
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
val surfaceContainerLowLight = Color(0xFFF5F7FC)
-val surfaceContainerLight = Color(0xFFF0F2F7)
+val surfaceContainerLight = Color(0xFFF9FAFD)
val surfaceContainerHighLight = Color(0xFFEAECEF)
val surfaceContainerHighestLight = Color(0xFFE3E6EB)
// extra colors
-val successLight = Color(0xFF228B22)
+val successLight = Color(0xFF337A40)
val onSuccessLight = Color(0xFFFFFFFF)
-val successContainerLight = Color(0xFFC1FFC1)
-val onSuccessContainerLight = Color(0xFF003900)
+val successContainerLight = Color(0xFFDEF9DC)
+val onSuccessContainerLight = Color(0xFFF7FFF1)
-val warningLight = Color(0xFFB26A00)
-val onWarningLight = Color(0xFFFFFFFF)
-val warningContainerLight = Color(0xFFFFDEAC)
-val onWarningContainerLight = Color(0xFF241900)
+val warningLight = Color(0xFFF99C06)
+val onWarningLight = Color(0xFF000000)
+val warningContainerLight = Color(0xFFFDEDD3)
+val onWarningContainerLight = Color(0xFF6B4706)
val primaryDark = Color(0xFFB4C5FF)
val onPrimaryDark = Color(0xFF002A78)
-val primaryContainerDark = Color(0xFF0042B3)
-val onPrimaryContainerDark = Color(0xFFE5EBFF)
+val primaryContainerDark = Color(0xFF283E73)
+val onPrimaryContainerDark = Color(0xFFE6E8EC)
val secondaryDark = Color(0xFFA4C9FF)
val onSecondaryDark = Color(0xFF00315D)
-val secondaryContainerDark = Color(0xFF72A3E5)
-val onSecondaryContainerDark = Color(0xFF003869)
+val secondaryContainerDark = Color(0xFF414659)
+val onSecondaryContainerDark = Color(0xFFE3E2E9)
val tertiaryDark = Color(0xFF8DD1E5)
-val onTertiaryDark = Color(0xFF003641)
-val tertiaryContainerDark = Color(0xFF166577)
+val onTertiaryDark = Color(0xFFE6E8EC)
+val tertiaryContainerDark = Color(0xFF2B2E33)
val onTertiaryContainerDark = Color(0xFF9CE0F5)
val errorDark = Color(0xFFFFB4AA)
val onErrorDark = Color(0xFF690003)
val errorContainerDark = Color(0xFFB3261E)
val onErrorContainerDark = Color(0xFFFFCBC4)
-val backgroundDark = Color(0xFF11131A)
+val backgroundDark = Color(0xFF18191D)
val onBackgroundDark = Color(0xFFE2E2EB)
-val surfaceDark = Color(0xFF11131A)
+val surfaceDark = Color(0xFF202226)
val onSurfaceDark = Color(0xFFE5E2E1)
val surfaceVariantDark = Color(0xFF45474B)
-val onSurfaceVariantDark = Color(0xFFC6C6CB)
-val outlineDark = Color(0xFF8F9095)
-val outlineVariantDark = Color(0xFF45474B)
-val scrimDark = Color(0xFF000000)
+val onSurfaceVariantDark = Color(0xFFA7ADB7)
+val outlineDark = Color(0xFF35383E)
+val outlineVariantDark = Color(0xFF566997)
+val scrimDark = Color(0xFF000000).copy(alpha = 0.8f)
val inverseSurfaceDark = Color(0xFFE5E2E1)
val inverseOnSurfaceDark = Color(0xFF313030)
val inversePrimaryDark = Color(0xFF2756C7)
@@ -103,11 +103,21 @@ val surfaceContainerHighestDark = Color(0xFF353434)
// extra colors
val successDark = Color(0xFF81C784)
-val onSuccessDark = Color(0xFF003300)
-val successContainerDark = Color(0xFF005300)
-val onSuccessContainerDark = Color(0xFFADFFAD)
+val onSuccessDark = Color(0xFFFFFFFF)
+val successContainerDark = Color(0xFF1D3522)
+val onSuccessContainerDark = Color(0xFFEAF6EC)
-val warningDark = Color(0xFFFFB868)
-val onWarningDark = Color(0xFF3E2E00)
-val warningContainerDark = Color(0xFF5C4200)
-val onWarningContainerDark = Color(0xFFFFDEAC)
-\ No newline at end of file
+val warningDark = Color(0xFFF99C06)
+val onWarningDark = Color(0xFF000000)
+val warningContainerDark = Color(0xFF664200)
+val onWarningContainerDark = Color(0xFFFDEDD3)
+
+// Additional Wallet theme colors from Penpot.
+val backgroundBlurDark = Color(0xFF18191D).copy(alpha = 0.55f)
+val backgroundBlurLight = Color(0xFFFDFDFF).copy(alpha = 0.55f)
+val primary18PercentDark = Color(0xFFB4C5FF).copy(alpha = 0.18f)
+val primary18PercentLight = Color(0xFF0042B3).copy(alpha = 0.18f)
+val shadowDark = Color(0xFF000000)
+val shadowLight = Color(0xFF000000)
+val surfaceTintDark = Color(0xFFB4C5FF)
+val surfaceTintLight = Color(0xFF0042B3)