Skip to content

Commit f7e935b

Browse files
authored
Merge pull request #164 from mhmd-android/optimize/price-change-colors-in-market-list
Optimize/price change colors in market list
2 parents 64f042b + 46d16a1 commit f7e935b

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

library/designsystem/src/main/java/ir/composenews/designsystem/component/MarketItem.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,17 @@ import androidx.compose.runtime.setValue
4242
import androidx.compose.ui.Alignment
4343
import androidx.compose.ui.Modifier
4444
import androidx.compose.ui.draw.clip
45-
import androidx.compose.ui.graphics.Color.Companion.Green
46-
import androidx.compose.ui.graphics.Color.Companion.Red
4745
import androidx.compose.ui.platform.LocalDensity
4846
import androidx.compose.ui.res.painterResource
4947
import androidx.compose.ui.unit.dp
5048
import coil.compose.rememberAsyncImagePainter
5149
import ir.composenews.designsystem.R
5250
import ir.composenews.designsystem.preview.ThemePreviews
5351
import ir.composenews.designsystem.theme.ComposeNewsTheme
52+
import ir.composenews.designsystem.theme.darkDownTrendRed
53+
import ir.composenews.designsystem.theme.darkUptrendGreen
54+
import ir.composenews.designsystem.theme.lightDownTrendRed
55+
import ir.composenews.designsystem.theme.lightUptrendGreen
5456
import kotlinx.coroutines.delay
5557
import java.util.Locale
5658

@@ -192,7 +194,8 @@ private fun MarketItemCard(
192194
Text(
193195
text = "$priceChangePercentage24h %",
194196
style = MaterialTheme.typography.bodyLarge,
195-
color = if (priceChangePercentage24h.contains("-")) Red else Green,
197+
color = if (priceChangePercentage24h.contains("-")) if (isSystemInDarkTheme()) darkDownTrendRed else lightDownTrendRed
198+
else if (isSystemInDarkTheme()) darkUptrendGreen else lightUptrendGreen,
196199
)
197200
}
198201
}
@@ -215,7 +218,8 @@ private fun ArrowIconUpOrDown(priceChangePercentage24h: String) {
215218
painterResource(id = R.drawable.baseline_arrow_upward_24)
216219
},
217220
contentDescription = "",
218-
tint = if (priceChangePercentage24h.contains("-")) Red else Green,
221+
tint = if (priceChangePercentage24h.contains("-")) if (isSystemInDarkTheme()) darkDownTrendRed else lightDownTrendRed
222+
else if (isSystemInDarkTheme()) darkUptrendGreen else lightUptrendGreen,
219223
)
220224
}
221225

library/designsystem/src/main/java/ir/composenews/designsystem/theme/Color.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,7 @@ val md_theme_dark_scrim = Color(0xFF000000)
6767
// custom colors
6868
val graphColor = Color(0xFF6750A4)
6969
val lightGraphColor = graphColor.copy(alpha = 0.5f)
70+
val lightUptrendGreen = Color(0xFF4CAF50)
71+
val darkUptrendGreen = Color(0xFF00A86B)
72+
val lightDownTrendRed = Color(0xFFE50000)
73+
val darkDownTrendRed = Color(0xFFFF1919)

0 commit comments

Comments
 (0)