From 51a5ea7892f1bcf62798cb9f4b6d471c203f12e2 Mon Sep 17 00:00:00 2001 From: chyngyz Date: Tue, 4 Jun 2024 15:05:43 +0600 Subject: [PATCH] Add circular clipping for coin images --- .../bankwallet/modules/coin/ui/CoinScreenTitle.kt | 4 +++- .../modules/managewallets/ManageWalletsFragment.kt | 2 ++ .../bankwallet/modules/market/search/MarketSearchFragment.kt | 3 +++ .../bankwallet/ui/compose/components/ComposeUtils.kt | 5 +++-- .../bankwallet/ui/compose/components/MarketCell.kt | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/ui/CoinScreenTitle.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/ui/CoinScreenTitle.kt index 8f4ece42ef..4ed959b9f2 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/ui/CoinScreenTitle.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/ui/CoinScreenTitle.kt @@ -2,8 +2,10 @@ package io.horizontalsystems.bankwallet.modules.coin.ui import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -28,7 +30,7 @@ fun CoinScreenTitle( url = coinIconUrl, alternativeUrl = alternativeCoinIconUrl, placeholder = iconPlaceholder, - modifier = Modifier.size(32.dp) + modifier = Modifier.size(32.dp).clip(CircleShape) ) body_grey( diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/managewallets/ManageWalletsFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/managewallets/ManageWalletsFragment.kt index 1cd4daa166..733ea52717 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/managewallets/ManageWalletsFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/managewallets/ManageWalletsFragment.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Divider import androidx.compose.material.Icon @@ -181,6 +182,7 @@ private fun CoinCell( modifier = Modifier .padding(end = 16.dp, top = 12.dp, bottom = 12.dp) .size(32.dp) + .clip(CircleShape) ) Column( modifier = Modifier diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/search/MarketSearchFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/search/MarketSearchFragment.kt index e4fe66ba1a..488c16f349 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/search/MarketSearchFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/search/MarketSearchFragment.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.Divider import androidx.compose.material.Icon import androidx.compose.runtime.Composable @@ -29,6 +30,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -268,6 +270,7 @@ private fun MarketCoin( modifier = Modifier .padding(end = 16.dp) .size(32.dp) + .clip(CircleShape) ) Column( modifier = Modifier.weight(1f) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ComposeUtils.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ComposeUtils.kt index becf733828..4dc87e11c6 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ComposeUtils.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ComposeUtils.kt @@ -2,6 +2,7 @@ package io.horizontalsystems.bankwallet.ui.compose.components import androidx.compose.foundation.Image import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -55,7 +56,7 @@ fun CoinImage( url = coin?.imageUrl, alternativeUrl = coin?.alternativeImageUrl, placeholder = coin?.imagePlaceholder, - modifier = modifier, + modifier = modifier.clip(CircleShape), colorFilter = colorFilter ) @@ -68,7 +69,7 @@ fun CoinImage( url = token?.coin?.imageUrl, alternativeUrl = token?.coin?.alternativeImageUrl, placeholder = token?.iconPlaceholder, - modifier = modifier, + modifier = modifier.clip(CircleShape), colorFilter = colorFilter ) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/MarketCell.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/MarketCell.kt index 89f15752f3..bc3ac9b568 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/MarketCell.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/MarketCell.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Text import androidx.compose.runtime.Composable @@ -98,6 +99,7 @@ fun MarketCoin( modifier = Modifier .padding(end = 16.dp) .size(32.dp) + .clip(CircleShape) ) Column( modifier = Modifier.fillMaxWidth()