diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt index e052f8b620..16bda68d78 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt @@ -88,11 +88,16 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte resources.getColorStateList(R.color.btn_dark) } private val activeColor: ColorStateList by lazy { + val color = if( (Util.bytesToHex(ctx.card?.cid)?.startsWith("10") == true)) { + R.color.start2coin_orange + } else { + R.color.colorAccent + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - resources.getColorStateList(R.color.colorAccent, activity?.theme) + resources.getColorStateList(color, activity?.theme) else @Suppress("DEPRECATION") - resources.getColorStateList(R.color.colorAccent) + resources.getColorStateList(color) } private var requestCounter: Int = 0 set(value) { @@ -144,6 +149,10 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte btnCopy.setOnClickListener { doShareWallet(false) } + if (Util.bytesToHex(ctx.card?.cid)?.startsWith("10") == true) { + btnLoad?.visibility = View.GONE + } + btnLoad.setOnClickListener { val items = arrayOf(getString(R.string.in_app), getString(R.string.load_via_share_address), getString(R.string.load_via_qr))//, getString(R.string.via_cryptonit), getString(R.string.via_kraken)) val cw = android.view.ContextThemeWrapper(activity, R.style.AlertDialogTheme) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2994fce01a..1dad9a7498 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -38,5 +38,6 @@ #600600 #bff2af #37000000 + #f9af25 \ No newline at end of file diff --git a/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt b/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt index 3bfebc688a..92d09b438a 100644 --- a/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt +++ b/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt @@ -47,7 +47,7 @@ class LocalStorage artworks = HashMap() } - if (artworks.count() < 28) { + if (artworks.count() < 29) { // forceSave=true only on the last one putResourceArtworkToCatalog(R.drawable.card_default, false) putResourceArtworkToCatalog(R.drawable.card_default_nft, false) @@ -76,6 +76,7 @@ class LocalStorage putResourceArtworkToCatalog(R.drawable.card_ru042, false) putResourceArtworkToCatalog(R.drawable.card_ru043, false) putResourceArtworkToCatalog(R.drawable.card_tg044, false) + putResourceArtworkToCatalog(R.drawable.card_tg046, false) putResourceArtworkToCatalog(R.drawable.card_ff32, true) } if (batchesFile.exists()) { @@ -260,6 +261,7 @@ class LocalStorage card.batch == "0028" -> R.drawable.card_ru040 card.batch == "0029" -> R.drawable.card_ru041 card.batch == "0031" -> R.drawable.card_ru042 + card.batch == "0034" -> R.drawable.card_tg046 card.batch == "FF32" -> R.drawable.card_ff32 else -> null diff --git a/server-android/src/main/res/drawable/card_tg046.png b/server-android/src/main/res/drawable/card_tg046.png new file mode 100644 index 0000000000..fc7846de6c Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg046.png differ