From 52592324ff98f5aca04b25b8019ff715ef98a8b0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 29 Aug 2023 11:46:33 +0200
Subject: [PATCH] improve shop display state

---
 Habitica/res/drawable-hdpi/shop_locked.png    | Bin 0 -> 1557 bytes
 Habitica/res/drawable-xhdpi/shop_locked.png   | Bin 0 -> 2233 bytes
 Habitica/res/drawable-xxhdpi/shop_locked.png  | Bin 0 -> 3579 bytes
 Habitica/res/layout/row_shopitem.xml          |   2 ++
 Habitica/res/shop_locked.png                  | Bin 0 -> 1022 bytes
 Habitica/res/values/styles.xml                |   8 +++---
 .../adapter/inventory/ShopRecyclerAdapter.kt  |   4 ++-
 .../inventory/shops/QuestShopFragment.kt      |  12 ++++++++
 .../ui/viewHolders/ShopItemViewHolder.kt      |  27 +++++++++---------
 .../ui/views/HabiticaIconsHelper.java         |   2 +-
 version.properties                            |   2 +-
 11 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/shop_locked.png
 create mode 100644 Habitica/res/drawable-xhdpi/shop_locked.png
 create mode 100644 Habitica/res/drawable-xxhdpi/shop_locked.png
 create mode 100644 Habitica/res/shop_locked.png

diff --git a/Habitica/res/drawable-hdpi/shop_locked.png b/Habitica/res/drawable-hdpi/shop_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..21c480b88c99db97a58b301f3b6112e09a0352ed
GIT binary patch
literal 1557
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
Hu0mjf72xi4

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/shop_locked.png b/Habitica/res/drawable-xhdpi/shop_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..29ed84289226d489e54512c275504b5d1f678aea
GIT binary patch
literal 2233
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
Hu0mjf_4W_~

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/shop_locked.png b/Habitica/res/drawable-xxhdpi/shop_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3aab00062f78ef4c4bc794bb29d182c33ccab57
GIT binary patch
literal 3579
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
B*h&BZ

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 865c65947..73ee85d1a 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -78,6 +78,8 @@
             tools:visibility="visible"
             android:gravity="center"
             android:scaleType="center"
+            android:tintMode="multiply"
+            app:tint="@color/text_dimmed"
             android:textColor="@color/white" />
     </LinearLayout>
     <TextView
diff --git a/Habitica/res/shop_locked.png b/Habitica/res/shop_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9f9de8247dd8577d75365be7e3d35b546f3c451
GIT binary patch
literal 1022
zcmV<a0|ESrP)<h;3K|Lk000e1NJLTq000^Q000{Z1^@s6Viuok00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1CvQaK~#7FtyWD;
z6G0SyGi<j?16XTC8f)soL?!-`5bz=*U^R*ctsapxiP3{+>m3qrhQw%$K@{S_gNY^v
z{EM0x5PwRHG-WLk`H^n<-9mSFoEd2O+ii>RC9|_T^WJ{@z4!L*0<049AKAkOtP&`l
zfjlCY>7buQ7@Z>oJWHGrbQ40lF~RrkPW!9>B4PvtksAb{3^D-%31f83ZnsND+t`p~
zRKB4j(vdL<168YQq>uT6;d2;~5aNfmfRLLGr^9bbv@RqIWY;L!trbMFEOY7U{MC4z
z&w|C0&J=JKIz)5U&Fzy9ppkp2oFbz#1bZbuGi=<r0rnl(1DhRoQy)zwOi>v-=ZXdg
z2X|ToF=XbTC<?r8|1hsam{+Fqxwzy|O0wCwR$frx?BHGk7Op}HeEaf)&z_xb*u8fb
zKmQTv1xf1XDvMJP379MD;N?vK9ZW@(2$yU7Hc+Nxe7M{NOZH5GaGBrl#{xUh7j3_p
zoz&N#Jb(Z8ld%m|=JB|Vc@P{31OiB42YS5;Oc4AzSBNb6Mo^R(w=pL|d2MZNNEjIz
zN!jmIbuQ^g%a6?6n1+oLXU`Eof7YHX3^NoJ6(OD@UDx{|L%i;I&qt=vi5_M%b~>FT
zuBzWMbz~tl3!@>Cs)su}JBd(OSV)wqsdrXUJeA5J5whZv!%MEyAv!+RLJLmk`Dtuy
zbYHHm3mX}}eDNlkCo`~o9X)o$aPPy%Py0@vJ`u=b7Xt$WG2aDWzG$@;EjQe<)d6GC
zaiH%2SZG&RK5}z&Xe-(aR;##zWNK>ivG3yfyU}P=O;j9eXlU3`TYLE{MmQJN0U9l^
zckOS^v^;6~PRm=%N^FEep;&2YNg#h~{v}ukNTJY`3U9@$o}L~a_aspy64AT5y29n<
z$A|Os^1QGHg!_M8^`7)ToSt5&n8lxRQd3i-c)eA3x;}Sb&@}BgtP(2q`9ggwD=Y8T
z*Vj+8dnWdbx&n5&TpMUf7FJbMUAN`roWKaB%p3hGkJE_UX==LN)ZE-WFf=rzu;s-z
zX6*;j_scRdF=4B&uFkKktvl&(Y$>Hx=C+99c4j~okI%$nfxnT+#|IA{J$w4Jbx4vV
zrXs#rNjf49*4b&r2*bm};>^s9n4O)SWwY7P<m4o4mP8N)jjqqqoW_H}V0^iXjENT8
s(H}*2bL{i^l8ddatvX!;BL&Ox4;D6*<Ui50EdT%j07*qoM6N<$f^K)q`Tzg`

literal 0
HcmV?d00001

diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index c3e7340fc..d43ef13cc 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1012,12 +1012,12 @@
     </style>
 
     <style name="CountLabel">
-        <item name="android:background">@drawable/pill_bg_gray_300</item>
-        <item name="android:paddingStart">4dp</item>
-        <item name="android:paddingEnd">4dp</item>
+        <item name="android:background">@drawable/pill_bg_gray</item>
+        <item name="android:paddingStart">2dp</item>
+        <item name="android:paddingEnd">2dp</item>
         <item name="android:minWidth">24dp</item>
         <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/white</item>
+        <item name="android:textColor">@color/text_quad</item>
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">bold</item>
     </style>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index b68908091..868d0ca2b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.Analytics
 import com.habitrpg.android.habitica.helpers.EventCategory
 import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopCategory
 import com.habitrpg.android.habitica.models.shops.ShopItem
@@ -27,9 +26,11 @@ import com.habitrpg.android.habitica.ui.views.getTranslatedClassName
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
 import com.habitrpg.common.habitica.extensions.fromHtml
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 
 class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<ViewHolder>() {
 
+    var completedQuests: List<String?> = emptyList()
     var armoireCount: Int = 0
     var onNeedsRefresh: (() -> Unit)? = null
     var onShowPurchaseDialog: ((ShopItem, Boolean) -> Unit)? = null
@@ -177,6 +178,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
                     val numberOwned = ownedItems[obj.key + "-" + obj.purchaseType]?.numberOwned ?: 0
                     itemHolder.bind(obj, obj.canAfford(user, 1), numberOwned)
                     itemHolder.isPinned = pinnedItemKeys.contains(obj.key)
+                    itemHolder.isCompleted = completedQuests.contains(obj.key)
                 }
                 is String -> (holder as? EmptyStateViewHolder)?.text = obj
                 is Pair<*, *> -> (holder as? ArmoireGearViewHolder)?.bind(obj.first as? String ?: "", obj.second as? Int ?: 0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
index 40bcc734c..5ed26abba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
@@ -4,7 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.models.shops.Shop
+import com.habitrpg.common.habitica.helpers.launchCatching
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -17,4 +19,14 @@ class QuestShopFragment : ShopFragment() {
         shopIdentifier = Shop.QUEST_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        lifecycleScope.launchCatching {
+            userRepository.getQuestAchievements().collect {
+                adapter?.completedQuests = it.map { it.questKey }
+            }
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index 8725fdc93..4858aa9af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -11,7 +11,6 @@ import com.habitrpg.android.habitica.databinding.RowShopitemBinding
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.extensions.loadImage
 
 class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
@@ -66,28 +65,28 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
             binding.priceLabel.visibility = View.GONE
             binding.unlockLabel.visibility = View.VISIBLE
         }
+        val isLimited = item.isLimited || item.event?.end != null
         if (numberOwned > 0) {
             binding.itemDetailIndicator.text = numberOwned.toString()
-            binding.itemDetailIndicator.background = if (context.isUsingNightModeResources()) {
-                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumberDark(item.isLimited || item.event?.end != null))
-            } else {
-                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumber(item.isLimited || item.event?.end != null))
-            }
+            binding.itemDetailIndicator.background =
+                AppCompatResources.getDrawable(context, R.drawable.pill_bg_gray)
             binding.itemDetailIndicator.visibility = View.VISIBLE
-        } else if (item.locked) {
-            binding.itemDetailIndicator.background = if (context.isUsingNightModeResources()) {
-                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLockedDark(item.isLimited || item.event?.end != null))
-            } else {
-                BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLocked(item.isLimited || item.event?.end != null))
-            }
+        }
+        if (item.locked) {
+            binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.shop_locked)
             binding.itemDetailIndicator.visibility = View.VISIBLE
-        } else if (item.isLimited || item.event?.end != null) {
-            binding.itemDetailIndicator.background = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
+        } else if (isLimited) {
+            if (numberOwned == 0) {
+                binding.itemDetailIndicator.background = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
+            } else {
+                binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.pill_bg_purple_300)
+            }
             binding.itemDetailIndicator.visibility = View.VISIBLE
         }
 
         if (item.key == "gem" && item.limitedNumberLeft == -1) {
             binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.item_indicator_subscribe)
+            binding.itemDetailIndicator.visibility = View.VISIBLE
         }
 
         if (binding.itemDetailIndicator.visibility == View.VISIBLE) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index c912f7d4f..1fc350352 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -234,7 +234,7 @@ public class HabiticaIconsHelper {
         if (imageOfPinnedItem != null)
             return imageOfPinnedItem;
 
-        int size = scaleSize(16);
+        int size = scaleSize(14);
         imageOfPinnedItem = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfPinnedItem);
         canvas.scale(displayDensity, displayDensity);
diff --git a/version.properties b/version.properties
index 071d764ba..ad3e14c36 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.3
-CODE=6381
\ No newline at end of file
+CODE=6391
\ No newline at end of file