Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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),
)
Expand Down
8 changes: 4 additions & 4 deletions ui/resources/src/main/res/drawable/ic_checked_green.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<path
android:strokeWidth="1"
android:pathData="M13,13m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
android:fillColor="#87D300"
android:strokeColor="#87D300"/>
android:fillColor="#1AC86A"
android:strokeColor="#1AC86A"/>
<path
android:pathData="M8.4145,11.9495l4.2426,4.2426l-1.4142,1.4142l-4.2426,-4.2426z"
android:fillColor="#ffffff"/>
android:fillColor="#000"/>
<path
android:pathData="M9.8286,16.1921l7.0711,-7.0711l1.4142,1.4142l-7.0711,7.0711z"
android:fillColor="#ffffff"/>
android:fillColor="#000"/>
</vector>
2 changes: 0 additions & 2 deletions ui/theme/src/main/kotlin/com/getcode/theme/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading