From c71d0e27a81216bd5d69614c7ab963cca43556ab Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 27 Mar 2024 15:46:10 +0100 Subject: [PATCH] Updated on 2026-08-14 --- .../core/ui/extensions/BlockchainIcons.kt | 20 ++++++ core/ui/src/main/res/drawable/ic_flare_22.xml | 10 +++ .../ui/src/main/res/drawable/ic_mantle_22.xml | 54 ++++++++++++++++ .../src/main/res/drawable/ic_moonriver_22.xml | 36 +++++++++++ .../ui/src/main/res/drawable/ic_taraxa_22.xml | 10 +++ .../ui/src/main/res/drawable/img_flare_22.xml | 17 ++++++ .../src/main/res/drawable/img_mantle_22.xml | 61 +++++++++++++++++++ .../main/res/drawable/img_moonriver_22.xml | 43 +++++++++++++ .../src/main/res/drawable/img_taraxa_22.xml | 17 ++++++ .../domain/common/extensions/Blockchain.kt | 20 ++++++ gradle/dependencies.toml | 2 +- 11 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 core/ui/src/main/res/drawable/ic_flare_22.xml create mode 100644 core/ui/src/main/res/drawable/ic_mantle_22.xml create mode 100644 core/ui/src/main/res/drawable/ic_moonriver_22.xml create mode 100644 core/ui/src/main/res/drawable/ic_taraxa_22.xml create mode 100644 core/ui/src/main/res/drawable/img_flare_22.xml create mode 100644 core/ui/src/main/res/drawable/img_mantle_22.xml create mode 100644 core/ui/src/main/res/drawable/img_moonriver_22.xml create mode 100644 core/ui/src/main/res/drawable/img_taraxa_22.xml diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt index d7b3fd7f1d..0a77e69e7e 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt @@ -61,6 +61,10 @@ fun getActiveIconRes(blockchainId: String): Int { "moonbeam", "moonbeam/test" -> R.drawable.img_moonbeam_22 "manta", "manta/test" -> R.drawable.img_manta_22 "polygonZkEVM", "polygonZkEVM/test" -> R.drawable.img_polygon_22 + "moonriver", "moonriver/test" -> R.drawable.img_moonriver_22 + "mantle", "mantle/test" -> R.drawable.img_mantle_22 + "flare", "flare/test" -> R.drawable.img_flare_22 + "taraxa", "taraxa/test" -> R.drawable.img_taraxa_22 "radiant" -> R.drawable.img_radiant_22 else -> R.drawable.ic_alert_24 } @@ -124,6 +128,10 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "moonbeam", "moonbeam/test" -> R.drawable.img_moonbeam_22 "manta-network", "manta-network/test" -> R.drawable.img_manta_22 "polygon-zkevm", "polygon-zkevm/test" -> R.drawable.img_polygon_22 + "moonriver", "moonriver/test" -> R.drawable.img_moonriver_22 + "mantle", "mantle/test" -> R.drawable.img_mantle_22 + "flare-network", "flare-network/test" -> R.drawable.img_flare_22 + "taraxa", "taraxa/test" -> R.drawable.img_taraxa_22 "radiant" -> R.drawable.img_radiant_22 else -> R.drawable.ic_alert_24 } @@ -184,6 +192,10 @@ fun getActiveIconResByCoinId(coinId: String): Int { "moonbeam" -> R.drawable.img_moonbeam_22 "manta-network-ethereum" -> R.drawable.img_manta_22 "polygon-zkevm-ethereum" -> R.drawable.img_polygon_22 + "moonriver" -> R.drawable.img_moonriver_22 + "mantle" -> R.drawable.img_mantle_22 + "flare-networks" -> R.drawable.img_flare_22 + "taraxa" -> R.drawable.img_taraxa_22 "radiant" -> R.drawable.img_radiant_22 else -> R.drawable.ic_alert_24 } @@ -247,6 +259,10 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "moonbeam", "moonbeam/test" -> R.drawable.ic_moonbeam_22 "manta", "manta/test" -> R.drawable.ic_manta_22 "polygonZkEVM", "polygonZkEVM/test" -> R.drawable.ic_polygon_22 + "moonriver", "moonriver/test" -> R.drawable.ic_moonriver_22 + "mantle", "mantle/test" -> R.drawable.ic_mantle_22 + "flare", "flare/test" -> R.drawable.ic_flare_22 + "taraxa", "taraxa/test" -> R.drawable.ic_taraxa_22 "radiant" -> R.drawable.ic_radiant_22 else -> R.drawable.ic_alert_24 } @@ -310,6 +326,10 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "moonbeam", "moonbeam/test" -> R.drawable.ic_moonbeam_22 "manta-network", "manta-network/test" -> R.drawable.ic_manta_22 "polygon-zkevm", "polygon-zkevm/test" -> R.drawable.ic_polygon_22 + "moonriver", "moonriver/test" -> R.drawable.ic_moonriver_22 + "mantle", "mantle/test" -> R.drawable.ic_mantle_22 + "flare-network", "flare-network/test" -> R.drawable.ic_flare_22 + "taraxa", "taraxa/test" -> R.drawable.ic_taraxa_22 "radiant" -> R.drawable.ic_radiant_22 else -> R.drawable.ic_alert_24 } diff --git a/core/ui/src/main/res/drawable/ic_flare_22.xml b/core/ui/src/main/res/drawable/ic_flare_22.xml new file mode 100644 index 0000000000..96c5c7eea9 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_flare_22.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_mantle_22.xml b/core/ui/src/main/res/drawable/ic_mantle_22.xml new file mode 100644 index 0000000000..b53a906acb --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_mantle_22.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/core/ui/src/main/res/drawable/ic_moonriver_22.xml b/core/ui/src/main/res/drawable/ic_moonriver_22.xml new file mode 100644 index 0000000000..0a44cf4e25 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_moonriver_22.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/core/ui/src/main/res/drawable/ic_taraxa_22.xml b/core/ui/src/main/res/drawable/ic_taraxa_22.xml new file mode 100644 index 0000000000..7ee9b27337 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_taraxa_22.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_flare_22.xml b/core/ui/src/main/res/drawable/img_flare_22.xml new file mode 100644 index 0000000000..50e0da994b --- /dev/null +++ b/core/ui/src/main/res/drawable/img_flare_22.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_mantle_22.xml b/core/ui/src/main/res/drawable/img_mantle_22.xml new file mode 100644 index 0000000000..93dbe6ccb3 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_mantle_22.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_moonriver_22.xml b/core/ui/src/main/res/drawable/img_moonriver_22.xml new file mode 100644 index 0000000000..c2ee947935 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_moonriver_22.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_taraxa_22.xml b/core/ui/src/main/res/drawable/img_taraxa_22.xml new file mode 100644 index 0000000000..3faf5ca9f0 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_taraxa_22.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index 2f27ff5330..e3ed6aabed 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -104,6 +104,14 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "nexa" -> Blockchain.Nexa // FIXME "nexa/test" -> Blockchain.NexaTestnet // FIXME "radiant" -> Blockchain.Radiant + "moonriver" -> Blockchain.Moonriver + "moonriver/test" -> Blockchain.MoonriverTestnet + "mantle" -> Blockchain.Mantle + "mantle/test" -> Blockchain.MantleTestnet + "flare-network" -> Blockchain.Flare + "flare-network/test" -> Blockchain.FlareTestnet + "taraxa" -> Blockchain.Taraxa + "taraxa/test" -> Blockchain.TaraxaTestnet else -> null } } @@ -209,6 +217,14 @@ fun Blockchain.toNetworkId(): String { Blockchain.Nexa -> "nexa" // FIXME Blockchain.NexaTestnet -> "nexa/test" // FIXME Blockchain.Radiant -> "radiant" + Blockchain.Moonriver -> "moonriver" + Blockchain.MoonriverTestnet -> "moonriver/test" + Blockchain.Mantle -> "mantle" + Blockchain.MantleTestnet -> "mantle/test" + Blockchain.Flare -> "flare-network" + Blockchain.FlareTestnet -> "flare-network/test" + Blockchain.Taraxa -> "taraxa" + Blockchain.TaraxaTestnet -> "taraxa/test" } } @@ -277,6 +293,10 @@ fun Blockchain.toCoinId(): String { Blockchain.PolygonZkEVM, Blockchain.PolygonZkEVMTestnet -> "polygon-zkevm-ethereum" Blockchain.Nexa, Blockchain.NexaTestnet -> "nexa" // FIXME Blockchain.Radiant -> "radiant" + Blockchain.Moonriver, Blockchain.MoonriverTestnet -> "moonriver" + Blockchain.Mantle, Blockchain.MantleTestnet -> "mantle" + Blockchain.Flare, Blockchain.FlareTestnet -> "flare-networks" + Blockchain.Taraxa, Blockchain.TaraxaTestnet -> "taraxa" } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 059989055e..5fe435d39f 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -85,7 +85,7 @@ leakcanary = "2.13" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-539" +tangemBlockchainSdk = "develop-546" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-337" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^