From 871ed519706c9e36876c969d1c0f8b13688469f3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@thelen.space>
Date: Thu, 16 Jul 2020 10:34:51 +0200
Subject: [PATCH] Fix scrolling issue on shops screen

---
 .../habitica/ui/fragments/inventory/shops/ShopsFragment.kt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
index 8280b1510..5dae10324 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
@@ -54,7 +54,6 @@ open class ShopsFragment : BaseMainFragment() {
             this.usesTabLayout = false
             tabLayout?.visibility = View.GONE
             viewPager.currentItem = lockTab ?: 0
-            viewPager.setOnTouchListener { _, _ -> true }
         }
 
         context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIndex", lockTab))) }
@@ -85,7 +84,7 @@ open class ShopsFragment : BaseMainFragment() {
 
                 val fragment = ShopFragment()
 
-                fragment.shopIdentifier = when (position) {
+                fragment.shopIdentifier = when (lockTab ?: position) {
                     0 -> Shop.MARKET
                     1 -> Shop.QUEST_SHOP
                     2 -> Shop.SEASONAL_SHOP
@@ -97,7 +96,7 @@ open class ShopsFragment : BaseMainFragment() {
                 return fragment
             }
 
-            override fun getCount(): Int = 4
+            override fun getCount(): Int = if (lockTab != null) 1 else 4
 
             override fun getPageTitle(position: Int): CharSequence? {
                 return when (position) {
@@ -118,6 +117,6 @@ open class ShopsFragment : BaseMainFragment() {
     private fun updateCurrencyView(user: User) {
         currencyView.gold = user.stats?.gp ?: 0.0
         currencyView.gems = user.gemCount.toDouble()
-        currencyView.hourglasses = user.hourglassCount?.toDouble() ?: 0.0
+        currencyView.hourglasses = user.hourglassCount.toDouble()
     }
 }