diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 01c88fedd1..0412c6eacf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,6 +18,9 @@ android { jniLibs { useLegacyPackaging = true } + resources.excludes.add("META-INF/DEPENDENCIES") + resources.excludes.add("META-INF/LICENSE.md") + resources.excludes.add("META-INF/NOTICE.md") } } 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 97adf7cbe4..59fe1fa692 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 @@ -74,6 +74,7 @@ fun getActiveIconRes(blockchainId: String): Int { "filecoin" -> R.drawable.img_filecoin_22 "cyber", "cyber/test" -> R.drawable.img_cyber_22 "sei", "sei/test" -> R.drawable.img_sei_22 + "internet-computer" -> R.drawable.img_icp_22 else -> R.drawable.ic_alert_24 } } @@ -149,11 +150,12 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "filecoin" -> R.drawable.img_filecoin_22 "cyber", "cyber/test" -> R.drawable.img_cyber_22 "sei", "sei/test" -> R.drawable.img_sei_22 + "internet-computer" -> R.drawable.img_icp_22 else -> R.drawable.ic_alert_24 } } -@Suppress("ComplexMethod") +@Suppress("ComplexMethod", "LongMethod") @DrawableRes fun getActiveIconResByCoinId(coinId: String): Int { return when (coinId) { @@ -221,6 +223,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "filecoin" -> R.drawable.img_filecoin_22 "cyber", "cyber/test" -> R.drawable.img_cyber_22 "sei", "sei/test" -> R.drawable.img_sei_22 + "internet-computer" -> R.drawable.img_icp_22 else -> R.drawable.ic_alert_24 } } @@ -296,6 +299,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "filecoin" -> R.drawable.ic_filecoin_22 "cyber", "cyber/test" -> R.drawable.ic_cyber_22 "sei", "sei/test" -> R.drawable.ic_sei_22 + "internet-computer" -> R.drawable.ic_icp_22 else -> R.drawable.ic_alert_24 } } @@ -371,6 +375,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "filecoin" -> R.drawable.ic_filecoin_22 "cyber", "cyber/test" -> R.drawable.ic_cyber_22 "sei", "sei/test" -> R.drawable.ic_sei_22 + "internet-computer" -> R.drawable.ic_icp_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_icp_22.xml b/core/ui/src/main/res/drawable/ic_icp_22.xml new file mode 100644 index 0000000000..cd67883760 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_icp_22.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/core/ui/src/main/res/drawable/img_icp_22.xml b/core/ui/src/main/res/drawable/img_icp_22.xml new file mode 100644 index 0000000000..6210d2c900 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_icp_22.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle.properties b/gradle.properties index b2ef2745d2..c4b0b8ac32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,5 @@ org.gradle.jvmargs = -Xmx6144m -XX:MaxMetaspaceSize=768m -XX: org.gradle.parallel = true org.gradle.daemon = true android.useAndroidX = true -android.enableJetifier = true org.gradle.unsafe.configuration-cache = true android.nonTransitiveRClass = false diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 7872a1cb27..74c59e4344 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-762" +tangemBlockchainSdk = "develop-765" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-381" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt index 8974e4e1ce..cddafe6527 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt @@ -125,6 +125,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "cyber/test" -> Blockchain.CyberTestnet "sei-network" -> Blockchain.Sei "sei-network/test" -> Blockchain.SeiTestnet + "internet-computer" -> Blockchain.InternetComputer else -> null } } @@ -251,6 +252,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.CyberTestnet -> "cyber/test" Blockchain.Sei -> "sei-network" Blockchain.SeiTestnet -> "sei-network/test" + Blockchain.InternetComputer -> "internet-computer" } } @@ -334,6 +336,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Blast, Blockchain.BlastTestnet -> "blast-ethereum" Blockchain.Cyber, Blockchain.CyberTestnet -> "cyber-ethereum" Blockchain.Sei, Blockchain.SeiTestnet -> "sei-network" + Blockchain.InternetComputer -> "internet-computer" } } @@ -364,4 +367,6 @@ private val excludedBlockchains = listOf( Blockchain.Unknown, Blockchain.Nexa, Blockchain.NexaTestnet, + Blockchain.Sei, + Blockchain.InternetComputer, ) \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 740ce7ce0c..1940d94012 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -95,8 +95,18 @@ dependencyResolutionManagement { includeGroupAndSubgroups("com.tangem.vico") } } + maven { + // setting any repository from tangem project allows maven search all packages in the project + url = uri("https://maven.pkg.github.com/tangem/ic4j-agent") + credentials { + username = properties.getProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") + password = properties.getProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") + } + content { + includeGroupAndSubgroups("com.tangem.ic4j") + } + } maven("https://jitpack.io") - maven("https://clients-nexus.sprinklr.com/") } versionCatalogs {