diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..8cb2c15951 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/shelf/ \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 54a6d70a21..899ffe6c8f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,4 +1,4 @@ ext.versions = [ kotlin : '1.3.61', - build_gradle: '3.6.0', + build_gradle: '3.6.1', ] 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 3fa43bfe6b..e2b0c9a5ee 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() < 32) { + if (artworks.count() < 39) { // forceSave=true only on the last one putResourceArtworkToCatalog(R.drawable.card_default, false) putResourceArtworkToCatalog(R.drawable.card_default_nft, false) @@ -78,6 +78,13 @@ class LocalStorage putResourceArtworkToCatalog(R.drawable.card_ru043, false) putResourceArtworkToCatalog(R.drawable.card_tg044, false) putResourceArtworkToCatalog(R.drawable.card_tg046, false) + putResourceArtworkToCatalog(R.drawable.card_tg054, false) + putResourceArtworkToCatalog(R.drawable.card_tg055, false) + putResourceArtworkToCatalog(R.drawable.card_tg057, false) + putResourceArtworkToCatalog(R.drawable.card_tg060, false) + putResourceArtworkToCatalog(R.drawable.card_tg061, false) + putResourceArtworkToCatalog(R.drawable.card_tg062, false) + putResourceArtworkToCatalog(R.drawable.card_tg063, false) putResourceArtworkToCatalog(R.drawable.card_tgslix, false) putResourceArtworkToCatalog(R.drawable.card_bc00, false) putResourceArtworkToCatalog(R.drawable.card_ff32, true) @@ -274,6 +281,15 @@ class LocalStorage card.batch == "0029" -> R.drawable.card_ru041 card.batch == "0031" -> R.drawable.card_ru042 card.batch == "0034" -> R.drawable.card_tg046 + card.batch == "0041" -> R.drawable.card_tg054 + card.batch == "0042" -> R.drawable.card_tg055 + card.batch == "0046" -> R.drawable.card_tg054 + card.batch == "0047" -> R.drawable.card_tg055 + card.batch == "0045" -> R.drawable.card_tg057 + card.batch == "0049" -> R.drawable.card_tg060 + card.batch == "0050" -> R.drawable.card_tg061 + card.batch == "0051" -> R.drawable.card_tg062 + card.batch == "0052" -> R.drawable.card_tg063 card.batch == "FF32" -> R.drawable.card_ff32 else -> null diff --git a/server-android/src/main/res/drawable/card_tg054.png b/server-android/src/main/res/drawable/card_tg054.png new file mode 100644 index 0000000000..c3056e045f Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg054.png differ diff --git a/server-android/src/main/res/drawable/card_tg055.png b/server-android/src/main/res/drawable/card_tg055.png new file mode 100644 index 0000000000..cbe1f71ad0 Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg055.png differ diff --git a/server-android/src/main/res/drawable/card_tg057.png b/server-android/src/main/res/drawable/card_tg057.png new file mode 100644 index 0000000000..ec90d9cf93 Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg057.png differ diff --git a/server-android/src/main/res/drawable/card_tg060.png b/server-android/src/main/res/drawable/card_tg060.png new file mode 100644 index 0000000000..7ae0028c1b Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg060.png differ diff --git a/server-android/src/main/res/drawable/card_tg061.png b/server-android/src/main/res/drawable/card_tg061.png new file mode 100644 index 0000000000..d836185971 Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg061.png differ diff --git a/server-android/src/main/res/drawable/card_tg062.png b/server-android/src/main/res/drawable/card_tg062.png new file mode 100644 index 0000000000..47555d09bf Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg062.png differ diff --git a/server-android/src/main/res/drawable/card_tg063.png b/server-android/src/main/res/drawable/card_tg063.png new file mode 100644 index 0000000000..4e9d89394f Binary files /dev/null and b/server-android/src/main/res/drawable/card_tg063.png differ