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 2026-06-19 12:37:29 +03:00
parent a6e7008772
commit 5fce0646d8
6 changed files with 99 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionItem.kt
View file

@ -16,6 +16,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@ -25,6 +26,8 @@ import androidx.compose.ui.layout.layoutId
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
@ -201,9 +204,15 @@ private fun SubtitleText(subtitle: ContentSubtitle, status: Status, modifier: Mo
overflow = TextOverflow.Ellipsis,
modifier = modifier,
)
is ContentSubtitle.PlainAddress -> PlainAddressText(
subtitle = subtitle,
status = status,
modifier = modifier,
)
is ContentSubtitle.ExternalAddress -> InlineImageSubtitle(
template = stringResourceSafe(subtitle.direction.templateResId(), subtitle.briefAddress),
color = tertiary,
afterIconColor = if (isFailed) tertiary else primary,
modifier = modifier,
) {
IdentIcon(
@ -256,6 +265,33 @@ private fun SubtitleText(subtitle: ContentSubtitle, status: Status, modifier: Mo
}
}
@Composable
private fun PlainAddressText(subtitle: ContentSubtitle.PlainAddress, status: Status, modifier: Modifier = Modifier) {
val full = subtitle.text.resolveReference()
val highlightColor = if (status is Status.Failed) {
TangemTheme.colors2.text.neutral.tertiary
} else {
TangemTheme.colors2.text.neutral.primary
}
val text = remember(full, subtitle.highlight, highlightColor) {
buildAnnotatedString {
append(full)
val start = full.lastIndexOf(subtitle.highlight)
if (start >= 0) {
addStyle(SpanStyle(color = highlightColor), start, start + subtitle.highlight.length)
}
}
}
Text(
text = text,
color = TangemTheme.colors2.text.neutral.tertiary,
style = TangemTheme.typography2.captionMedium12,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = modifier,
)
}
private fun ContentSubtitle.Direction.templateResId(): Int = when (this) {
ContentSubtitle.Direction.TO -> R.string.transaction_history_to_inline_address
ContentSubtitle.Direction.FROM -> R.string.transaction_history_from_inline_address

9
core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionItemUM.kt
View file

@ -55,9 +55,16 @@ sealed interface TransactionItemUM {
/** Subtitle variants for [Content] rows. */
@Immutable
sealed interface ContentSubtitle {
/** Plain text — for types without a directly-displayable address (Operation, GaslessFee, ClaimRewards, etc.). */
/** Plain text — for types without a displayable address (Operation, GaslessFee, ClaimRewards, etc.). */
data class Plain(val text: TextReference) : ContentSubtitle
/**
* Plain-text address subtitle without an identicon — renders "prefix: <address>", where [highlight]
* (a substring of the resolved [text]) is painted in the primary text color while the prefix stays
* tertiary. Used for contract / validator addresses, external swap addresses and yield "for: <address>".
*/
data class PlainAddress(val text: TextReference, val highlight: String) : ContentSubtitle
/**
* External counterparty address — renders as "to/from: <identicon> <briefAddress>".
* Used for Transfer to/from external addresses.