From 1c2e973e07967463d8f08e9b39041cd893aa8bf8 Mon Sep 17 00:00:00 2001 From: Wadeewee Date: Thu, 18 Aug 2022 09:00:56 +0700 Subject: [PATCH] [#5] Apply code from review --- .../crypto/ui/screens/home/CoinItem.kt | 11 +++---- .../crypto/ui/screens/home/HomeScreen.kt | 31 ++++++++++--------- .../crypto/ui/screens/home/PortfolioCard.kt | 6 +--- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/CoinItem.kt b/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/CoinItem.kt index 2ddea52c..1eba485c 100644 --- a/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/CoinItem.kt +++ b/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/CoinItem.kt @@ -44,6 +44,7 @@ fun CoinItem( .wrapContentWidth() .clip(RoundedCornerShape(Dp12)) .background(color = MaterialTheme.colors.coinItemColor) + .padding(horizontal = Dp8, vertical = Dp8) ) { val ( logo, @@ -57,7 +58,7 @@ fun CoinItem( Image( modifier = Modifier .size(Dp60) - .padding(start = Dp8, end = Dp16, top = Dp8) + .padding(end = Dp16) .constrainAs(logo) { top.linkTo(coinSymbol.top) bottom.linkTo(coinName.bottom) @@ -70,7 +71,6 @@ fun CoinItem( Text( modifier = Modifier - .padding(end = Dp8, top = Dp8) .constrainAs(coinSymbol) { top.linkTo(parent.top) start.linkTo(logo.end) @@ -83,7 +83,7 @@ fun CoinItem( Text( modifier = Modifier - .padding(end = Dp8, top = Dp4) + .padding(top = Dp4) .constrainAs(coinName) { start.linkTo(coinSymbol.start) top.linkTo(coinSymbol.bottom) @@ -97,7 +97,7 @@ fun CoinItem( Text( modifier = Modifier - .padding(start = Dp8, end = Dp8, top = Dp22, bottom = Dp8) + .padding(top = Dp22) .constrainAs(price) { start.linkTo(logo.start) top.linkTo(coinName.bottom) @@ -111,7 +111,7 @@ fun CoinItem( Icon( modifier = Modifier - .padding(start = Dp25, bottom = Dp8) + .padding(start = Dp25) .constrainAs(icon) { start.linkTo(price.end) top.linkTo(priceChange.top) @@ -125,7 +125,6 @@ fun CoinItem( Text( modifier = Modifier - .padding(start = Dp8, end = Dp8, bottom = Dp8) .constrainAs(priceChange) { start.linkTo(icon.end) bottom.linkTo(parent.bottom) diff --git a/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/HomeScreen.kt b/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/HomeScreen.kt index ae3d49f0..e8b271ec 100644 --- a/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/HomeScreen.kt +++ b/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/HomeScreen.kt @@ -24,9 +24,7 @@ import co.nimblehq.compose.crypto.ui.theme.Style.textColor fun HomeScreen() { Surface { ConstraintLayout( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = Dp16) + modifier = Modifier.fillMaxSize() ) { val ( title, @@ -38,7 +36,7 @@ fun HomeScreen() { Text( modifier = Modifier - .padding(start = Dp16, top = Dp16, end = Dp16) + .padding(top = Dp16) .constrainAs(title) { top.linkTo(parent.top) linkTo(start = parent.start, end = parent.end) @@ -51,18 +49,21 @@ fun HomeScreen() { ) PortfolioCard( - modifier = Modifier.constrainAs(portfolioCard) { - top.linkTo(title.bottom, margin = Dp40) - } + modifier = Modifier + .constrainAs(portfolioCard) { + top.linkTo(title.bottom, margin = Dp40) + } + .padding(horizontal = Dp16) ) Text( - modifier = Modifier.constrainAs(myCoinsTitle) { - top.linkTo(portfolioCard.bottom, margin = Dp52) - start.linkTo(parent.start) - width = Dimension.preferredWrapContent - - }, + modifier = Modifier + .constrainAs(myCoinsTitle) { + top.linkTo(portfolioCard.bottom, margin = Dp52) + start.linkTo(parent.start) + width = Dimension.preferredWrapContent + } + .padding(start = Dp16), text = stringResource(id = R.string.home_my_coins_title), style = Style.medium16(), color = MaterialTheme.colors.textColor @@ -76,6 +77,7 @@ fun HomeScreen() { end.linkTo(parent.end) width = Dimension.preferredWrapContent } + .padding(end = Dp16) ) LazyRow( @@ -84,7 +86,8 @@ fun HomeScreen() { .constrainAs(myCoins) { top.linkTo(myCoinsTitle.bottom, margin = Dp16) }, - horizontalArrangement = Arrangement.spacedBy(Dp16) + contentPadding = PaddingValues(horizontal = Dp16), + horizontalArrangement = Arrangement.spacedBy(Dp16), ) { // TODO: Remove dummy value when work on Integrate. item { CoinItem() } diff --git a/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/PortfolioCard.kt b/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/PortfolioCard.kt index 2c0f9051..f06d9760 100644 --- a/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/PortfolioCard.kt +++ b/app/src/main/java/co/nimblehq/compose/crypto/ui/screens/home/PortfolioCard.kt @@ -41,6 +41,7 @@ fun PortfolioCard( colors = listOf(Color.MetallicSeaweed, Color.TiffanyBlue), ) ) + .padding(horizontal = Dp16, vertical = Dp16) ) { val ( totalCoinsLabel, @@ -52,7 +53,6 @@ fun PortfolioCard( Text( modifier = Modifier - .padding(top = Dp16, start = Dp16) .constrainAs(totalCoinsLabel) { start.linkTo(parent.start) }, @@ -62,7 +62,6 @@ fun PortfolioCard( Text( modifier = Modifier - .padding(horizontal = Dp16) .constrainAs(totalCoins) { top.linkTo(totalCoinsLabel.bottom, margin = Dp8) }, @@ -73,7 +72,6 @@ fun PortfolioCard( Text( modifier = Modifier - .padding(start = Dp16) .constrainAs(todayProfitLabel) { top.linkTo(totalCoins.bottom, margin = Dp40) }, @@ -83,7 +81,6 @@ fun PortfolioCard( Text( modifier = Modifier - .padding(start = Dp16, bottom = Dp16) .constrainAs(todayProfit) { top.linkTo(todayProfitLabel.bottom, margin = Dp8) }, @@ -94,7 +91,6 @@ fun PortfolioCard( Button( modifier = Modifier - .padding(start = Dp16, end = Dp16, bottom = Dp16) .shadow(elevation = Dp0) .constrainAs(profitPercent) { linkTo(top = todayProfitLabel.top, bottom = todayProfit.bottom)