Updated on 2026-08-14
This commit is contained in:
parent
9bd372d0af
commit
fc93f3649c
7 changed files with 79 additions and 10 deletions
|
|
@ -280,7 +280,7 @@
|
||||||
<string name="common_origin_ring">Primärring</string>
|
<string name="common_origin_ring">Primärring</string>
|
||||||
<string name="common_passphrase">Passphrase</string>
|
<string name="common_passphrase">Passphrase</string>
|
||||||
<string name="common_paste">Einfügen</string>
|
<string name="common_paste">Einfügen</string>
|
||||||
<string name="common_privacy_policy">Datenschutzbestimmungen</string>
|
<string name="common_privacy_policy">Datenschutzrichtlinie</string>
|
||||||
<string name="common_range">%1$s-%2$s</string>
|
<string name="common_range">%1$s-%2$s</string>
|
||||||
<string name="common_range_with_space">%1$s — %2$s</string>
|
<string name="common_range_with_space">%1$s — %2$s</string>
|
||||||
<string name="common_read_more">Weiterlesen</string>
|
<string name="common_read_more">Weiterlesen</string>
|
||||||
|
|
@ -317,6 +317,7 @@
|
||||||
<string name="common_supported_networks">Unterstützte Netzwerke</string>
|
<string name="common_supported_networks">Unterstützte Netzwerke</string>
|
||||||
<string name="common_swap">Tauschen</string>
|
<string name="common_swap">Tauschen</string>
|
||||||
<string name="common_tangem">Tangem</string>
|
<string name="common_tangem">Tangem</string>
|
||||||
|
<string name="common_tangem_wallet">Tangem Wallet</string>
|
||||||
<string name="common_terms_and_conditions">Allgemeine Geschäftsbedingungen</string>
|
<string name="common_terms_and_conditions">Allgemeine Geschäftsbedingungen</string>
|
||||||
<string name="common_terms_of_use">Nutzungsbedingungen</string>
|
<string name="common_terms_of_use">Nutzungsbedingungen</string>
|
||||||
<string name="common_today">Heute</string>
|
<string name="common_today">Heute</string>
|
||||||
|
|
@ -418,7 +419,7 @@
|
||||||
<string name="express_exchange_by">Getauscht von %s</string>
|
<string name="express_exchange_by">Getauscht von %s</string>
|
||||||
<string name="express_exchange_notification_failed_text">Besuche die Website des Anbieters, um dein Geld zurückzuerhalten</string>
|
<string name="express_exchange_notification_failed_text">Besuche die Website des Anbieters, um dein Geld zurückzuerhalten</string>
|
||||||
<string name="express_exchange_notification_failed_title">Fehler beim Vorgang durch Anbieter</string>
|
<string name="express_exchange_notification_failed_title">Fehler beim Vorgang durch Anbieter</string>
|
||||||
<string name="express_exchange_notification_long_transaction_time_text">Dein Wechsel dauert länger als erwartet. Wende Dich für Hilfe bitte an den Support Deines Anbieters.</string>
|
<string name="express_exchange_notification_long_transaction_time_text">Dein Swap dauert länger als üblich, aber Dein Geld ist absolut sicher und wird geliefert. Bei Fragen kannst Du Dich an das Support-Team des Anbieters wenden.</string>
|
||||||
<string name="express_exchange_notification_long_transaction_time_title">Lange Transaktionszeit</string>
|
<string name="express_exchange_notification_long_transaction_time_title">Lange Transaktionszeit</string>
|
||||||
<string name="express_exchange_notification_refund_text">Der Transaktionsbetrag wurde aufgrund von OKX- oder Bridge-Regeln in %1$s auf deine Wallet zurückerstattet. %2$s</string>
|
<string name="express_exchange_notification_refund_text">Der Transaktionsbetrag wurde aufgrund von OKX- oder Bridge-Regeln in %1$s auf deine Wallet zurückerstattet. %2$s</string>
|
||||||
<string name="express_exchange_notification_refund_title">Der Betrag wurde in %1$s (%2$s Netzwerk) zurückerstattet.</string>
|
<string name="express_exchange_notification_refund_title">Der Betrag wurde in %1$s (%2$s Netzwerk) zurückerstattet.</string>
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,7 @@
|
||||||
<string name="common_camera_denied_alert_message">カメラへのアクセスを許可していません。プライバシー設定を調整してください。</string>
|
<string name="common_camera_denied_alert_message">カメラへのアクセスを許可していません。プライバシー設定を調整してください。</string>
|
||||||
<string name="common_cancel">キャンセル</string>
|
<string name="common_cancel">キャンセル</string>
|
||||||
<string name="common_change">変更</string>
|
<string name="common_change">変更</string>
|
||||||
|
<string name="common_choose_account">アカウントを選択</string>
|
||||||
<string name="common_choose_action">アクションを選択</string>
|
<string name="common_choose_action">アクションを選択</string>
|
||||||
<string name="common_choose_network">ネットワークを選択</string>
|
<string name="common_choose_network">ネットワークを選択</string>
|
||||||
<string name="common_choose_token">トークンを選択</string>
|
<string name="common_choose_token">トークンを選択</string>
|
||||||
|
|
@ -1247,6 +1248,14 @@
|
||||||
<string name="swapping_to_title">受け取る</string>
|
<string name="swapping_to_title">受け取る</string>
|
||||||
<string name="swapping_token_list_title">トークンを選択</string>
|
<string name="swapping_token_list_title">トークンを選択</string>
|
||||||
<string name="swapping_token_not_available">利用不可</string>
|
<string name="swapping_token_not_available">利用不可</string>
|
||||||
|
<string name="tangempay_onboarding_get_card_button_text">カードをGET</string>
|
||||||
|
<string name="tangempay_onboarding_pay_description">ウォレットに追加して、どこでもスマートフォンで支払いができます。</string>
|
||||||
|
<string name="tangempay_onboarding_pay_title">Apple Pay & Google Pay</string>
|
||||||
|
<string name="tangempay_onboarding_purchases_description">USDC残高を使用して、毎日のお買い物をシームレスに支払います。</string>
|
||||||
|
<string name="tangempay_onboarding_purchases_title">日常の買い物</string>
|
||||||
|
<string name="tangempay_onboarding_security_description">カードの詳細は保護されており、アプリ内で完全に制御できます。</string>
|
||||||
|
<string name="tangempay_onboarding_security_title">内蔵セキュリティ</string>
|
||||||
|
<string name="tangempay_onboarding_title">無料のCryptoカード\nを数分で入手しましょう</string>
|
||||||
<string name="this_is_my_wallet_title">これは私のウォレットです</string>
|
<string name="this_is_my_wallet_title">これは私のウォレットです</string>
|
||||||
<string name="toast_balances_hidden">残高非表示</string>
|
<string name="toast_balances_hidden">残高非表示</string>
|
||||||
<string name="toast_balances_shown">残高表示</string>
|
<string name="toast_balances_shown">残高表示</string>
|
||||||
|
|
@ -1634,7 +1643,6 @@
|
||||||
<string name="yield_module_earn_sheet_current_apy_title">現在のAPY</string>
|
<string name="yield_module_earn_sheet_current_apy_title">現在のAPY</string>
|
||||||
<string name="yield_module_earn_sheet_my_funds_title">私の資金</string>
|
<string name="yield_module_earn_sheet_my_funds_title">私の資金</string>
|
||||||
<string name="yield_module_earn_sheet_provider_description">あなたの%1$sはAaveに預けられ、利息が付きます。あなたは%2$sトークンを保有しており、これは残高を表し、時間の経過とともに増加します。入金すると、資金はAaveに預け入れられ、取引手数料を差し引いた利息が付きます。</string>
|
<string name="yield_module_earn_sheet_provider_description">あなたの%1$sはAaveに預けられ、利息が付きます。あなたは%2$sトークンを保有しており、これは残高を表し、時間の経過とともに増加します。入金すると、資金はAaveに預け入れられ、取引手数料を差し引いた利息が付きます。</string>
|
||||||
<string name="yield_module_earn_sheet_status_active">アクティブ</string>
|
|
||||||
<string name="yield_module_earn_sheet_title">利回りを得る</string>
|
<string name="yield_module_earn_sheet_title">利回りを得る</string>
|
||||||
<string name="yield_module_earn_sheet_total_earnings_title">総収益</string>
|
<string name="yield_module_earn_sheet_total_earnings_title">総収益</string>
|
||||||
<string name="yield_module_earn_sheet_transfers_title">Aaveへの送金</string>
|
<string name="yield_module_earn_sheet_transfers_title">Aaveへの送金</string>
|
||||||
|
|
@ -1656,7 +1664,7 @@
|
||||||
<string name="yield_module_promo_screen_how_it_works_button_title">使い方</string>
|
<string name="yield_module_promo_screen_how_it_works_button_title">使い方</string>
|
||||||
<string name="yield_module_promo_screen_self_custodial_subtitle">Aaveは世界中で何百万人もの人々に信頼されています。総貸付額は104億ドルです。</string>
|
<string name="yield_module_promo_screen_self_custodial_subtitle">Aaveは世界中で何百万人もの人々に信頼されています。総貸付額は104億ドルです。</string>
|
||||||
<string name="yield_module_promo_screen_self_custodial_title">分散型・自己管理型</string>
|
<string name="yield_module_promo_screen_self_custodial_title">分散型・自己管理型</string>
|
||||||
<string name="yield_module_promo_screen_terms_disclaimer">サービスを使用することにより、プロバイダーに同意したものとみなされます</string>
|
<string name="yield_module_promo_screen_terms_disclaimer">サービスを利用することにより、プロバイダー\n %1$sおよび%2$sに同意したことになります</string>
|
||||||
<string name="yield_module_promo_screen_title">年間%s%%の収益</string>
|
<string name="yield_module_promo_screen_title">年間%s%%の収益</string>
|
||||||
<string name="yield_module_promo_screen_variable_rate_info">Aave • 変動金利</string>
|
<string name="yield_module_promo_screen_variable_rate_info">Aave • 変動金利</string>
|
||||||
<string name="yield_module_provider">Aave</string>
|
<string name="yield_module_provider">Aave</string>
|
||||||
|
|
@ -1670,6 +1678,7 @@
|
||||||
<string name="yield_module_start_earning_sheet_description">%sはAaveに供給され、すぐに利用可能になります</string>
|
<string name="yield_module_start_earning_sheet_description">%sはAaveに供給され、すぐに利用可能になります</string>
|
||||||
<string name="yield_module_start_earning_sheet_fee_policy">手数料ポリシーを見る</string>
|
<string name="yield_module_start_earning_sheet_fee_policy">手数料ポリシーを見る</string>
|
||||||
<string name="yield_module_start_earning_sheet_next_deposits">次回の入金は自動的にAaveに供給されます。</string>
|
<string name="yield_module_start_earning_sheet_next_deposits">次回の入金は自動的にAaveに供給されます。</string>
|
||||||
|
<string name="yield_module_status_active">アクティブ</string>
|
||||||
<string name="yield_module_stop_earning">収益を停止する</string>
|
<string name="yield_module_stop_earning">収益を停止する</string>
|
||||||
<string name="yield_module_stop_earning_sheet_description">オフにすると、Aaveから資金が引き出され、ウォレットの%sに戻され、報酬の獲得が停止されます。</string>
|
<string name="yield_module_stop_earning_sheet_description">オフにすると、Aaveから資金が引き出され、ウォレットの%sに戻され、報酬の獲得が停止されます。</string>
|
||||||
<string name="yield_module_stop_earning_sheet_fee_note">出金金額からネットワーク手数料が差し引かれます。</string>
|
<string name="yield_module_stop_earning_sheet_fee_note">出金金額からネットワーク手数料が差し引かれます。</string>
|
||||||
|
|
|
||||||
|
|
@ -1623,6 +1623,7 @@
|
||||||
<string name="wc_alert_wrong_card_title">We\'ve got some kind of problem</string>
|
<string name="wc_alert_wrong_card_title">We\'ve got some kind of problem</string>
|
||||||
<string name="wc_all_dapps_disconnected">All dApps disconnected</string>
|
<string name="wc_all_dapps_disconnected">All dApps disconnected</string>
|
||||||
<string name="wc_allow_to_spend">Allow to spend</string>
|
<string name="wc_allow_to_spend">Allow to spend</string>
|
||||||
|
<string name="wc_approve_description">By approving, you allow dApp or Smart contract to use tokens in future transactions.</string>
|
||||||
<string name="wc_common_address">Address</string>
|
<string name="wc_common_address">Address</string>
|
||||||
<string name="wc_common_connect">Connect</string>
|
<string name="wc_common_connect">Connect</string>
|
||||||
<string name="wc_common_loading">Loading</string>
|
<string name="wc_common_loading">Loading</string>
|
||||||
|
|
@ -1711,7 +1712,6 @@
|
||||||
<string name="yield_module_earn_sheet_current_apy_title">Current APY</string>
|
<string name="yield_module_earn_sheet_current_apy_title">Current APY</string>
|
||||||
<string name="yield_module_earn_sheet_my_funds_title">My Funds</string>
|
<string name="yield_module_earn_sheet_my_funds_title">My Funds</string>
|
||||||
<string name="yield_module_earn_sheet_provider_description">Your %1$s is now deposited in Aave and earning interest. You hold a%2$s token, which represents your balance and grows over time. When you top up, funds go to Aave to earn interest, minus a transaction fee.</string>
|
<string name="yield_module_earn_sheet_provider_description">Your %1$s is now deposited in Aave and earning interest. You hold a%2$s token, which represents your balance and grows over time. When you top up, funds go to Aave to earn interest, minus a transaction fee.</string>
|
||||||
<string name="yield_module_earn_sheet_status_active">Active</string>
|
|
||||||
<string name="yield_module_earn_sheet_title">Earn</string>
|
<string name="yield_module_earn_sheet_title">Earn</string>
|
||||||
<string name="yield_module_earn_sheet_total_earnings_title">Total earnings</string>
|
<string name="yield_module_earn_sheet_total_earnings_title">Total earnings</string>
|
||||||
<string name="yield_module_earn_sheet_transfers_title">Transfers to Aave</string>
|
<string name="yield_module_earn_sheet_transfers_title">Transfers to Aave</string>
|
||||||
|
|
@ -1733,7 +1733,7 @@
|
||||||
<string name="yield_module_promo_screen_how_it_works_button_title">How it works?</string>
|
<string name="yield_module_promo_screen_how_it_works_button_title">How it works?</string>
|
||||||
<string name="yield_module_promo_screen_self_custodial_subtitle">Aave is trusted by millions worldwide. Total lended value is $10.4B.</string>
|
<string name="yield_module_promo_screen_self_custodial_subtitle">Aave is trusted by millions worldwide. Total lended value is $10.4B.</string>
|
||||||
<string name="yield_module_promo_screen_self_custodial_title">Decentralized and self-custodial</string>
|
<string name="yield_module_promo_screen_self_custodial_title">Decentralized and self-custodial</string>
|
||||||
<string name="yield_module_promo_screen_terms_disclaimer">By using service, you agree with provider %1$s and %2$s</string>
|
<string name="yield_module_promo_screen_terms_disclaimer">By using service, you agree with provider\n%1$s and %2$s</string>
|
||||||
<string name="yield_module_promo_screen_title">Earn %s%% yearly</string>
|
<string name="yield_module_promo_screen_title">Earn %s%% yearly</string>
|
||||||
<string name="yield_module_promo_screen_variable_rate_info">Aave • Variable Interest Rate</string>
|
<string name="yield_module_promo_screen_variable_rate_info">Aave • Variable Interest Rate</string>
|
||||||
<string name="yield_module_provider">Aave</string>
|
<string name="yield_module_provider">Aave</string>
|
||||||
|
|
@ -1747,6 +1747,8 @@
|
||||||
<string name="yield_module_start_earning_sheet_description">Your %s will be supplied to Aave and will stay instantly available</string>
|
<string name="yield_module_start_earning_sheet_description">Your %s will be supplied to Aave and will stay instantly available</string>
|
||||||
<string name="yield_module_start_earning_sheet_fee_policy">See fee policy</string>
|
<string name="yield_module_start_earning_sheet_fee_policy">See fee policy</string>
|
||||||
<string name="yield_module_start_earning_sheet_next_deposits">Your next deposits will be automatically supplied to Aave.</string>
|
<string name="yield_module_start_earning_sheet_next_deposits">Your next deposits will be automatically supplied to Aave.</string>
|
||||||
|
<string name="yield_module_status_active">Active</string>
|
||||||
|
<string name="yield_module_status_paused">Paused</string>
|
||||||
<string name="yield_module_stop_earning">Stop earning</string>
|
<string name="yield_module_stop_earning">Stop earning</string>
|
||||||
<string name="yield_module_stop_earning_sheet_description">Turning off will withdraw your funds from Aave, return them to %s in your wallet, and stop earning rewards.</string>
|
<string name="yield_module_stop_earning_sheet_description">Turning off will withdraw your funds from Aave, return them to %s in your wallet, and stop earning rewards.</string>
|
||||||
<string name="yield_module_stop_earning_sheet_fee_note">The network fee will be deducted from the amount you withdraw.</string>
|
<string name="yield_module_stop_earning_sheet_fee_note">The network fee will be deducted from the amount you withdraw.</string>
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,13 @@ package com.tangem.core.ui.components.containers
|
||||||
|
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.Dp
|
import androidx.compose.ui.unit.dp
|
||||||
import com.tangem.core.ui.extensions.TextReference
|
import com.tangem.core.ui.extensions.TextReference
|
||||||
import com.tangem.core.ui.extensions.resolveAnnotatedReference
|
import com.tangem.core.ui.extensions.resolveAnnotatedReference
|
||||||
import com.tangem.core.ui.res.TangemTheme
|
import com.tangem.core.ui.res.TangemTheme
|
||||||
|
|
@ -17,14 +18,14 @@ import com.tangem.core.ui.res.TangemTheme
|
||||||
*
|
*
|
||||||
* @param modifier of component
|
* @param modifier of component
|
||||||
* @param footer text
|
* @param footer text
|
||||||
* @param footerTopPadding padding between footer and field
|
* @param paddingValues padding between footer and field
|
||||||
* @param content field content
|
* @param content field content
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun FooterContainer(
|
fun FooterContainer(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
footer: TextReference? = null,
|
footer: TextReference? = null,
|
||||||
footerTopPadding: Dp = TangemTheme.dimens.spacing8,
|
paddingValues: PaddingValues = PaddingValues(top = 8.dp),
|
||||||
content: @Composable () -> Unit,
|
content: @Composable () -> Unit,
|
||||||
) {
|
) {
|
||||||
Column(modifier = modifier) {
|
Column(modifier = modifier) {
|
||||||
|
|
@ -36,7 +37,7 @@ fun FooterContainer(
|
||||||
style = TangemTheme.typography.caption2,
|
style = TangemTheme.typography.caption2,
|
||||||
color = TangemTheme.colors.text.tertiary,
|
color = TangemTheme.colors.text.tertiary,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(top = footerTopPadding),
|
.padding(paddingValues),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
package com.tangem.core.ui.decompose
|
||||||
|
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.Stable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
|
||||||
|
@Stable
|
||||||
|
interface ComposableModularContentComponent {
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun Title()
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun Content(modifier: Modifier)
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun Footer()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getEmptyComposableModularContentComponent() = EmptyComposableModularContentComponent
|
||||||
|
|
||||||
|
object EmptyComposableModularContentComponent : ComposableModularContentComponent {
|
||||||
|
@Composable
|
||||||
|
override fun Title() {
|
||||||
|
/* no-op */
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
override fun Content(modifier: Modifier) {
|
||||||
|
/* no-op */
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
override fun Footer() {
|
||||||
|
/* no-op */
|
||||||
|
}
|
||||||
|
}
|
||||||
18
core/ui/src/main/res/drawable/ic_aave_36.xml
Normal file
18
core/ui/src/main/res/drawable/ic_aave_36.xml
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="36dp"
|
||||||
|
android:height="36dp"
|
||||||
|
android:viewportWidth="36"
|
||||||
|
android:viewportHeight="36">
|
||||||
|
<path
|
||||||
|
android:pathData="M18,36C27.941,36 36,27.941 36,18C36,8.059 27.941,0 18,0C8.059,0 0,8.059 0,18C0,27.941 8.059,36 18,36Z"
|
||||||
|
android:fillColor="#9391F7"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M14.654,18.878C16.197,18.627 17.245,17.173 16.995,15.629C16.744,14.086 15.29,13.038 13.746,13.288C12.203,13.539 11.155,14.993 11.405,16.537C11.656,18.08 13.11,19.128 14.654,18.878Z"
|
||||||
|
android:fillColor="#ffffff"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M22.054,18.878C23.597,18.627 24.646,17.173 24.395,15.629C24.145,14.086 22.69,13.038 21.147,13.288C19.603,13.539 18.555,14.993 18.806,16.537C19.056,18.08 20.51,19.128 22.054,18.878Z"
|
||||||
|
android:fillColor="#ffffff"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M17.895,4.395C10.208,4.395 3.975,10.747 3.977,18.58H7.533C7.533,12.71 12.135,7.95 17.895,7.95C23.655,7.95 28.258,12.71 28.258,18.58H31.814C31.815,10.747 25.583,4.395 17.895,4.395Z"
|
||||||
|
android:fillColor="#ffffff"/>
|
||||||
|
</vector>
|
||||||
|
|
@ -42,6 +42,7 @@ dependencies {
|
||||||
implementation(projects.domain.tokens)
|
implementation(projects.domain.tokens)
|
||||||
implementation(projects.domain.transaction.models)
|
implementation(projects.domain.transaction.models)
|
||||||
implementation(projects.domain.transaction)
|
implementation(projects.domain.transaction)
|
||||||
|
implementation(projects.domain.yieldSupply)
|
||||||
|
|
||||||
/** Compose */
|
/** Compose */
|
||||||
implementation(deps.compose.foundation)
|
implementation(deps.compose.foundation)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue