From 795877a53de05a4ad46914b710af9be5762d3490 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 15 Dec 2022 14:16:22 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/core/ui/components/Cards.kt | 28 +++++++++++++++---- .../components/appbar/AppBarWithBackButton.kt | 6 ++-- core/ui/src/main/res/drawable/ic_check_24.xml | 10 +++++++ core/ui/src/main/res/drawable/ic_check_40.xml | 10 ------- .../res/drawable/ic_exchange_vertical_24.xml | 2 +- .../src/main/res/drawable/img_polygon_22.xml | 13 +++++++++ .../res/drawable/img_polygon_round_16.xml | 13 --------- 7 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 core/ui/src/main/res/drawable/ic_check_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_check_40.xml create mode 100644 core/ui/src/main/res/drawable/img_polygon_22.xml delete mode 100644 core/ui/src/main/res/drawable/img_polygon_round_16.xml diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt index 2a8e167e49..8eb31f6669 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt @@ -38,13 +38,23 @@ import com.valentinilk.shimmer.shimmer * >Figma component */ @Composable -fun SmallInfoCard(startText: String, endText: String, isLoading: Boolean = false) { +fun SmallInfoCard( + modifier: Modifier = Modifier, + startText: String, + endText: String, + isLoading: Boolean = false, +) { Surface( shape = RoundedCornerShape(TangemTheme.dimens.radius12), color = TangemTheme.colors.background.primary, elevation = TangemTheme.dimens.elevation2, ) { - CardInfoBox(startText = startText, endText = endText, isLoading = isLoading) + CardInfoBox( + modifier = modifier, + startText = startText, + endText = endText, + isLoading = isLoading, + ) } } @@ -60,6 +70,7 @@ fun SmallInfoCard(startText: String, endText: String, isLoading: Boolean = false */ @Composable fun SmallInfoCardWithWarning( + modifier: Modifier = Modifier, startText: String, endText: String, warningText: String, @@ -70,7 +81,7 @@ fun SmallInfoCardWithWarning( elevation = TangemTheme.dimens.elevation2, ) { Column( - modifier = Modifier + modifier = modifier .fillMaxWidth(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, @@ -136,6 +147,7 @@ fun SmallInfoCardWithWarning( */ @Composable fun CardWithIcon( + modifier: Modifier = Modifier, title: String, description: String, icon: @Composable () -> Unit, @@ -147,6 +159,7 @@ fun CardWithIcon( elevation = TangemTheme.dimens.elevation2, ) { IconWithTitleAndDescription( + modifier = modifier, title = title, description = description, icon = icon, @@ -228,9 +241,14 @@ fun IconWithTitleAndDescription( // region elements @Composable -private fun CardInfoBox(startText: String, endText: String, isLoading: Boolean = false) { +private fun CardInfoBox( + modifier: Modifier = Modifier, + startText: String, + endText: String, + isLoading: Boolean = false, +) { Row( - modifier = Modifier + modifier = modifier .fillMaxWidth() .height(TangemTheme.dimens.size48) .padding( diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt index 863de765e1..a5ecdac8f2 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt @@ -1,5 +1,6 @@ package com.tangem.core.ui.components.appbar +import androidx.annotation.DrawableRes import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -13,7 +14,6 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview @@ -32,7 +32,7 @@ import com.tangem.core.ui.res.TangemTheme @Composable fun AppBarWithBackButton( text: String? = null, - navigationIcon: Painter? = null, + @DrawableRes iconRes: Int? = null, onBackClick: () -> Unit, ) { Row( @@ -44,7 +44,7 @@ fun AppBarWithBackButton( verticalAlignment = Alignment.CenterVertically, ) { Icon( - painter = navigationIcon ?: painterResource(R.drawable.ic_back_24), + painter = painterResource(iconRes ?: R.drawable.ic_back_24), contentDescription = null, modifier = Modifier .size(size = dimensionResource(R.dimen.size24)) diff --git a/core/ui/src/main/res/drawable/ic_check_24.xml b/core/ui/src/main/res/drawable/ic_check_24.xml new file mode 100644 index 0000000000..d3e69cbd22 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_check_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_check_40.xml b/core/ui/src/main/res/drawable/ic_check_40.xml deleted file mode 100644 index 00f79c9226..0000000000 --- a/core/ui/src/main/res/drawable/ic_check_40.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_exchange_vertical_24.xml b/core/ui/src/main/res/drawable/ic_exchange_vertical_24.xml index 3ba7904b83..ddc06b2448 100644 --- a/core/ui/src/main/res/drawable/ic_exchange_vertical_24.xml +++ b/core/ui/src/main/res/drawable/ic_exchange_vertical_24.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/core/ui/src/main/res/drawable/img_polygon_22.xml b/core/ui/src/main/res/drawable/img_polygon_22.xml new file mode 100644 index 0000000000..efb2fff8c1 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_polygon_22.xml @@ -0,0 +1,13 @@ + + + + diff --git a/core/ui/src/main/res/drawable/img_polygon_round_16.xml b/core/ui/src/main/res/drawable/img_polygon_round_16.xml deleted file mode 100644 index 9a8e109166..0000000000 --- a/core/ui/src/main/res/drawable/img_polygon_round_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -