From fa7ec797da69fe1bc27d60c40ad6b094017183bb Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 8 Nov 2017 18:29:11 +0100
Subject: [PATCH] improve unlock condition display

---
 Habitica/res/layout/row_shopitem.xml               | 14 ++++++++++++--
 .../habitica/ui/viewHolders/ShopItemViewHolder.kt  |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index da6735a04..65a66d8c9 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -5,7 +5,8 @@
                 android:layout_height="wrap_content"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:clickable="true"
-                android:background="@color/white">
+                android:background="@color/white"
+                android:focusable="true">
     <LinearLayout
         android:id="@+id/container"
         android:layout_marginTop="6dp"
@@ -36,6 +37,16 @@
                 style="@style/Body1"
                 app:hasLightBackground="true"
                 android:textSize="15sp" />
+            <TextView
+                android:id="@+id/unlockLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                style="@style/Body1"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                />
         </LinearLayout>
     </LinearLayout>
     <ImageView
@@ -60,5 +71,4 @@
         android:textColor="@color/white"
         android:layout_marginRight="-4dp"
         android:textSize="12sp" />
-
 </RelativeLayout>
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 bf5d60668..9049c924f 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
@@ -21,6 +21,7 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
     private val imageView: SimpleDraweeView by bindView(itemView, R.id.imageView)
     private val buyButton: View by bindView(itemView, R.id.buyButton)
     private val priceLabel: CurrencyView by bindView(itemView, R.id.priceLabel)
+    private val unlockLabel: TextView by bindView(itemView, R.id.unlockLabel)
     private val itemDetailIndicator: TextView by bindView(itemView, R.id.item_detail_indicator)
     private val pinIndicator: ImageView by bindView(itemView, R.id.pin_indicator)
 
@@ -67,8 +68,12 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
             if (item.currency == null) {
                 buyButton.visibility = View.GONE
             }
+            priceLabel.visibility = View.VISIBLE
+            unlockLabel.visibility = View.GONE
         } else {
-            priceLabel.setText(item.unlockCondition!!.readableUnlockConditionId())
+            unlockLabel.setText(item.unlockCondition!!.readableUnlockConditionId())
+            priceLabel.visibility = View.GONE
+            unlockLabel.visibility = View.VISIBLE
         }
 
         itemDetailIndicator.text = null