diff --git a/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyShop.kt b/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyShop.kt index a2244b7442..5fde9c60ff 100644 --- a/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyShop.kt +++ b/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyShop.kt @@ -1,5 +1,8 @@ package com.tangem.tap.common.shop.shopify +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) data class ShopifyShop( val domain: String, val storefrontApiKey: String, diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt index 365cdcff90..4324891cae 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt @@ -89,7 +89,7 @@ class ConfigManager( infuraProjectId = values.infuraProjectId ), appsFlyerDevKey = values.appsFlyerDevKey, - shopify = values.shopify, + shopify = values.shopifyShop, ) defaultConfig = defaultConfig.copy( coinMarketCapKey = values.coinMarketCapKey, @@ -102,7 +102,7 @@ class ConfigManager( infuraProjectId = values.infuraProjectId ), appsFlyerDevKey = values.appsFlyerDevKey, - shopify = values.shopify, + shopify = values.shopifyShop, ) } diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt index 3ed4044447..c82d448e7d 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt @@ -22,7 +22,7 @@ class ConfigValueModel( val blockcypherTokens: Set?, val infuraProjectId: String?, val appsFlyerDevKey: String, - val shopify: ShopifyShop? + val shopifyShop: ShopifyShop? ) class ConfigModel(val features: FeatureModel?, val configValues: ConfigValueModel?) { diff --git a/app/src/main/res/drawable-hdpi/card_placeholder_new.png b/app/src/main/res/drawable-hdpi/card_placeholder_new.png deleted file mode 100644 index 4c9cff9062..0000000000 Binary files a/app/src/main/res/drawable-hdpi/card_placeholder_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/card_placeholder_wallet.9.png b/app/src/main/res/drawable-hdpi/card_placeholder_wallet.9.png new file mode 100644 index 0000000000..97ea9bc260 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_placeholder_wallet.9.png differ diff --git a/app/src/main/res/drawable-ldpi/card_new.png b/app/src/main/res/drawable-ldpi/card_new.png deleted file mode 100644 index 465b2c23f7..0000000000 Binary files a/app/src/main/res/drawable-ldpi/card_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/card_placeholder_new.png b/app/src/main/res/drawable-ldpi/card_placeholder_new.png deleted file mode 100644 index e9986ae27f..0000000000 Binary files a/app/src/main/res/drawable-ldpi/card_placeholder_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/card_placeholder_new.png b/app/src/main/res/drawable-mdpi/card_placeholder_new.png deleted file mode 100644 index b15e1cf3bb..0000000000 Binary files a/app/src/main/res/drawable-mdpi/card_placeholder_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/card_placeholder_wallet.9.png b/app/src/main/res/drawable-mdpi/card_placeholder_wallet.9.png new file mode 100644 index 0000000000..8a45ec562c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/card_placeholder_wallet.9.png differ diff --git a/app/src/main/res/drawable-xhdpi/card_placeholder_new.png b/app/src/main/res/drawable-xhdpi/card_placeholder_new.png deleted file mode 100644 index a9f3c750e0..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/card_placeholder_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/card_placeholder_wallet.9.png b/app/src/main/res/drawable-xhdpi/card_placeholder_wallet.9.png new file mode 100644 index 0000000000..ee8fdfd5f2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/card_placeholder_wallet.9.png differ diff --git a/app/src/main/res/drawable-xxhdpi/card_placeholder_new.png b/app/src/main/res/drawable-xxhdpi/card_placeholder_new.png deleted file mode 100644 index 0caf7a0d35..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/card_placeholder_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/card_placeholder_wallet.9.png b/app/src/main/res/drawable-xxhdpi/card_placeholder_wallet.9.png new file mode 100644 index 0000000000..7483c7232b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/card_placeholder_wallet.9.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/card_placeholder_new.png b/app/src/main/res/drawable-xxxhdpi/card_placeholder_new.png deleted file mode 100644 index 56a6e580f0..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/card_placeholder_new.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/card_placeholder_wallet.9.png b/app/src/main/res/drawable-xxxhdpi/card_placeholder_wallet.9.png new file mode 100644 index 0000000000..3fb1bc1422 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/card_placeholder_wallet.9.png differ diff --git a/app/src/main/res/layout/fragment_onboarding_wallet.xml b/app/src/main/res/layout/fragment_onboarding_wallet.xml index 5df3b30845..50db217206 100644 --- a/app/src/main/res/layout/fragment_onboarding_wallet.xml +++ b/app/src/main/res/layout/fragment_onboarding_wallet.xml @@ -81,7 +81,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:src="@drawable/card_placeholder_new" + android:src="@drawable/card_placeholder_black" android:visibility="gone" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" @@ -94,7 +94,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:src="@drawable/card_placeholder_new" + android:src="@drawable/card_placeholder_black" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" android:scaleType="fitCenter" @@ -105,7 +105,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:src="@drawable/card_placeholder_new" + android:src="@drawable/card_placeholder_black" android:transitionName="imv_front_card" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml index 839265fadc..ef4297ba3d 100644 --- a/app/src/main/res/layout/fragment_shop.xml +++ b/app/src/main/res/layout/fragment_shop.xml @@ -66,7 +66,7 @@ android:layout_gravity="center" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:src="@drawable/card_new" + android:src="@drawable/card_placeholder_wallet" android:visibility="visible" app:layout_constraintBottom_toTopOf="@id/tv_header" app:layout_constraintEnd_toEndOf="parent" @@ -81,7 +81,7 @@ android:layout_gravity="center" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:src="@drawable/card_new" + android:src="@drawable/card_placeholder_wallet" android:visibility="visible" app:layout_constraintBottom_toTopOf="@id/tv_header" app:layout_constraintEnd_toEndOf="parent" @@ -96,7 +96,7 @@ android:layout_gravity="center" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:src="@drawable/card_new" + android:src="@drawable/card_placeholder_wallet" android:visibility="visible" app:layout_constraintBottom_toTopOf="@id/tv_header" app:layout_constraintEnd_toEndOf="parent"