From 0ab677db85b24549ac5b891415fe14a562e65cce Mon Sep 17 00:00:00 2001 From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com> Date: Tue, 29 Jul 2025 21:13:59 +0200 Subject: [PATCH] Adjust theme colors based on the app icon --- .../org/mydomain/myscan/ui/theme/Color.kt | 70 +++++++++---------- .../java/org/mydomain/myscan/view/Buttons.kt | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt b/app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt index afc203d..bdc0de7 100644 --- a/app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt +++ b/app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt @@ -16,50 +16,50 @@ package org.mydomain.myscan.ui.theme import androidx.compose.ui.graphics.Color -val Primary = Color(0xFF33BE41) +val Primary = Color(0xFF0CAD55) val OnPrimary = Color(0xFFFFFFFF) -val PrimaryContainer = Color(0xFF7BD785) -val OnPrimaryContainer = Color(0xFF0D3311) -val Secondary = Color(0xFF52CBA7) +val PrimaryContainer = Color(0xFFA2E6C0) +val OnPrimaryContainer = Color(0xFF043319) +val Secondary = Color(0xFF4883A6) val OnSecondary = Color(0xFFFFFFFF) -val SecondaryContainer = Color(0xFFBAE6D8) -val OnSecondaryContainer = Color(0xFF14332A) -val Tertiary = Color(0xFF8976D6) +val SecondaryContainer = Color(0xFFB2D3E6) +val OnSecondaryContainer = Color(0xFF0F2633) +val Tertiary = Color(0xFF7963AA) val OnTertiary = Color(0xFFFFFFFF) -val TertiaryContainer = Color(0xFFCBC5E6) -val OnTertiaryContainer = Color(0xFF211C33) +val TertiaryContainer = Color(0xFFD0C7E6) +val OnTertiaryContainer = Color(0xFF241E33) val Error = Color(0xFFB3261E) val OnError = Color(0xFFFFFFFF) val ErrorContainer = Color(0xFFE6ACA9) val OnErrorContainer = Color(0xFF330B09) -val Background = Color(0xFFfcfcfc) -val OnBackground = Color(0xFF313331) -val Surface = Color(0xFFfcfcfc) -val OnSurface = Color(0xFF313331) -val SurfaceVariant = Color(0xFFdbe6dc) -val OnSurfaceVariant = Color(0xFF576658) -val Outline = Color(0xFF829984) +val Background = Color(0xFFfbfcfc) +val OnBackground = Color(0xFF313332) +val Surface = Color(0xFFfbfcfc) +val OnSurface = Color(0xFF313332) +val SurfaceVariant = Color(0xFFd8e6de) +val OnSurfaceVariant = Color(0xFF53665c) +val Outline = Color(0xFF7d9989) -val PrimaryDark = Color(0xFF9AE6A1) -val OnPrimaryDark = Color(0xFF144C19) -val PrimaryContainerDark = Color(0xFF1B6622) -val OnPrimaryContainerDark = Color(0xFFB0E6B5) -val SecondaryDark = Color(0xFFA8E6D3) -val OnSecondaryDark = Color(0xFF1F4C3F) -val SecondaryContainerDark = Color(0xFF296654) -val OnSecondaryContainerDark = Color(0xFFBAE6D8) -val TertiaryDark = Color(0xFFC1B7E6) -val OnTertiaryDark = Color(0xFF312A4C) -val TertiaryContainerDark = Color(0xFF413866) -val OnTertiaryContainerDark = Color(0xFFCBC5E6) +val PrimaryDark = Color(0xFF86E6B1) +val OnPrimaryDark = Color(0xFF054C25) +val PrimaryContainerDark = Color(0xFF076632) +val OnPrimaryContainerDark = Color(0xFFA2E6C0) +val SecondaryDark = Color(0xFF9DCBE6) +val OnSecondaryDark = Color(0xFF16394C) +val SecondaryContainerDark = Color(0xFF1E4B66) +val OnSecondaryContainerDark = Color(0xFFB2D3E6) +val TertiaryDark = Color(0xFFC8BAE6) +val OnTertiaryDark = Color(0xFF362C4C) +val TertiaryContainerDark = Color(0xFF483B66) +val OnTertiaryContainerDark = Color(0xFFD0C7E6) val ErrorDark = Color(0xFFE69490) val OnErrorDark = Color(0xFF4C100D) val ErrorContainerDark = Color(0xFF661511) val OnErrorContainerDark = Color(0xFFE6ACA9) -val BackgroundDark = Color(0xFF313331) -val OnBackgroundDark = Color(0xFFe3e6e3) -val SurfaceDark = Color(0xFF313331) -val OnSurfaceDark = Color(0xFFe3e6e3) -val SurfaceVariantDark = Color(0xFF576658) -val OnSurfaceVariantDark = Color(0xFFd6e6d8) -val OutlineDark = Color(0xFFa2b3a3) \ No newline at end of file +val BackgroundDark = Color(0xFF313332) +val OnBackgroundDark = Color(0xFFe2e6e4) +val SurfaceDark = Color(0xFF313332) +val OnSurfaceDark = Color(0xFFe2e6e4) +val SurfaceVariantDark = Color(0xFF53665c) +val OnSurfaceVariantDark = Color(0xFFd2e6db) +val OutlineDark = Color(0xFF9eb3a7) diff --git a/app/src/main/java/org/mydomain/myscan/view/Buttons.kt b/app/src/main/java/org/mydomain/myscan/view/Buttons.kt index 63b4937..fdf55e4 100644 --- a/app/src/main/java/org/mydomain/myscan/view/Buttons.kt +++ b/app/src/main/java/org/mydomain/myscan/view/Buttons.kt @@ -60,7 +60,7 @@ fun SecondaryActionButton( FilledIconButton ( onClick = onClick, colors = IconButtonDefaults.outlinedIconButtonColors( - containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.6f), + containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f), contentColor = MaterialTheme.colorScheme.primary ), modifier = modifier.size(40.dp)