diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml index e1c2294119..db979e464e 100644 --- a/core/res/src/main/res/values-ja/strings.xml +++ b/core/res/src/main/res/values-ja/strings.xml @@ -692,6 +692,7 @@ Manaレベル 暗号資産および取引の追跡を開始するには、トークンを追加してください トークンの管理 + QRコードをスキャンして送金するか、アプリに接続します。 すべてのネットワークにアクセスするには、カードをスキャンする必要があります。 カードまたはリングをスキャンする 2月%2$s - %3$sの期間、Changelly経由のスワップは%1$sのサービス手数料となります。 diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 32e497df40..c727172575 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -843,6 +843,7 @@ Объем торгов (24ч) Общая сумма криптовалюты, которая была продана за последние 24 часа, показывающая уровень активности и ликвидности на рынке. Объем торгов (24ч) + %s в сумме Объем Потяните вверх или коснитесь поисковой строки, чтобы добавить токены напрямую из рынка Добавить токены diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 7e5f655ad3..3d4d8d7a48 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -737,6 +737,8 @@ Earn with Tangem To generate addresses for selected networks, you must scan your Tangem Wallet card or ring To add tokens pull this up or tap the search bar + Swipe up to explore the market + Find new hidden gems This section’s data is sourced from the following networks: %s Unable to load the data… No data @@ -826,9 +828,11 @@ Total supply The maximum number of coins or tokens that can ever exist for a particular cryptocurrency Total supply + 24h Trading volume (24h) The total amount of a cryptocurrency that has been traded within the last 24 hours, indicating the level of activity and liquidity in the market Trading volume (24h) + %s in total Volume Pull this up or tap the search bar to add tokens directly from the market Add tokens diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/MarketsHint.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/MarketsHint.kt index 32c059a463..c34f8e901b 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/MarketsHint.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/MarketsHint.kt @@ -5,9 +5,10 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.text.InlineTextContent -import androidx.compose.foundation.text.appendInlineContent +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.size import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -15,17 +16,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.Placeholder -import androidx.compose.ui.text.PlaceholderVerticalAlign -import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview +import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.feature.wallet.impl.R -private const val STARS_INLINE_CONTENT_ID = "stars" - @Composable internal fun MarketsHint(isVisible: Boolean, modifier: Modifier = Modifier) { AnimatedVisibility( @@ -36,41 +33,28 @@ internal fun MarketsHint(isVisible: Boolean, modifier: Modifier = Modifier) { ) { Column( horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens2.x1), ) { Text( - text = "Swipe up to explore the market", // todo redesign main lokalise - style = TangemTheme.typography2.bodyRegular14, + text = stringResourceSafe(R.string.markets_hint_part_one), + style = TangemTheme.typography2.bodyRegular15, color = TangemTheme.colors2.text.neutral.primary, textAlign = TextAlign.Center, ) - Text( - text = buildAnnotatedString { - append("Find new hidden gems ") // todo redesign main lokalise - appendInlineContent( - STARS_INLINE_CONTENT_ID, - alternateText = "\uDBC0\uDDBF", - ) - }, - inlineContent = mapOf( - STARS_INLINE_CONTENT_ID to InlineTextContent( - placeholder = Placeholder( - width = TangemTheme.typography2.bodyRegular14.fontSize, - height = TangemTheme.typography2.bodyRegular14.fontSize, - placeholderVerticalAlign = PlaceholderVerticalAlign.Center, - ), - children = { - Icon( - imageVector = ImageVector.vectorResource(R.drawable.ic_magic_default_24), - tint = TangemTheme.colors2.text.neutral.tertiary, - contentDescription = null, - ) - }, - ), - ), - style = TangemTheme.typography2.bodyRegular14, - color = TangemTheme.colors2.text.neutral.tertiary, - textAlign = TextAlign.Center, - ) + Row(horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens2.x1)) { + Text( + text = stringResourceSafe(R.string.markets_hint_part_two), + style = TangemTheme.typography2.bodyRegular15, + color = TangemTheme.colors2.text.neutral.tertiary, + textAlign = TextAlign.Center, + ) + Icon( + imageVector = ImageVector.vectorResource(R.drawable.ic_magic_default_24), + tint = TangemTheme.colors2.text.neutral.tertiary, + contentDescription = null, + modifier = Modifier.size(TangemTheme.dimens2.x5), + ) + } } } }