From 6a869e5d8d8255a43657fd16fa0ad84b2fe88e6c Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Mon, 12 Oct 2026 12:35:22 -0400 Subject: [PATCH] chore(theme): align Android success greens with the shared tokens Map successText to the declared #73EAA4 so validity text uses the shared text green. Price-up keeps rendering #1AC86A by reading success in CurrencyAppreciationLabel and MarketCapExplainerContent. CodeToggleSwitch now uses the success fill (#1AC86A) instead of SystemGreen, which is removed. The unused ui/resources ic_checked_green (#87D300) now matches the app copy that already won the resource merge. The Flipcash success banner uses the gray bannerThemed. --- .../com/flipcash/app/core/ui/CurrencyAppreciationLabel.kt | 2 +- .../internal/explainer/MarketCapExplainerContent.kt | 2 +- .../flipcash/app/theme/internal/FlipcashDesignSystem.kt | 5 ++--- .../src/main/kotlin/com/getcode/ui/theme/CodeSwitch.kt | 5 ++--- ui/resources/src/main/res/drawable/ic_checked_green.xml | 8 ++++---- ui/theme/src/main/kotlin/com/getcode/theme/Color.kt | 2 -- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/CurrencyAppreciationLabel.kt b/apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/CurrencyAppreciationLabel.kt index b70c68e9f0..c2ad4f5574 100644 --- a/apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/CurrencyAppreciationLabel.kt +++ b/apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/CurrencyAppreciationLabel.kt @@ -45,7 +45,7 @@ fun CurrencyAppreciationLabel( ) { val hasAppreciation = appreciation.toDouble() >= 0 val changeColor = if (hasAppreciation) { - CodeTheme.colors.successText + CodeTheme.colors.success } else { CodeTheme.colors.errorText } diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/explainer/MarketCapExplainerContent.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/explainer/MarketCapExplainerContent.kt index 383a41dd3f..42b47ee060 100644 --- a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/explainer/MarketCapExplainerContent.kt +++ b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/explainer/MarketCapExplainerContent.kt @@ -230,7 +230,7 @@ internal fun MarketCapExplainerBody( text = value, style = CodeTheme.typography.textMedium, color = when (tone) { - Tone.Positive -> CodeTheme.colors.successText + Tone.Positive -> CodeTheme.colors.success Tone.Negative -> CodeTheme.colors.errorText Tone.Neutral -> CodeTheme.colors.textMain }, diff --git a/apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt b/apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt index fc57115c2f..92c644b9f6 100644 --- a/apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt +++ b/apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt @@ -3,7 +3,6 @@ package com.flipcash.app.theme.internal import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight -import com.getcode.theme.BannerSuccess import com.getcode.theme.BetaIndicator import com.getcode.theme.Black40 import com.getcode.theme.BrandAccent @@ -108,7 +107,7 @@ private val colors = with(Flipcash2ColorSpec) { error = Error, errorText = TextError, success = success, - successText = success, + successText = successText, textMain = Color.White, textSecondary = secondaryText, textTertiary = White10, @@ -125,7 +124,7 @@ private val colors = with(Flipcash2ColorSpec) { bannerThemed = bannerThemed, bannerError = Error, bannerWarning = warning, - bannerSuccess = BannerSuccess, + bannerSuccess = bannerThemed, scrim = Black40, accessKey = accessKey, contactAvatar = contactAvatar, diff --git a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeSwitch.kt b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeSwitch.kt index 8b27642a9b..53bafef907 100644 --- a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeSwitch.kt +++ b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeSwitch.kt @@ -7,7 +7,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import com.getcode.theme.CodeTheme -import com.getcode.theme.SystemGreen import com.getcode.theme.White object CodeToggleSwitchDefaults { @@ -22,10 +21,10 @@ object CodeToggleSwitchDefaults { disabledUncheckedTrackColor = CodeTheme.colors.toggleUncheckedTrackColor.copy(DISABLED_ALPHA), checkedThumbColor = White, uncheckedThumbColor = White, - checkedTrackColor = SystemGreen, + checkedTrackColor = CodeTheme.colors.success, uncheckedTrackColor = CodeTheme.colors.toggleUncheckedTrackColor, uncheckedBorderColor = Color.White.copy(0.15f), - checkedBorderColor = SystemGreen, + checkedBorderColor = CodeTheme.colors.success, disabledUncheckedBorderColor = CodeTheme.colors.toggleUncheckedTrackColor.copy(DISABLED_ALPHA), disabledCheckedBorderColor = Color(0xFF2A8A4B), ) diff --git a/ui/resources/src/main/res/drawable/ic_checked_green.xml b/ui/resources/src/main/res/drawable/ic_checked_green.xml index 57110909d1..702d7d4083 100644 --- a/ui/resources/src/main/res/drawable/ic_checked_green.xml +++ b/ui/resources/src/main/res/drawable/ic_checked_green.xml @@ -6,12 +6,12 @@ + android:fillColor="#1AC86A" + android:strokeColor="#1AC86A"/> + android:fillColor="#000"/> + android:fillColor="#000"/> diff --git a/ui/theme/src/main/kotlin/com/getcode/theme/Color.kt b/ui/theme/src/main/kotlin/com/getcode/theme/Color.kt index 89cdfa6438..eeffe34d1d 100644 --- a/ui/theme/src/main/kotlin/com/getcode/theme/Color.kt +++ b/ui/theme/src/main/kotlin/com/getcode/theme/Color.kt @@ -47,8 +47,6 @@ val TextSecondary = BrandLight val TextTertiary = BrandMuted val TextError = Alert -val SystemGreen = Color(0xFF04C759) - val TopNotification = Color(0xFF4f49ce) val TopNeutral = Color(0xFF747474)