sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 11:46:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix scrolling issue on shops screen

Browse source
This commit is contained in:
Phillip Thelen 2020-07-16 10:34:51 +02:00
parent a9d8ca24c3
commit 871ed51970
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
View file

@ -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()
}
}