From 3d7a41bbaa4fc5f7518839025c332ad08f9f4612 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 14 May 2021 17:31:07 +0200
Subject: [PATCH] Fixes #1536

---
 .../habitica/ui/fragments/PromoWebFragment.kt        |  9 ++++++++-
 .../habitica/ui/views/shops/PurchaseDialog.kt        | 12 +++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt
index a4bc96faf..7edc9bbbf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt
@@ -8,8 +8,13 @@ import android.view.ViewGroup
 import android.webkit.WebChromeClient
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentNewsBinding
+import com.habitrpg.android.habitica.modules.AppModule
+import javax.inject.Inject
+import javax.inject.Named
 
 class PromoWebFragment : BaseMainFragment<FragmentNewsBinding>() {
+    @field:[Inject Named(AppModule.NAMED_USER_ID)]
+    lateinit var userID: String
 
     override var binding: FragmentNewsBinding? = null
 
@@ -32,7 +37,9 @@ class PromoWebFragment : BaseMainFragment<FragmentNewsBinding>() {
         }
         arguments?.let {
             val args = PromoWebFragmentArgs.fromBundle(it)
-            binding?.newsWebview?.loadUrl(args.url)
+            var url = args.url
+            url = url.replace("USER_ID", userID)
+            binding?.newsWebview?.loadUrl(url)
 
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 4f10625ad..89c97d367 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -191,9 +191,15 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             }
         } else if (shopItem.locked) {
             buyLabel.text = context.getString(R.string.locked)
-            limitedTextView.visibility = View.VISIBLE
-            limitedTextView.background = ContextCompat.getColor(context, R.color.offset_background).toDrawable()
-            limitedTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            limitedTextView.visibility = View.GONE
+            if (shopItem.isTypeGear && shopItem.key.last().toString().toIntOrNull() != null) {
+                val previousKey = "${shopItem.key.dropLast(1)}${shopItem.key.last().toString().toIntOrNull()}"
+                if (user?.items?.gear?.owned?.find { it.key ==  previousKey} == null) {
+                    limitedTextView.visibility = View.VISIBLE
+                    limitedTextView.background = ContextCompat.getColor(context, R.color.offset_background).toDrawable()
+                    limitedTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+                }
+            }
         } else {
             limitedTextView.visibility = View.GONE
         }