From ac295a300c94d47f0020fd5496ce7c793c21e585 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 3 Oct 2023 14:41:22 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/tap/common/CustomTabsManager.kt | 6 ++ .../drawable-night/ic_arbitrum_no_color.xml | 29 ------ .../drawable-night/ic_avalanche_no_color.xml | 17 ---- .../ic_bitcoin_cash_no_color.xml | 13 --- .../drawable-night/ic_bitcoin_no_color.xml | 16 ---- .../res/drawable-night/ic_bsc_no_color.xml | 17 ---- .../drawable-night/ic_cardano_no_color.xml | 16 ---- .../res/drawable-night/ic_chia_no_color.xml | 17 ---- .../res/drawable-night/ic_cosmos_no_color.xml | 43 --------- .../res/drawable-night/ic_cronos_no_color.xml | 25 ----- .../res/drawable-night/ic_dash_no_color.xml | 19 ---- .../drawable-night/ic_dogecoin_no_color.xml | 17 ---- .../res/drawable-night/ic_eth_no_color.xml | 31 ------ .../ic_ethereumfair_no_color.xml | 40 -------- .../ic_ethereumpow_no_color.xml | 31 ------ .../res/drawable-night/ic_fantom_no_color.xml | 17 ---- .../res/drawable-night/ic_gnosis_no_color.xml | 25 ----- .../res/drawable-night/ic_kaspa_no_color.xml | 16 ---- .../res/drawable-night/ic_kava_no_color.xml | 17 ---- .../res/drawable-night/ic_kusama_no_color.xml | 16 ---- .../drawable-night/ic_litecoin_no_color.xml | 16 ---- .../drawable-night/ic_octaspace_no_color.xml | 61 ------------ .../drawable-night/ic_optimism_no_color.xml | 17 ---- .../drawable-night/ic_polkadot_no_color.xml | 17 ---- .../drawable-night/ic_polygon_no_color.xml | 16 ---- .../drawable-night/ic_ravencoin_no_color.xml | 22 ----- .../res/drawable-night/ic_rsk_no_color.xml | 16 ---- .../res/drawable-night/ic_solana_no_color.xml | 13 --- .../drawable-night/ic_stellar_no_color.xml | 16 ---- .../res/drawable-night/ic_telos_no_color.xml | 17 ---- .../res/drawable-night/ic_terra2_no_color.xml | 25 ----- .../res/drawable-night/ic_terra_no_color.xml | 22 ----- .../res/drawable-night/ic_tezos_no_color.xml | 16 ---- .../res/drawable-night/ic_ton_no_color.xml | 17 ---- .../res/drawable-night/ic_tron_no_color.xml | 16 ---- .../res/drawable-night/ic_xrp_no_color.xml | 16 ---- .../res/drawable/card_placeholder_black.xml | 88 ------------------ .../res/drawable/ic_arbitrum_no_color.xml | 1 - .../res/drawable/ic_avalanche_no_color.xml | 15 ++- .../main/res/drawable/ic_azero_no_color.xml | 3 - .../res/drawable/ic_bitcoin_cash_no_color.xml | 1 - .../main/res/drawable/ic_bitcoin_no_color.xml | 1 - app/src/main/res/drawable/ic_bsc_no_color.xml | 1 - .../main/res/drawable/ic_cardano_no_color.xml | 1 - .../main/res/drawable/ic_chia_no_color.xml | 3 - .../main/res/drawable/ic_cosmos_no_color.xml | 3 - .../main/res/drawable/ic_cronos_no_color.xml | 3 - .../main/res/drawable/ic_dash_no_color.xml | 3 - .../res/drawable/ic_dogecoin_no_color.xml | 1 - app/src/main/res/drawable/ic_eth_no_color.xml | 1 - .../res/drawable/ic_ethereumfair_no_color.xml | 3 - .../res/drawable/ic_ethereumpow_no_color.xml | 3 - .../main/res/drawable/ic_fantom_no_color.xml | 1 - .../main/res/drawable/ic_gnosis_no_color.xml | 3 - .../main/res/drawable/ic_kaspa_no_color.xml | 3 - .../main/res/drawable/ic_kava_no_color.xml | 3 - .../main/res/drawable/ic_kusama_no_color.xml | 1 - .../res/drawable/ic_litecoin_no_color.xml | 17 ++-- .../res/drawable/ic_octaspace_no_color.xml | 3 - .../res/drawable/ic_optimism_no_color.xml | 3 - .../res/drawable/ic_polkadot_no_color.xml | 1 - .../main/res/drawable/ic_polygon_no_color.xml | 1 - .../res/drawable/ic_ravencoin_no_color.xml | 3 - app/src/main/res/drawable/ic_rsk_no_color.xml | 1 - .../main/res/drawable/ic_solana_no_color.xml | 1 - .../main/res/drawable/ic_stellar_no_color.xml | 1 - .../main/res/drawable/ic_telos_no_color.xml | 3 - .../main/res/drawable/ic_terra2_no_color.xml | 3 - .../main/res/drawable/ic_terra_no_color.xml | 3 - .../main/res/drawable/ic_tezos_no_color.xml | 1 - app/src/main/res/drawable/ic_ton_no_color.xml | 3 - .../main/res/drawable/ic_tron_no_color.xml | 1 - app/src/main/res/drawable/ic_xrp_no_color.xml | 14 ++- .../main/res/layout/layout_pseudo_toolbar.xml | 2 +- app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/colors.xml | 2 + .../tangem/core/ui/components/TextFields.kt | 28 +----- .../card_placeholder_black.webp | Bin 0 -> 3248 bytes .../res/drawable/card_placeholder_black.webp | Bin 0 -> 3574 bytes .../res/drawable/card_placeholder_black.xml | 88 ------------------ .../com/tangem/feature/swap/ui/SwapScreen.kt | 1 + .../drawable-night/ill_one_inch_powered.webp | Bin 0 -> 3978 bytes 82 files changed, 44 insertions(+), 1030 deletions(-) delete mode 100644 app/src/main/res/drawable-night/ic_arbitrum_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_avalanche_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_bitcoin_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_bsc_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_cardano_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_chia_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_cosmos_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_cronos_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_dash_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_dogecoin_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_eth_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_fantom_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_gnosis_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_kaspa_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_kava_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_kusama_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_litecoin_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_octaspace_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_optimism_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_polkadot_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_polygon_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_ravencoin_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_rsk_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_solana_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_stellar_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_telos_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_terra2_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_terra_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_tezos_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_ton_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_tron_no_color.xml delete mode 100644 app/src/main/res/drawable-night/ic_xrp_no_color.xml delete mode 100644 app/src/main/res/drawable/card_placeholder_black.xml create mode 100644 core/ui/src/main/res/drawable-night/card_placeholder_black.webp create mode 100644 core/ui/src/main/res/drawable/card_placeholder_black.webp delete mode 100644 core/ui/src/main/res/drawable/card_placeholder_black.xml create mode 100644 features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp diff --git a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt index b66ed0a3ad..a913befc98 100644 --- a/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt +++ b/app/src/main/java/com/tangem/tap/common/CustomTabsManager.kt @@ -4,6 +4,9 @@ import android.content.Context import android.net.Uri import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent +import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_DARK +import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_LIGHT +import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder import com.tangem.tap.common.extensions.getColorCompat import com.tangem.wallet.R @@ -15,6 +18,9 @@ class CustomTabsManager { .setNavigationBarColor(context.getColorCompat(R.color.toolbarColor)) .build(), ) + .setColorScheme( + if (MutableAppThemeModeHolder.isDarkThemeActive) COLOR_SCHEME_DARK else COLOR_SCHEME_LIGHT, + ) .build() customTabsIntent.launchUrl(context, Uri.parse(url)) } diff --git a/app/src/main/res/drawable-night/ic_arbitrum_no_color.xml b/app/src/main/res/drawable-night/ic_arbitrum_no_color.xml deleted file mode 100644 index d27c75195b..0000000000 --- a/app/src/main/res/drawable-night/ic_arbitrum_no_color.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_avalanche_no_color.xml b/app/src/main/res/drawable-night/ic_avalanche_no_color.xml deleted file mode 100644 index 84bb62ad1e..0000000000 --- a/app/src/main/res/drawable-night/ic_avalanche_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml b/app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml deleted file mode 100644 index 501c006728..0000000000 --- a/app/src/main/res/drawable-night/ic_bitcoin_cash_no_color.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-night/ic_bitcoin_no_color.xml b/app/src/main/res/drawable-night/ic_bitcoin_no_color.xml deleted file mode 100644 index 84b7fa673d..0000000000 --- a/app/src/main/res/drawable-night/ic_bitcoin_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_bsc_no_color.xml b/app/src/main/res/drawable-night/ic_bsc_no_color.xml deleted file mode 100644 index 7a6e69d0d0..0000000000 --- a/app/src/main/res/drawable-night/ic_bsc_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_cardano_no_color.xml b/app/src/main/res/drawable-night/ic_cardano_no_color.xml deleted file mode 100644 index 688149e946..0000000000 --- a/app/src/main/res/drawable-night/ic_cardano_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_chia_no_color.xml b/app/src/main/res/drawable-night/ic_chia_no_color.xml deleted file mode 100644 index a8beb8b71e..0000000000 --- a/app/src/main/res/drawable-night/ic_chia_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_cosmos_no_color.xml b/app/src/main/res/drawable-night/ic_cosmos_no_color.xml deleted file mode 100644 index 42e2426955..0000000000 --- a/app/src/main/res/drawable-night/ic_cosmos_no_color.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_cronos_no_color.xml b/app/src/main/res/drawable-night/ic_cronos_no_color.xml deleted file mode 100644 index 95c7b20aa0..0000000000 --- a/app/src/main/res/drawable-night/ic_cronos_no_color.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_dash_no_color.xml b/app/src/main/res/drawable-night/ic_dash_no_color.xml deleted file mode 100644 index cbe04a6a95..0000000000 --- a/app/src/main/res/drawable-night/ic_dash_no_color.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_dogecoin_no_color.xml b/app/src/main/res/drawable-night/ic_dogecoin_no_color.xml deleted file mode 100644 index 0c20ff8559..0000000000 --- a/app/src/main/res/drawable-night/ic_dogecoin_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_eth_no_color.xml b/app/src/main/res/drawable-night/ic_eth_no_color.xml deleted file mode 100644 index ff2ec1be37..0000000000 --- a/app/src/main/res/drawable-night/ic_eth_no_color.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml b/app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml deleted file mode 100644 index 97dbf4686f..0000000000 --- a/app/src/main/res/drawable-night/ic_ethereumfair_no_color.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml b/app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml deleted file mode 100644 index 15e4b3efd0..0000000000 --- a/app/src/main/res/drawable-night/ic_ethereumpow_no_color.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_fantom_no_color.xml b/app/src/main/res/drawable-night/ic_fantom_no_color.xml deleted file mode 100644 index bbb7044103..0000000000 --- a/app/src/main/res/drawable-night/ic_fantom_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_gnosis_no_color.xml b/app/src/main/res/drawable-night/ic_gnosis_no_color.xml deleted file mode 100644 index fb21b7ec5b..0000000000 --- a/app/src/main/res/drawable-night/ic_gnosis_no_color.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_kaspa_no_color.xml b/app/src/main/res/drawable-night/ic_kaspa_no_color.xml deleted file mode 100644 index d245591015..0000000000 --- a/app/src/main/res/drawable-night/ic_kaspa_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_kava_no_color.xml b/app/src/main/res/drawable-night/ic_kava_no_color.xml deleted file mode 100644 index 52132dd8db..0000000000 --- a/app/src/main/res/drawable-night/ic_kava_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_kusama_no_color.xml b/app/src/main/res/drawable-night/ic_kusama_no_color.xml deleted file mode 100644 index d2601e7684..0000000000 --- a/app/src/main/res/drawable-night/ic_kusama_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_litecoin_no_color.xml b/app/src/main/res/drawable-night/ic_litecoin_no_color.xml deleted file mode 100644 index da1b438b7e..0000000000 --- a/app/src/main/res/drawable-night/ic_litecoin_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_octaspace_no_color.xml b/app/src/main/res/drawable-night/ic_octaspace_no_color.xml deleted file mode 100644 index 3483ed7be3..0000000000 --- a/app/src/main/res/drawable-night/ic_octaspace_no_color.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_optimism_no_color.xml b/app/src/main/res/drawable-night/ic_optimism_no_color.xml deleted file mode 100644 index 9a28dabb2f..0000000000 --- a/app/src/main/res/drawable-night/ic_optimism_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_polkadot_no_color.xml b/app/src/main/res/drawable-night/ic_polkadot_no_color.xml deleted file mode 100644 index cc9d9d2179..0000000000 --- a/app/src/main/res/drawable-night/ic_polkadot_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_polygon_no_color.xml b/app/src/main/res/drawable-night/ic_polygon_no_color.xml deleted file mode 100644 index bfd632c93a..0000000000 --- a/app/src/main/res/drawable-night/ic_polygon_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_ravencoin_no_color.xml b/app/src/main/res/drawable-night/ic_ravencoin_no_color.xml deleted file mode 100644 index 428b851f0e..0000000000 --- a/app/src/main/res/drawable-night/ic_ravencoin_no_color.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_rsk_no_color.xml b/app/src/main/res/drawable-night/ic_rsk_no_color.xml deleted file mode 100644 index 8a1fc2a678..0000000000 --- a/app/src/main/res/drawable-night/ic_rsk_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_solana_no_color.xml b/app/src/main/res/drawable-night/ic_solana_no_color.xml deleted file mode 100644 index ac1bb7c565..0000000000 --- a/app/src/main/res/drawable-night/ic_solana_no_color.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-night/ic_stellar_no_color.xml b/app/src/main/res/drawable-night/ic_stellar_no_color.xml deleted file mode 100644 index e87b7c5061..0000000000 --- a/app/src/main/res/drawable-night/ic_stellar_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_telos_no_color.xml b/app/src/main/res/drawable-night/ic_telos_no_color.xml deleted file mode 100644 index b853488d28..0000000000 --- a/app/src/main/res/drawable-night/ic_telos_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_terra2_no_color.xml b/app/src/main/res/drawable-night/ic_terra2_no_color.xml deleted file mode 100644 index 2ac3b44b03..0000000000 --- a/app/src/main/res/drawable-night/ic_terra2_no_color.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_terra_no_color.xml b/app/src/main/res/drawable-night/ic_terra_no_color.xml deleted file mode 100644 index 26d8fe8e4b..0000000000 --- a/app/src/main/res/drawable-night/ic_terra_no_color.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_tezos_no_color.xml b/app/src/main/res/drawable-night/ic_tezos_no_color.xml deleted file mode 100644 index 8976ad0a0e..0000000000 --- a/app/src/main/res/drawable-night/ic_tezos_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_ton_no_color.xml b/app/src/main/res/drawable-night/ic_ton_no_color.xml deleted file mode 100644 index 098b3a6883..0000000000 --- a/app/src/main/res/drawable-night/ic_ton_no_color.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_tron_no_color.xml b/app/src/main/res/drawable-night/ic_tron_no_color.xml deleted file mode 100644 index 581cf60d6a..0000000000 --- a/app/src/main/res/drawable-night/ic_tron_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/ic_xrp_no_color.xml b/app/src/main/res/drawable-night/ic_xrp_no_color.xml deleted file mode 100644 index 9c4d2e9b43..0000000000 --- a/app/src/main/res/drawable-night/ic_xrp_no_color.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/card_placeholder_black.xml b/app/src/main/res/drawable/card_placeholder_black.xml deleted file mode 100644 index 83fab8e0f7..0000000000 --- a/app/src/main/res/drawable/card_placeholder_black.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_arbitrum_no_color.xml b/app/src/main/res/drawable/ic_arbitrum_no_color.xml index 02164f7121..e7c20e844b 100644 --- a/app/src/main/res/drawable/ic_arbitrum_no_color.xml +++ b/app/src/main/res/drawable/ic_arbitrum_no_color.xml @@ -3,7 +3,6 @@ android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android"> - diff --git a/app/src/main/res/drawable/ic_avalanche_no_color.xml b/app/src/main/res/drawable/ic_avalanche_no_color.xml index 72317338ab..032533db9d 100644 --- a/app/src/main/res/drawable/ic_avalanche_no_color.xml +++ b/app/src/main/res/drawable/ic_avalanche_no_color.xml @@ -1,6 +1,11 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_azero_no_color.xml b/app/src/main/res/drawable/ic_azero_no_color.xml index da712895b3..612a316f3f 100644 --- a/app/src/main/res/drawable/ic_azero_no_color.xml +++ b/app/src/main/res/drawable/ic_azero_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - diff --git a/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml b/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml index 8ca8b29ddb..f9a1276588 100644 --- a/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml +++ b/app/src/main/res/drawable/ic_bitcoin_cash_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_bitcoin_no_color.xml b/app/src/main/res/drawable/ic_bitcoin_no_color.xml index 9b8aef2452..b18c3c9cce 100644 --- a/app/src/main/res/drawable/ic_bitcoin_no_color.xml +++ b/app/src/main/res/drawable/ic_bitcoin_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_bsc_no_color.xml b/app/src/main/res/drawable/ic_bsc_no_color.xml index 1fb72febdf..a7062f73c1 100644 --- a/app/src/main/res/drawable/ic_bsc_no_color.xml +++ b/app/src/main/res/drawable/ic_bsc_no_color.xml @@ -1,7 +1,6 @@ - diff --git a/app/src/main/res/drawable/ic_cardano_no_color.xml b/app/src/main/res/drawable/ic_cardano_no_color.xml index ea706040d3..46a9df7709 100644 --- a/app/src/main/res/drawable/ic_cardano_no_color.xml +++ b/app/src/main/res/drawable/ic_cardano_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_chia_no_color.xml b/app/src/main/res/drawable/ic_chia_no_color.xml index 9119f89479..4ed5d9574b 100644 --- a/app/src/main/res/drawable/ic_chia_no_color.xml +++ b/app/src/main/res/drawable/ic_chia_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - - - diff --git a/app/src/main/res/drawable/ic_dash_no_color.xml b/app/src/main/res/drawable/ic_dash_no_color.xml index be475ecf51..0e7c3f29b6 100644 --- a/app/src/main/res/drawable/ic_dash_no_color.xml +++ b/app/src/main/res/drawable/ic_dash_no_color.xml @@ -6,9 +6,6 @@ - diff --git a/app/src/main/res/drawable/ic_dogecoin_no_color.xml b/app/src/main/res/drawable/ic_dogecoin_no_color.xml index 8ca48b696e..9d52af3530 100644 --- a/app/src/main/res/drawable/ic_dogecoin_no_color.xml +++ b/app/src/main/res/drawable/ic_dogecoin_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_eth_no_color.xml b/app/src/main/res/drawable/ic_eth_no_color.xml index 95066b1560..41071ba559 100644 --- a/app/src/main/res/drawable/ic_eth_no_color.xml +++ b/app/src/main/res/drawable/ic_eth_no_color.xml @@ -1,7 +1,6 @@ - diff --git a/app/src/main/res/drawable/ic_ethereumfair_no_color.xml b/app/src/main/res/drawable/ic_ethereumfair_no_color.xml index dd68efa83e..1379276e0d 100644 --- a/app/src/main/res/drawable/ic_ethereumfair_no_color.xml +++ b/app/src/main/res/drawable/ic_ethereumfair_no_color.xml @@ -6,9 +6,6 @@ android:viewportHeight="22"> - diff --git a/app/src/main/res/drawable/ic_ethereumpow_no_color.xml b/app/src/main/res/drawable/ic_ethereumpow_no_color.xml index aa369fd0ab..40a0651a32 100644 --- a/app/src/main/res/drawable/ic_ethereumpow_no_color.xml +++ b/app/src/main/res/drawable/ic_ethereumpow_no_color.xml @@ -6,9 +6,6 @@ android:viewportHeight="22"> - - diff --git a/app/src/main/res/drawable/ic_gnosis_no_color.xml b/app/src/main/res/drawable/ic_gnosis_no_color.xml index a8d4069093..271d24efd6 100644 --- a/app/src/main/res/drawable/ic_gnosis_no_color.xml +++ b/app/src/main/res/drawable/ic_gnosis_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - diff --git a/app/src/main/res/drawable/ic_kaspa_no_color.xml b/app/src/main/res/drawable/ic_kaspa_no_color.xml index cae1a10de8..55b68fd581 100644 --- a/app/src/main/res/drawable/ic_kaspa_no_color.xml +++ b/app/src/main/res/drawable/ic_kaspa_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - diff --git a/app/src/main/res/drawable/ic_kava_no_color.xml b/app/src/main/res/drawable/ic_kava_no_color.xml index d48b77cede..49e4647c33 100644 --- a/app/src/main/res/drawable/ic_kava_no_color.xml +++ b/app/src/main/res/drawable/ic_kava_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - - diff --git a/app/src/main/res/drawable/ic_litecoin_no_color.xml b/app/src/main/res/drawable/ic_litecoin_no_color.xml index 5758f1ab6e..5b3acc91e8 100644 --- a/app/src/main/res/drawable/ic_litecoin_no_color.xml +++ b/app/src/main/res/drawable/ic_litecoin_no_color.xml @@ -1,9 +1,10 @@ - - - - - - + + diff --git a/app/src/main/res/drawable/ic_octaspace_no_color.xml b/app/src/main/res/drawable/ic_octaspace_no_color.xml index 36751027a3..c61e79358f 100644 --- a/app/src/main/res/drawable/ic_octaspace_no_color.xml +++ b/app/src/main/res/drawable/ic_octaspace_no_color.xml @@ -4,9 +4,6 @@ android:autoMirrored="true" android:viewportWidth="22" android:viewportHeight="22"> - diff --git a/app/src/main/res/drawable/ic_optimism_no_color.xml b/app/src/main/res/drawable/ic_optimism_no_color.xml index 3a9d21620b..7091ff4c7d 100644 --- a/app/src/main/res/drawable/ic_optimism_no_color.xml +++ b/app/src/main/res/drawable/ic_optimism_no_color.xml @@ -5,9 +5,6 @@ android:viewportHeight="22"> - - diff --git a/app/src/main/res/drawable/ic_polygon_no_color.xml b/app/src/main/res/drawable/ic_polygon_no_color.xml index 665486d682..eafe18126e 100644 --- a/app/src/main/res/drawable/ic_polygon_no_color.xml +++ b/app/src/main/res/drawable/ic_polygon_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_ravencoin_no_color.xml b/app/src/main/res/drawable/ic_ravencoin_no_color.xml index 5bc49c57cf..7599b5c971 100644 --- a/app/src/main/res/drawable/ic_ravencoin_no_color.xml +++ b/app/src/main/res/drawable/ic_ravencoin_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - - diff --git a/app/src/main/res/drawable/ic_solana_no_color.xml b/app/src/main/res/drawable/ic_solana_no_color.xml index a49a56f643..31e6195232 100644 --- a/app/src/main/res/drawable/ic_solana_no_color.xml +++ b/app/src/main/res/drawable/ic_solana_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_stellar_no_color.xml b/app/src/main/res/drawable/ic_stellar_no_color.xml index 27a497f3fb..61e3683e6f 100644 --- a/app/src/main/res/drawable/ic_stellar_no_color.xml +++ b/app/src/main/res/drawable/ic_stellar_no_color.xml @@ -3,7 +3,6 @@ android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android"> - diff --git a/app/src/main/res/drawable/ic_telos_no_color.xml b/app/src/main/res/drawable/ic_telos_no_color.xml index 01aca1d2b2..bdd073cd40 100644 --- a/app/src/main/res/drawable/ic_telos_no_color.xml +++ b/app/src/main/res/drawable/ic_telos_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - - diff --git a/app/src/main/res/drawable/ic_terra_no_color.xml b/app/src/main/res/drawable/ic_terra_no_color.xml index 0ba5bf40f7..f25adb981e 100644 --- a/app/src/main/res/drawable/ic_terra_no_color.xml +++ b/app/src/main/res/drawable/ic_terra_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - diff --git a/app/src/main/res/drawable/ic_tezos_no_color.xml b/app/src/main/res/drawable/ic_tezos_no_color.xml index c023c94fa3..a929bead46 100644 --- a/app/src/main/res/drawable/ic_tezos_no_color.xml +++ b/app/src/main/res/drawable/ic_tezos_no_color.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/drawable/ic_ton_no_color.xml b/app/src/main/res/drawable/ic_ton_no_color.xml index c3d5d856db..e9ecd65434 100644 --- a/app/src/main/res/drawable/ic_ton_no_color.xml +++ b/app/src/main/res/drawable/ic_ton_no_color.xml @@ -3,9 +3,6 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - - diff --git a/app/src/main/res/drawable/ic_xrp_no_color.xml b/app/src/main/res/drawable/ic_xrp_no_color.xml index 67185b115a..47a43000ca 100644 --- a/app/src/main/res/drawable/ic_xrp_no_color.xml +++ b/app/src/main/res/drawable/ic_xrp_no_color.xml @@ -1,6 +1,10 @@ - - - + + diff --git a/app/src/main/res/layout/layout_pseudo_toolbar.xml b/app/src/main/res/layout/layout_pseudo_toolbar.xml index 0f9b853f36..361f8cbb40 100644 --- a/app/src/main/res/layout/layout_pseudo_toolbar.xml +++ b/app/src/main/res/layout/layout_pseudo_toolbar.xml @@ -4,7 +4,7 @@ android:id="@+id/pseudo_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/background_action" + android:background="@color/background_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 1acebccb4b..1b1466a874 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -50,4 +50,5 @@ #919191 + #333333 \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index cf46dfba11..5d49d88d30 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -80,4 +80,6 @@ #000000 #00000000 + + #1B1D1C \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt index 2575fee4ad..6f09757064 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt @@ -9,29 +9,11 @@ import androidx.compose.foundation.background import androidx.compose.foundation.interaction.InteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsFocusedAsState -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.IntrinsicSize -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.* import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.Divider -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.OutlinedTextField -import androidx.compose.material.Text -import androidx.compose.material.TextFieldColors -import androidx.compose.runtime.Composable -import androidx.compose.runtime.Immutable -import androidx.compose.runtime.Stable -import androidx.compose.runtime.State -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.material.* +import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shape @@ -210,8 +192,8 @@ object TangemTextFieldsDefault { cursorColor = TangemTheme.colors.icon.primary1, errorCursorColor = TangemTheme.colors.icon.warning, focusedIndicatorColor = TangemTheme.colors.icon.primary1, - unfocusedIndicatorColor = TangemTheme.colors.stroke.primary, - disabledIndicatorColor = TangemTheme.colors.stroke.primary, + unfocusedIndicatorColor = TangemTheme.colors.stroke.secondary, + disabledIndicatorColor = TangemTheme.colors.stroke.secondary, errorIndicatorColor = TangemTheme.colors.icon.warning, leadingIconColor = TangemTheme.colors.icon.informative, disabledLeadingIconColor = Color.Transparent, diff --git a/core/ui/src/main/res/drawable-night/card_placeholder_black.webp b/core/ui/src/main/res/drawable-night/card_placeholder_black.webp new file mode 100644 index 0000000000000000000000000000000000000000..376f1200410487bf51c8529e2ef0e302f316bb31 GIT binary patch literal 3248 zcmX|@cQ_kr8;4`Bw)P&SR@J6;?ERr?6h)1SRjO!h6*Y3q7%^(ZimKS5O=Fg#gjlgv zsoE8S+9Rp)Ip=)m`|rK3_kFMD`Qy3o=Vy7}z@YLP0ATwc-G??0l}!q+&a$@MV5ZBG zx4y#IlQ+W$;!VXde>VDx>}aTBi|5$teTBnz##Am=%LM`X)GQyUZ63R+al2#5D^0&g z`w!&Lk)>QxfQ|AX(b}{rw0eTHI)XP|nGdysQF0vcP+41cO^>Vq2Py*8rxLGhXvF3Ki&K9N-xK^W<% zc9On9W4$aWug(ANG1=uMldu0X|93Qe<-|0R70I4Y!@2CbP^DKlUe_A5TJh0!OD$`& zM-Uia6n6V+{ghMo@NY_3Lil`BI1|(uE_WvsK4BE;dNy9G?s7kG9#`)9K!RKErH$pa zRpFr^Y&6D?m!JJvJd9~g0T*mk$huNb#TEgQ^l%h4O|8fN+EL5_6h7+Ol*_;?hvWNr)Qq@O)!TT zQS;N$g|*!iYx%vd>Lyi`$Te--EbrdoKNw=GG(B+5C7JQsiCtq0H4;)G#p*ks_w~K7 zMFR&KNB9#7g>4x6*5PKPe*08BP_-=Tw!{v-xQp~W?EmJG?`l6rl$#-AUR3IrSXnkw z>ypwtmR{9Y$M?0{@uL-KHo5csPw%=2;VVWt*ObK!I27YgW~g}sQ-b=0D@q5M(1t9A ze%^}Uej^nRzpIOYS29W`)QUQ0K^;o0=+y%Ec==?{adiKUMC9Zs`!@Y>7Z|6n@4y02 z0HVecF#18)rWQkDv3y{Syw5pr9E77hdX495S7Ee3z7SDt%tIIL>Tl!Rc(vqr3Rq)4 z6PZKR;q?5^sw+^^IKMncVC~$8Y1ht=Yo(&m?E(#7&41?qRyFS{8I*9`VKAX)?zAZ% zDPeX0H0J+vc@4axJ-htb;i36z!+d?!{u|ShUuwL}KIbBLz#L28E+R>km`<>U#1q5b1N%7X3sQK0c^C z3egQ=B2#ujBw5h0f1zdnQrVC?h|O3(ObWS|E1=@D1HI533Qsw4i<-4xdBs=y54fq1 zWU?MVN!0dV{`7y616B#-gMVBhK5wwN|S3qaZI7PI~ zQ%YKVC%Lw55(U8e3tCnTa1HNVX#o>hY+jt4zCDCuyAC*4u)HL0=s4c^X?>XjvpgRB zQbb`3L8%`NKCSjo&$rVh6pK(sN0Rw?F9Oa~)}N13#EQyE=dM7gD%yKd7;6`yswmyj zJicP(IkEZDpvN@8{IYfEQ@MnV$Gg|_D3OFVT!~7d*dC4Y7`3NGGq7nej6{F0O%^Y=Lj1Ocw66^O(%nxMZ zH~mQ1aVz`5LmU4VCDg4{FM25dfrN6&S@SCxmw^^WN(p4HgIgUM@$HpzhJLYNE_-9b zrksHx>6z`8igOB$LndiNrv-S$l2<*M@E{rQaT! zImp=#(~d(IX%xgE;56^$nv5Ds^yrN1ruiAoVyYY}XW_~OvVz)4XTNaROrQouPDqzGjrxchvUdwlu6c`@ zqGo)!+Cw!hxx+F>2Md;t_T*fHas`N|VBxu$B%W)9U32mpY8p5=sufy9Vzsuqq-;ia z6FDR&>=P zd#MOx3zv9TJ=RW*uz?w?sCZY1Rag2`?t!!^DUl;{K%ZZeCix-t&06U|Kcd_vxd%4O z!>_DaQG8OMB1>K;M)H88vw$qQQda~{ru}A5t_V0CGx_ZXPTE<|aipAv%WG=oM%*Uz zqIUdJSa7D-vyc5?-{POz>T1#8SDGKJcDyU#R5fz_K}l}my#jMvGa;CVIs`4wig_`s z%Tu?pk^-~%U*z5jlO^;J7VoT(GvYcK&X7Xo`C4eXu(pZGk9W^oYr3NC^YZ1tjrQ&H z6&buK!5o0M!_ppwQXPzOnE%LJem}uV<+F|n+E+)>Phg1JhWIXva5;wi8t={6*~Pve zK)F=qIfosM9^60I8!jk2-96|MN>UK6$lKt0cqESNG;!v-N0a)4d9AwJ>$;jUPaNz+ zJtVXOqp09bK7qEN2Wu!!n{TY<8_km>v>1zB{r1$Xe&xmOe{f&S-NW*lOH z=WNG(mT=BYQbi|K&Q3~Ky88kO+GKBW%Ag5(iwOh9i%K_%O~UNYU#0exhe8^9&*Ct% z9@9Jp@5)dVGR@C7BP7|%d&doCKXak8Ca1r^ke+KGAbp(`-t64-W6p2+&wfNtP5GFB zrj)=K7|odM+8k_ucm|ytEWJ7hyRurFTn8-Bt+DE$9nM4 z6tA5IS_<*T=P~{=o|kt^bcb;P(Sf5=>w+X6IQHlAb3aO0PC7|(x#nyOT!wI})9j@F z-%6Mc6EbVdsbR=nxLP8AXT(kAfZ(P5g1^J#zX}iGaBV1M2-8K%>@L}66_*i4vRlK1 ztuHlS7vT4U_@!bA5G`MpJu?_QZ#i4}933L|%XlIp?^F2sEnKS9XZy+*^Dh(}2gWY3 zP5bq4HanE;WFk2bD(Ede+vP);NUd30WaCoL&i=td)E~TgBvM3o+CrIUtH{NLh2L=q zS|a%Yib(nuV8zz~ynjvW3{}OPyFfc+k4eUPSb41&-e3B?Ap6I?6=Kr@L%;A29OzSx Zy-M*Nzb)jPNatxhOgGvAZ literal 0 HcmV?d00001 diff --git a/core/ui/src/main/res/drawable/card_placeholder_black.webp b/core/ui/src/main/res/drawable/card_placeholder_black.webp new file mode 100644 index 0000000000000000000000000000000000000000..b7077165a5636145500e8433779011f76a277c89 GIT binary patch literal 3574 zcmZ9Nc{CJ^8pemj7m7$FCJa)tG?=lI5V9|Wu|x)A&A!J-mdKJ!AI6X(8f#?6P9$UO zd$No*mB~6LTQlx=>)vzEx##!Kd){-N=RAKskA=bQ+Z(3=02|#~X4Ym(MvMR4vNj(c zawjb}WQysgU|vtpA8xL7JmXEBfd=Y0Vvih;@mIQiXY^m~rM#FyRW}Fl%@CeeXg>_| zyvcHef_Jdy#3GqY`4$@Hm7P^4gEaK{xk_7IrJT9qmv&!Dt#FNlPJ|Ecd>G9B*k+QV z#T~PMB-r~b0edsxFhs1ur0}B7S?mjeFBvyO9t@(|eW;r=?FX7fx_!H&+Yh(a%L!9M zYp}C1kU`AQe9B*%5x7QXU;7_bcQ{q|W2Z+T5=!&$_7U#RKT{<7sGm z^By^B$l)7VTc+kUH2HbAL^E#5>L*OmXk~Wq_}Kg~W|709TeRTs$BeN!F_N|YmmZOL zX|*8t>_<~U!9w4>xi?axE=O*sWwcH6FhFgQ$8#5iycRJ@^Yc7+#R%l+rOVkdF&Kws zgR1alBoeg*TXgIkNw`oSpOm~_3Vbkm)H&9rNU+hU6K^qgI2!4_9+!wbv>ZCM7(w=t zIl|Sm#cyf)Rc|p~RjYFctRvGE6E39qZGfX3!e51_1?0=t(ql>GodO@DO7=R1KF64C z8i=S(G*?GI^IcC<6Kk)o4~@eX1j)LED;molCuhStdL2Ikc_h6>3?~tDB%{#Ujk@s zHmHc{a!>po$sz`Qca`ZJjxox*`%+r6H0np40vat70>2$y6(2M@RrUG12Oy3|NFKurWhYuogZhTMuJ26#f00ky-7%DJmhwA3PAT1=J) zm;SP=+lO@I1O|78WNdFlE!A+O&Zz?4=4BBH>;<{@Z$CMO)0xf3%}4c8jCqu;aViN{ zQc^JXhRLJnone3Xm_Os?Al6>)`iQ@O-gE3Q%ND$nj4mQ!2E(ZFb3)=-_|Ip+TAstm zTWGj>HhSd}3|dB2dP)0P-4NjVt8-w#5DXrWGx)KT&^YQLWY6KF?noEpSrs#mPkG$Lo`q5$^N zrhy!Yl6S2HYj@GL`&79Rd)3q~!14n+cv`VMwcm17SWz;^0=mo#Qinw9G{;&Cdfl*@ za0e%g50w$mJ38I}R9-vD=Fw-xsPfR>>V3~nNm|6#mZcDM{yX3eS zp}`vNzf;YrJ(Q$YI?>6-WZLgr*VT&>; zp4?LgL3ij0R9nx@GYaqva!BA~C9wK?m_&04&-qTPrGfws8q&4oiFPXvD)PPQ?_v_o zS!_C`7#EJwnWn-x&x(g<8FBq|6Pwi&T9QkRtJ0i_FEx+6z5>_#o^jD;Bwo=)?L4I< zY=@Xw5g#E!eNeF21DUr`px!#?f9p`Pam#9Ql=mKeZDux1xvch$UKAu-Mwz4)YJo2E zimC4BS~HBs_JQM${|z%PhGtTAT0dN3rUUf{b!8NdxsUDmILG{;wzyWD@1SZmmt(tyy8;x&BHB+qwH+hZAHH@&6qz z*lO&{{-)Y#57!>~@XMp$3FD3#Sse&^;WEpgL?n9H8XHhzf3u7UAZO15aIwDz&>;i@ zCK6cy-2^!R_ZhFda7zFcD#$cjV-1kjh&tJ13XpnpyxiBeBr2WHFr;Q z*IvxmxLMR&dsY8FZ<`jf4Mv*=bdoVn7*3?}pttwyv#+ zJ+|URsDnP!hJ#3IF)2s%b|Qut3)aNPr`#4q@G846UJ!%0q&sFkmR~C_KKgcY@B;`R zm*U7j2JGVbq_%niZCUhYVDh*mg7YG^VJZiUant!Z5{8%oi+e*W6_ZzBu@)ZO&vSky z1);7zpO$bsB$ebF4$645T*vX1k39~Oh@35kikArJDPGqy0Ck=;2-P~$X)>>%Pt6;9 z@fTQ*_yqO)2S&c(19qe)IR@P^QZ!6Ns;Bn z-|ww{_H#Ne8Zc26`avQi*k^rLIJzIRcqE#n zbcr8#NWF8f%Q)ZQ-fd;o(5quZ6+!4gA(k~R6IcaYT0##b?^q#__Qnxt5nxG`XdpKW*X2}zV-&RUvnBaZ+!Y7lv(f0BS<6h++tSuOc z;VxW+a*uufjYHC`E&fvlUkI01ZBKRdGJ8Lm%YwI#ev*eL^>#ljM}kOtZr zsC%Z;wciTAo?55Ix;q0gS4pWQ?vVX;8N7XvNz$_{43LxIBBr$XABhaqeW|!`u#T}N z44bM+_zQ(+^;!kt$8WW;l#kn0!Y@B+#@N(68c%<1zdh*VB+sj zk6MJP`dI-a2)O5f(v@6oMvomcS`1Q}ow6D!hn>>K`NQ7%dQDtfNE|@dNP74>nmHQ7 z7dae#Te&-5xf^SNn+x&Gg{DcN#WWiL$1ikH9YFufrC5APyxz<`>V=+D@{nY323o9;BgQ2Ugp8Dq*YMu*f?e}t^v|_PB>dx9eq&$?G z2$L879;tANz$=kHEX8{|nWGmDv4O`=78wjA{lJu7rQ}1R)Fbm3Ufb6myv}n|cQA`P zpW;fI&Z+g<__k%IB=gOPFm>oYSK+CSQlIuh)Or^@1;YyQO%==y1HS5Z9AP7es&%vr zjhjstdLx|r%n$_V;@G{kf)Ajvn|}-Qi?XSQ=_zO@$qQWZ2b~P$EwyGppNBE82^^?s z96Tukk*^(czU-Ni++T*pAIOW`XgNT3CZ9UziXeAD<_TrWM9&pp0wYK`N%?tI`itIj zsnPpJ2S-&KWd(>rNrIy~7d^18;I zyxmrUNaHP^e9`DZ=l7($9d>@Hf8fH3|CBcN4(mFy~p>JD6Zfl8gkT$4iNaWGc-!Uu1VY8|8{T7NpsMt)&Jnn zuxSMz=O1bjPa(Ih6?e-~OOSlDRZ(v)h2o^ zxoWvs#N5nD?*`S@3)=Z!5(KUvQG?Uv0(A6{A1V!-|Nj)#u3Uwz3MEq>0xA=Dbe zAu4zQv=PQc{*u5Z>I+ySgi@YC N4&Uz3D!k4L_!mh`Am{)9 literal 0 HcmV?d00001 diff --git a/core/ui/src/main/res/drawable/card_placeholder_black.xml b/core/ui/src/main/res/drawable/card_placeholder_black.xml deleted file mode 100644 index 83fab8e0f7..0000000000 --- a/core/ui/src/main/res/drawable/card_placeholder_black.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt index a5f8b658ec..bfd13ad8c8 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt @@ -59,6 +59,7 @@ internal fun SwapScreen(stateHolder: SwapStateHolder) { topEnd = TangemTheme.dimens.radius16, ), sheetElevation = TangemTheme.dimens.elevation24, + scrimColor = TangemTheme.colors.background.secondary.copy(alpha = 0.4f), content = { SwapScreenContent( state = stateHolder, diff --git a/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp b/features/swap/presentation/src/main/res/drawable-night/ill_one_inch_powered.webp new file mode 100644 index 0000000000000000000000000000000000000000..329d1f977e835b036a1bcd0ff2aa4df2bc8311e1 GIT binary patch literal 3978 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 literal 0 HcmV?d00001