From 03e36961643075da70f9633095128217741c27fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CEsther?= <“essyc14@gmail.com>
Date: Fri, 7 Jul 2023 23:59:23 +0300
Subject: [PATCH 1/3] MCap
---
.../presentation/components/success/CoinItem.kt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/feature_coin_list/src/main/java/com/ryankoech/krypto/feature_coin_list/presentation/components/success/CoinItem.kt b/feature_coin_list/src/main/java/com/ryankoech/krypto/feature_coin_list/presentation/components/success/CoinItem.kt
index 23f408f8..18e92adb 100644
--- a/feature_coin_list/src/main/java/com/ryankoech/krypto/feature_coin_list/presentation/components/success/CoinItem.kt
+++ b/feature_coin_list/src/main/java/com/ryankoech/krypto/feature_coin_list/presentation/components/success/CoinItem.kt
@@ -121,6 +121,8 @@ fun CoinItem(
color = getChangeColor(coin.change)
)
Spacer(modifier = Modifier.weight(1.0f))
+ Text(text = "MCap", style = MaterialTheme.typography.body2)
+ Spacer(modifier = Modifier.width(5.dp))
Text(
modifier = Modifier
.alpha(0.6f),
From 38e9b1cc8dc61307957edbf87139ddb63e5b6afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CEsther?= <“essyc14@gmail.com>
Date: Wed, 19 Jul 2023 18:26:02 +0300
Subject: [PATCH 2/3] Changes made
---
.../krypto/common/presentation/util/Utils.kt | 33 +++++++++---
common/src/main/res/values/strings.xml | 1 +
.../components/success/CreditCard.kt | 53 +++++++++++++------
feature_home/src/main/res/values/strings.xml | 2 +
4 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt b/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt
index a85b6623..c4ad9a18 100644
--- a/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt
+++ b/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt
@@ -65,33 +65,54 @@ fun getFormattedMarketCap(context: Context, value : Long) : String {
return if(value < million) {
val df = DecimalFormat("#,###.##")
- context.getString(R.string.coin_market_cap, df.format(value), "")
- }else if(value < billion){
- context.getString(
+ val marketCapString = context.getString(R.string.market_cap)
+
+ val coinMarketCapString = context.getString(
+ (R.string.coin_market_cap), df.format(value), "")
+ return "$marketCapString $coinMarketCapString"
+
+
+ }else if(value < billion) {
+ val marketCapString = context.getString(R.string.market_cap)
+ val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / million.toDouble()),
context.getString(R.string.symbol_million)
)
+
+ return "$marketCapString $coinMarketCapString"
}else if(value < trillion){
- context.getString(
+ val marketCapString = context.getString(R.string.market_cap)
+ val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / billion.toDouble()),
context.getString(R.string.symbol_billion)
)
+
+ return "$marketCapString $coinMarketCapString"
}else if(value < quadrillion){
- context.getString(
+ val marketCapString = context.getString(R.string.market_cap)
+ val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / trillion.toDouble()),
context.getString(R.string.symbol_trillion)
)
+ return "$coinMarketCapString $marketCapString"
}else if(value < quintillion){
- context.getString(
+ val marketCapString = context.getString(R.string.market_cap)
+ val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / quadrillion.toDouble()),
context.getString(R.string.symbol_quadrillion)
)
+ return "$marketCapString $coinMarketCapString"
+
}else {
+ val marketCapString = context.getString(R.string.market_cap)
+ val coinMarketCapString =
context.getString(R.string.symbol_quintillion_fallback, "$")
+ return "$marketCapString $coinMarketCapString"
+
}
}
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index cc73f562..1a9eac29 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -10,4 +10,5 @@
Tr
Qdr
Over %s1 Qnt
+ MCap
\ No newline at end of file
diff --git a/feature_home/src/main/java/com/ryankoech/krypto/feature_home/presentation/components/success/CreditCard.kt b/feature_home/src/main/java/com/ryankoech/krypto/feature_home/presentation/components/success/CreditCard.kt
index 094a8024..c3bec63b 100644
--- a/feature_home/src/main/java/com/ryankoech/krypto/feature_home/presentation/components/success/CreditCard.kt
+++ b/feature_home/src/main/java/com/ryankoech/krypto/feature_home/presentation/components/success/CreditCard.kt
@@ -38,7 +38,7 @@ import com.ryankoech.krypto.feature_home.R
@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun CreditCard(
- onChangeDisplayCurrency : () -> Unit,
+ onChangeDisplayCurrency: () -> Unit,
creditCardDetails: CreditCardDetails,
modifier: Modifier = Modifier
) {
@@ -67,49 +67,61 @@ fun CreditCard(
)
),
) {
- Row (Modifier.fillMaxSize()){
+ Row(Modifier.fillMaxSize()) {
Column(
Modifier
.background(color = Color.Black)
.width(60.dp)
.fillMaxHeight()
- ) {
+ ) {
Box(
modifier = Modifier
.padding(top = 30.dp, end = 5.dp)
.fillMaxWidth()
) {
Text(
- text = "Wallet",
+ text = stringResource(R.string.wallet),
color = Color.White,
modifier = Modifier.rotate(270f)
)
}
Column(
- Modifier.padding(top = 90.dp, start = 18.dp )
+ Modifier.padding(top = 90.dp, start = 18.dp)
) {
- Image(painter = painterResource(id = R.drawable.baseline_circle_white), contentDescription = null,Modifier.size(10.dp))
- Image(painter = painterResource(id = R.drawable.baseline_circle_white), contentDescription = null,Modifier.size(10.dp))
- Image(painter = painterResource(id = R.drawable.baseline_circle_green), contentDescription = null,Modifier.size(10.dp))
+ Image(
+ painter = painterResource(id = R.drawable.baseline_circle_white),
+ contentDescription = null,
+ Modifier.size(10.dp)
+ )
+ Image(
+ painter = painterResource(id = R.drawable.baseline_circle_white),
+ contentDescription = null,
+ Modifier.size(10.dp)
+ )
+ Image(
+ painter = painterResource(id = R.drawable.baseline_circle_white),
+ contentDescription = null,
+ Modifier.size(10.dp)
+ .background(color = Color.Green),
+ )
}
-
+
}
Box(
Modifier
.width(5.dp)
.fillMaxHeight()
- .background(color = Color.White)) {
- // Spacer
+ .background(color = Color.White)
+ ) {
}
Column(
modifier = Modifier
.padding(16.dp)
-// .fillMaxSize()
) {
Row {
@@ -120,10 +132,10 @@ fun CreditCard(
Spacer(modifier = Modifier.weight(1.0f))
Card(
modifier = Modifier
- .clickable{
+ .clickable {
onChangeDisplayCurrency()
},
- border = BorderStroke(1.dp,Color.Black),
+ border = BorderStroke(1.dp, Color.Black),
backgroundColor = teaGreen200,
elevation = 0.dp,
shape = MaterialTheme.shapes.small
@@ -149,7 +161,11 @@ fun CreditCard(
}
Text(
- text = getFormattedBalance(context, creditCardDetails.balance, creditCardDetails.displayCurrency),
+ text = getFormattedBalance(
+ context,
+ creditCardDetails.balance,
+ creditCardDetails.displayCurrency
+ ),
style = MaterialTheme.typography.h1,
fontSize = 32.sp
)
@@ -160,7 +176,11 @@ fun CreditCard(
verticalAlignment = Alignment.CenterVertically
) {
Text(
- text = pluralStringResource(R.plurals.credit_card_assets, creditCardDetails.count, creditCardDetails.count),
+ text = pluralStringResource(
+ R.plurals.credit_card_assets,
+ creditCardDetails.count,
+ creditCardDetails.count
+ ),
style = MaterialTheme.typography.h4,
fontSize = 13.sp
)
@@ -188,7 +208,6 @@ fun CreditCard(
}
-
@Preview
@Composable
private fun CreditCardPreview() {
diff --git a/feature_home/src/main/res/values/strings.xml b/feature_home/src/main/res/values/strings.xml
index 5c5d4fa4..4f3e61b1 100644
--- a/feature_home/src/main/res/values/strings.xml
+++ b/feature_home/src/main/res/values/strings.xml
@@ -13,6 +13,8 @@
Try Again
Such emptiness
Add Your first Coin
+ Wallet
+
- %d Asset
- %d Assets
From 52371e2c6a87682b9a7cb711fbba52381d9ca54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CEsther?= <“essyc14@gmail.com>
Date: Wed, 26 Jul 2023 20:07:23 +0300
Subject: [PATCH 3/3] ui/20
---
.../krypto/common/presentation/util/Utils.kt | 20 +++++++------------
common/src/main/res/values/strings.xml | 5 +++--
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt b/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt
index c4ad9a18..09df4f82 100644
--- a/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt
+++ b/common/src/main/java/com/ryankoech/krypto/common/presentation/util/Utils.kt
@@ -65,53 +65,47 @@ fun getFormattedMarketCap(context: Context, value : Long) : String {
return if(value < million) {
val df = DecimalFormat("#,###.##")
- val marketCapString = context.getString(R.string.market_cap)
val coinMarketCapString = context.getString(
(R.string.coin_market_cap), df.format(value), "")
- return "$marketCapString $coinMarketCapString"
+ return " $coinMarketCapString"
}else if(value < billion) {
- val marketCapString = context.getString(R.string.market_cap)
val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / million.toDouble()),
context.getString(R.string.symbol_million)
)
- return "$marketCapString $coinMarketCapString"
+ return " $coinMarketCapString"
}else if(value < trillion){
- val marketCapString = context.getString(R.string.market_cap)
val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / billion.toDouble()),
context.getString(R.string.symbol_billion)
)
- return "$marketCapString $coinMarketCapString"
+ return " $coinMarketCapString"
}else if(value < quadrillion){
- val marketCapString = context.getString(R.string.market_cap)
val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / trillion.toDouble()),
context.getString(R.string.symbol_trillion)
)
- return "$coinMarketCapString $marketCapString"
+ return "$coinMarketCapString "
}else if(value < quintillion){
- val marketCapString = context.getString(R.string.market_cap)
val coinMarketCapString = context.getString(
R.string.coin_market_cap,
getInFourDecimalPlaces(value.toDouble() / quadrillion.toDouble()),
context.getString(R.string.symbol_quadrillion)
)
- return "$marketCapString $coinMarketCapString"
+ return " $coinMarketCapString"
}else {
- val marketCapString = context.getString(R.string.market_cap)
val coinMarketCapString =
- context.getString(R.string.symbol_quintillion_fallback, "$")
- return "$marketCapString $coinMarketCapString"
+ context.getString(R.string.symbol_quintillion_fallback_mcap, "$")
+ return " $coinMarketCapString"
}
}
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 1a9eac29..9bbf1c30 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -3,12 +3,13 @@
%s Image
%s%s%%
%s%s %s
- $%s %s
+ MCap $%s %s
%s %s
M
Bn
Tr
Qdr
Over %s1 Qnt
- MCap
+ Mcap Over %s1 Qnt
+
\ No newline at end of file