Skip to content

Commit 6a869e5

Browse files
committed
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.
1 parent eda1bcc commit 6a869e5

6 files changed

Lines changed: 10 additions & 14 deletions

File tree

‎apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/CurrencyAppreciationLabel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fun CurrencyAppreciationLabel(
4545
) {
4646
val hasAppreciation = appreciation.toDouble() >= 0
4747
val changeColor = if (hasAppreciation) {
48-
CodeTheme.colors.successText
48+
CodeTheme.colors.success
4949
} else {
5050
CodeTheme.colors.errorText
5151
}

‎apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/explainer/MarketCapExplainerContent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ internal fun MarketCapExplainerBody(
230230
text = value,
231231
style = CodeTheme.typography.textMedium,
232232
color = when (tone) {
233-
Tone.Positive -> CodeTheme.colors.successText
233+
Tone.Positive -> CodeTheme.colors.success
234234
Tone.Negative -> CodeTheme.colors.errorText
235235
Tone.Neutral -> CodeTheme.colors.textMain
236236
},

‎apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.flipcash.app.theme.internal
33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.graphics.Color
55
import androidx.compose.ui.text.font.FontWeight
6-
import com.getcode.theme.BannerSuccess
76
import com.getcode.theme.BetaIndicator
87
import com.getcode.theme.Black40
98
import com.getcode.theme.BrandAccent
@@ -108,7 +107,7 @@ private val colors = with(Flipcash2ColorSpec) {
108107
error = Error,
109108
errorText = TextError,
110109
success = success,
111-
successText = success,
110+
successText = successText,
112111
textMain = Color.White,
113112
textSecondary = secondaryText,
114113
textTertiary = White10,
@@ -125,7 +124,7 @@ private val colors = with(Flipcash2ColorSpec) {
125124
bannerThemed = bannerThemed,
126125
bannerError = Error,
127126
bannerWarning = warning,
128-
bannerSuccess = BannerSuccess,
127+
bannerSuccess = bannerThemed,
129128
scrim = Black40,
130129
accessKey = accessKey,
131130
contactAvatar = contactAvatar,

‎ui/components/src/main/kotlin/com/getcode/ui/theme/CodeSwitch.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.compose.runtime.Composable
77
import androidx.compose.ui.Modifier
88
import androidx.compose.ui.graphics.Color
99
import com.getcode.theme.CodeTheme
10-
import com.getcode.theme.SystemGreen
1110
import com.getcode.theme.White
1211

1312
object CodeToggleSwitchDefaults {
@@ -22,10 +21,10 @@ object CodeToggleSwitchDefaults {
2221
disabledUncheckedTrackColor = CodeTheme.colors.toggleUncheckedTrackColor.copy(DISABLED_ALPHA),
2322
checkedThumbColor = White,
2423
uncheckedThumbColor = White,
25-
checkedTrackColor = SystemGreen,
24+
checkedTrackColor = CodeTheme.colors.success,
2625
uncheckedTrackColor = CodeTheme.colors.toggleUncheckedTrackColor,
2726
uncheckedBorderColor = Color.White.copy(0.15f),
28-
checkedBorderColor = SystemGreen,
27+
checkedBorderColor = CodeTheme.colors.success,
2928
disabledUncheckedBorderColor = CodeTheme.colors.toggleUncheckedTrackColor.copy(DISABLED_ALPHA),
3029
disabledCheckedBorderColor = Color(0xFF2A8A4B),
3130
)

‎ui/resources/src/main/res/drawable/ic_checked_green.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<path
77
android:strokeWidth="1"
88
android:pathData="M13,13m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
9-
android:fillColor="#87D300"
10-
android:strokeColor="#87D300"/>
9+
android:fillColor="#1AC86A"
10+
android:strokeColor="#1AC86A"/>
1111
<path
1212
android:pathData="M8.4145,11.9495l4.2426,4.2426l-1.4142,1.4142l-4.2426,-4.2426z"
13-
android:fillColor="#ffffff"/>
13+
android:fillColor="#000"/>
1414
<path
1515
android:pathData="M9.8286,16.1921l7.0711,-7.0711l1.4142,1.4142l-7.0711,7.0711z"
16-
android:fillColor="#ffffff"/>
16+
android:fillColor="#000"/>
1717
</vector>

‎ui/theme/src/main/kotlin/com/getcode/theme/Color.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ val TextSecondary = BrandLight
4747
val TextTertiary = BrandMuted
4848
val TextError = Alert
4949

50-
val SystemGreen = Color(0xFF04C759)
51-
5250
val TopNotification = Color(0xFF4f49ce)
5351
val TopNeutral = Color(0xFF747474)
5452

0 commit comments

Comments
 (0)