diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletIconUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletIconUseCase.kt index c370657bd3..7c33fd1cca 100644 --- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletIconUseCase.kt +++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletIconUseCase.kt @@ -86,7 +86,7 @@ class GetWalletIconUseCase( runBlocking { walletsRepository.isWalletWithRing(userWalletId = this@isRing.walletId) } } - @Suppress("CyclomaticComplexMethod") + @Suppress("CyclomaticComplexMethod", "LongMethod") private fun colorByBatchId(batchId: String): UserWalletIcon.Colored? { fun color(main: String, second: String = main, third: String = main) = UserWalletIcon.Colored(isRing = false, mainColor = main, secondColor = second, thirdColor = third) @@ -154,8 +154,11 @@ class GetWalletIconUseCase( CobrandType.Ghoad -> color("#6EC5C5") CobrandType.BlushSky -> color("#C1E9E8", "#FACAD3", "#DCCEE0") CobrandType.ElectraSea -> color("#0D5A67", "#29939E", "#30C6B1") + CobrandType.Football -> color("#1AA71E") + CobrandType.French -> color("#3249A1") CobrandType.HyperBlue -> color("#0F397C", "#1474D3", "#0BC9EC") CobrandType.Lunar -> color("#B0313A") + CobrandType.Metaplanet -> color("#635955") null -> null } } @@ -198,7 +201,7 @@ private enum class CobrandType(val batchIds: List) { Pastel(listOf("AF43", "AF44", "AF45", "AF78", "AF79", "AF80")), Pepecoin(listOf("BB000015")), RamenCat(listOf("AF990006", "AF990007", "AF990008")), - RedPanda(listOf("AF34")), + RedPanda(listOf("AF34", "BB000038")), Rizo(listOf("BB000012")), Sakura(listOf("AF990029", "AF990030", "AF990031", "AF990071", "AF990072", "AF990073")), SatoshiFriends(listOf("AF19")), @@ -222,8 +225,11 @@ private enum class CobrandType(val batchIds: List) { Ghoad(listOf("AF89")), BlushSky(listOf("AF990020", "AF990021", "AF990022")), ElectraSea(listOf("AF990023", "AF990024", "AF990025")), + Football(listOf("AF990090", "AF990089", "AF990088")), + French(listOf("AF990084", "AF990085", "AF990086")), HyperBlue(listOf("AF990026", "AF990027", "AF990028", "AF990050", "AF990051", "AF990052")), Lunar(listOf("AF990057", "AF990058", "AF990059")), + Metaplanet(listOf("BB000040")), } private enum class OtherCardType(val mainColor: String) { diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt index ae764cf797..c844afcbdf 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt @@ -239,7 +239,7 @@ internal enum class Wallet2CobrandImage( RedPanda( cards2ResId = R.drawable.ill_red_panda_card2_120_106, cards3ResId = R.drawable.ill_red_panda_card3_120_106, - batchIds = setOf("AF34"), + batchIds = setOf("AF34", "BB000038"), ), Rizo( @@ -381,6 +381,18 @@ internal enum class Wallet2CobrandImage( batchIds = setOf("AF990023", "AF990024", "AF990025"), ), + Football( + cards2ResId = R.drawable.ill_football_card2_120_106, + cards3ResId = R.drawable.ill_football_card3_120_106, + batchIds = setOf("AF990090", "AF990089", "AF990088"), + ), + + French( + cards2ResId = R.drawable.ill_french_card2_120_106, + cards3ResId = R.drawable.ill_french_card3_120_106, + batchIds = setOf("AF990084", "AF990085", "AF990086"), + ), + HyperBlue( cards2ResId = R.drawable.ill_hyperblue_card2_120_106, cards3ResId = R.drawable.ill_hyperblue_card3_120_106, @@ -392,4 +404,10 @@ internal enum class Wallet2CobrandImage( cards3ResId = R.drawable.ill_lunar_card3_120_106, batchIds = setOf("AF990057", "AF990058", "AF990059"), ), + + Metaplanet( + cards2ResId = R.drawable.ill_metaplanet_card2_120_106, + cards3ResId = R.drawable.ill_metaplanet_card3_120_106, + batchIds = setOf("BB000040"), + ), } \ No newline at end of file diff --git a/features/wallet/impl/src/main/res/drawable/ill_football_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_football_card2_120_106.webp new file mode 100644 index 0000000000..7b234296da Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_football_card2_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_football_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_football_card3_120_106.webp new file mode 100644 index 0000000000..cff30d2b13 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_football_card3_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_french_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_french_card2_120_106.webp new file mode 100644 index 0000000000..4f15a6ff04 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_french_card2_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_french_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_french_card3_120_106.webp new file mode 100644 index 0000000000..ef590297a5 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_french_card3_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_metaplanet_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_metaplanet_card2_120_106.webp new file mode 100644 index 0000000000..ad53083b14 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_metaplanet_card2_120_106.webp differ diff --git a/features/wallet/impl/src/main/res/drawable/ill_metaplanet_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_metaplanet_card3_120_106.webp new file mode 100644 index 0000000000..30fcb4e371 Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_metaplanet_card3_120_106.webp differ