GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2022-12-28 12:09:33 +03:00
parent 8d86f45d50
commit 95ca2b1249
13 changed files with 64 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt
View file

@ -6,18 +6,13 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.tooling.preview.Preview
import com.tangem.core.ui.R
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.TextColorType
import com.tangem.core.ui.res.textColor
@Preview(widthDp = 328, heightDp = 48, showBackground = true)
@Composable
@ -48,7 +43,7 @@ fun Preview_SimpleInfoCard_InDarkTheme() {
fun SmallInfoCard(startText: String, endText: String) {
Surface(
shape = RoundedCornerShape(TangemTheme.dimens.radius12),
color = MaterialTheme.colors.secondary,
color = TangemTheme.colors.background.secondary,
elevation = TangemTheme.dimens.elevation2,
) {
Row(
@ -60,19 +55,19 @@ fun SmallInfoCard(startText: String, endText: String) {
vertical = TangemTheme.dimens.spacing12,
),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = startText,
color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY),
color = TangemTheme.colors.text.tertiary,
maxLines = 1,
style = MaterialTheme.typography.subtitle2
style = TangemTheme.typography.subtitle2,
)
Text(
text = endText,
color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
color = TangemTheme.colors.text.primary1,
maxLines = 1,
style = MaterialTheme.typography.body2
style = TangemTheme.typography.body2,
)
}
}

14
core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithAdditionalButtons.kt
View file

@ -7,21 +7,15 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import com.tangem.core.ui.R
import com.tangem.core.ui.components.appbar.models.AdditionalButton
import com.tangem.core.ui.res.IconColorType
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.TextColorType
import com.tangem.core.ui.res.iconColor
import com.tangem.core.ui.res.textColor
/**
* App bar with title and two additional buttons
@ -50,7 +44,7 @@ fun AppBarWithAdditionalButtons(
painter = painterResource(id = startButton.iconRes),
contentDescription = null,
modifier = Modifier.size(TangemTheme.dimens.size24),
tint = MaterialTheme.colors.iconColor(type = IconColorType.PRIMARY1),
tint = TangemTheme.colors.icon.primary1,
)
}
}
@ -58,9 +52,9 @@ fun AppBarWithAdditionalButtons(
Text(
text = text,
modifier = Modifier.align(Alignment.Center),
color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
color = TangemTheme.colors.text.primary1,
maxLines = 1,
style = MaterialTheme.typography.subtitle1,
style = TangemTheme.typography.subtitle1,
)
if (endButton != null) {
@ -69,7 +63,7 @@ fun AppBarWithAdditionalButtons(
painter = painterResource(id = endButton.iconRes),
contentDescription = null,
modifier = Modifier.size(TangemTheme.dimens.size24),
tint = MaterialTheme.colors.iconColor(type = IconColorType.PRIMARY1),
tint = TangemTheme.colors.icon.primary1,
)
}
}

13
core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
View file

@ -1,6 +1,5 @@
package com.tangem.core.ui.components.appbar
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
@ -8,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@ -29,10 +27,9 @@ import com.tangem.core.ui.res.TangemTheme
* >Figma component</a>
*/
@Composable
fun AppBarWithBackButton(text: String? = null, onBackClick: () -> Unit) {
fun AppBarWithBackButton(text: String? = null, onBackClick: () -> Unit, modifier: Modifier = Modifier) {
Row(
modifier = Modifier
.background(MaterialTheme.colors.primary)
modifier = modifier
.fillMaxWidth()
.padding(all = dimensionResource(R.dimen.spacing16)),
horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing16)),
@ -44,14 +41,14 @@ fun AppBarWithBackButton(text: String? = null, onBackClick: () -> Unit) {
modifier = Modifier
.size(size = dimensionResource(R.dimen.size24))
.clickable { onBackClick() },
tint = MaterialTheme.colors.onPrimary,
tint = TangemTheme.colors.icon.primary1,
)
if (!text.isNullOrBlank()) {
Text(
text = text,
color = MaterialTheme.colors.onPrimary,
color = TangemTheme.colors.text.primary1,
maxLines = 1,
style = MaterialTheme.typography.subtitle1,
style = TangemTheme.typography.subtitle1,
)
}
}

61
core/ui/src/main/java/com/tangem/core/ui/components/atoms/BottomSheetIndicator.kt
View file

@ -1,61 +0,0 @@
package com.tangem.core.ui.components.atoms
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.tooling.preview.Preview
import com.tangem.core.ui.R
import com.tangem.core.ui.res.IconColorType
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.iconColor
/**
* Bottom sheet indicator
*
* @see <a href="https://www.figma.com/file/17JyRbuUEZ42DluaFEuGQk/Atoms?node-id=135%3A25&t=3dvxYMZBox4jxJc1-4">
* Figma Component</a>
*/
@Deprecated(message = "Use Hand component instead")
@Composable
fun BottomSheetIndicator() {
Box(
modifier = Modifier
.fillMaxWidth()
.height(TangemTheme.dimens.size20),
contentAlignment = Alignment.Center,
) {
Box(
modifier = Modifier
.width(TangemTheme.dimens.size32)
.height(TangemTheme.dimens.size4)
.background(
color = MaterialTheme.colors.iconColor(type = IconColorType.INACTIVE),
shape = RoundedCornerShape(TangemTheme.dimens.radius2),
),
)
}
}
@Preview(heightDp = 20, showBackground = true)
@Composable
fun Preview_BottomSheetIndicator_InLightTheme() {
TangemTheme(isDark = false) {
BottomSheetIndicator()
}
}
@Preview(heightDp = 20, showBackground = true)
@Composable
fun Preview_BottomSheetIndicator_InDarkTheme() {
TangemTheme(isDark = true) {
BottomSheetIndicator()
}
}