Updated on 2026-08-14

This commit is contained in:
Tangem 2026-07-24 16:07:06 +02:00
parent 698f1e6047
commit d84f383cf8
29 changed files with 567 additions and 547 deletions

View file

@ -97,9 +97,11 @@ fun TangemPagerIndicator(
contentAlignment = Alignment.Center,
) {
Row(
modifier = Modifier.offset {
IntOffset(animState.slideOffset.value.roundToInt(), 0)
},
modifier = Modifier
.wrapContentWidth(unbounded = true)
.offset {
IntOffset(animState.slideOffset.value.roundToInt(), 0)
},
horizontalArrangement = Arrangement.spacedBy(SPACING),
verticalAlignment = Alignment.CenterVertically,
) {
@ -367,8 +369,8 @@ val TangemPagerIndicatorColors: PagerIndicatorColors
@Composable
@ReadOnlyComposable
get() = PagerIndicatorColors(
active = TangemTheme.colors2.graphic.neutral.primary,
inactive = TangemTheme.colors2.graphic.neutral.tertiary,
active = TangemTheme.colors3.bg.inverse,
inactive = TangemTheme.colors3.bg.opaque.secondary,
overlay = null,
)
@ -413,6 +415,7 @@ private class TangemPagerIndicatorPreviewProvider : PreviewParameterProvider<Int
1,
2,
3,
4,
5,
6,
7,

View file

@ -23,11 +23,10 @@ import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.constrainHeight
import androidx.compose.ui.unit.dp
import com.tangem.core.ui.R
import com.tangem.core.ui.ds.button.SecondaryTangemButton
import com.tangem.core.ui.ds.button.TangemButtonShape
import com.tangem.core.ui.ds.button.TangemButtonType
import com.tangem.core.ui.ds.button.TangemButtonUM
import com.tangem.core.ui.ds.image.TangemIconUM
import com.tangem.core.ui.ds2.button.TangemButton
import com.tangem.core.ui.extensions.orEmpty
import com.tangem.core.ui.extensions.resolveReference
import com.tangem.core.ui.extensions.stringReference
@ -109,12 +108,12 @@ private fun ActionButton(button: TangemButtonUM, modifier: Modifier = Modifier)
verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens2.x2),
horizontalAlignment = Alignment.CenterHorizontally,
) {
SecondaryTangemButton(
tangemIconUM = button.tangemIconUM,
TangemButton(
onClick = button.onClick,
variant = TangemButton.Variant.Material,
isEnabled = button.isEnabled,
shape = TangemButtonShape.Rounded,
onLongClick = button.onLongClick,
iconStart = button.tangemIconUM,
size = TangemButton.Size.X14,
)
Text(
text = button.text.orEmpty().resolveReference(),