From 396ddffc554c8bcf946e40f484f764992f41ecf1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 15 Apr 2019 13:29:48 +0200
Subject: [PATCH] Squashed commit of the following:

commit b2c0612855b8129ccd5236f8b045f20f4490e02e
Author: Phillip Thelen <viirus@pherth.net>
Date:   Mon Apr 15 13:26:51 2019 +0200

    Fix issues with items and pets

commit 15ae2ee15057522f1407147a389c94ab87591892
Author: Phillip Thelen <viirus@pherth.net>
Date:   Wed Apr 10 12:52:52 2019 +0200

    fix typo

commit 225d096155f5989740454d64025e99418893e0f3
Author: Phillip Thelen <viirus@pherth.net>
Date:   Wed Apr 10 02:20:33 2019 +0200

    fix wacky pets deserialization
---
 Habitica/res/layout/menu_bottom_sheet.xml     |  2 +-
 .../res/layout/menu_bottom_sheet_item.xml     | 10 +++-
 Habitica/res/values/dimens.xml                |  2 +-
 Habitica/res/values/strings.xml               |  4 +-
 Habitica/res/values/styles.xml                |  1 +
 .../adapter/inventory/ItemRecyclerAdapter.kt  | 16 +++---
 .../inventory/PetDetailRecyclerAdapter.kt     | 24 ++++----
 .../inventory/items/ItemRecyclerFragment.kt   |  2 +-
 .../stable/PetDetailRecyclerFragment.kt       |  2 +-
 .../stable/StableRecyclerFragment.kt          |  4 ++
 .../habitica/ui/menu/BottomSheetMenu.java     | 56 -------------------
 .../habitica/ui/menu/BottomSheetMenu.kt       | 46 +++++++++++++++
 .../BottomSheetMenuSelectionRunnable.java     |  7 ---
 13 files changed, 85 insertions(+), 91 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuSelectionRunnable.java

diff --git a/Habitica/res/layout/menu_bottom_sheet.xml b/Habitica/res/layout/menu_bottom_sheet.xml
index 94fef211a..943ae2746 100644
--- a/Habitica/res/layout/menu_bottom_sheet.xml
+++ b/Habitica/res/layout/menu_bottom_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     style="@style/BottomMenu"
     android:clickable="false">
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/menu_bottom_sheet_item.xml b/Habitica/res/layout/menu_bottom_sheet_item.xml
index 3fe3c3490..2155670b1 100644
--- a/Habitica/res/layout/menu_bottom_sheet_item.xml
+++ b/Habitica/res/layout/menu_bottom_sheet_item.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/BottomMenuItem"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true">
     <TextView
         android:id="@+id/textView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/BottomMenuItemText" />
+        style="@style/BottomMenuItemText"
+        tools:text="Menu Item"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 8daf946d8..b6043347f 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -72,7 +72,7 @@
     <dimen name="drawer_section_item_text">12sp</dimen>
     <dimen name="material_drawer_section_vertical_padding">4dp</dimen>
     <dimen name="pet_width">120dp</dimen>
-    <dimen name="bottom_menu_padding">18dp</dimen>
+    <dimen name="bottom_menu_padding">28dp</dimen>
     <dimen name="pet_image_width">81dp</dimen>
     <dimen name="pet_image_height">99dp</dimen>
     <dimen name="shop_height">124dp</dimen>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index d9ed3084a..403caf17b 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -341,12 +341,12 @@
     <string name="sectionpremiumPets">Magic Potion</string>
     <string name="sectionquestPets">Quest</string>
     <string name="sectionspecialPets">Rare</string>
-    <string name="sectionwhackyPets">Whacky</string>
+    <string name="sectionwackyPets">Wacky</string>
     <string name="sectionmounts">Standard</string>
     <string name="sectionpremiumMounts">Magic Potion</string>
     <string name="sectionquestMounts">Quest</string>
     <string name="sectionspecialMounts">Rare</string>
-    <string name="sectionwhackyMounts">Whacky</string>
+    <string name="sectionwackyMounts">Wacky</string>
     <string name="world_quest">World Quest</string>
     <string name="inn_description">Need a break? Check into Daniel’s Inn to pause some of Habitica’s more difficult game mechanics:\n\n
 &#8226; Missed Dailies won’t damage you\n
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index d6f363211..008146169 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -161,6 +161,7 @@
     <style name="BottomMenu">
         <item name="android:divider">?android:listDivider</item>
         <item name="android:showDividers">middle</item>
+        <item name="android:paddingBottom">@dimen/spacing_medium</item>
     </style>
     
     <style name="BottomMenuItem">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
index b43a406a7..1ec7dc9d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
@@ -35,7 +35,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
     var hatchingItem: Item? = null
     var feedingPet: Pet? = null
     var fragment: ItemRecyclerFragment? = null
-    private var ownedPets: RealmResults<Pet>? = null
+    private var existingPets: RealmResults<Pet>? = null
     var context: Context? = null
     var items: Map<String, Item>? = null
     set(value) {
@@ -65,8 +65,8 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
         }
     }
 
-    fun setOwnedPets(pets: RealmResults<Pet>) {
-        ownedPets = pets
+    fun setExistingPets(pets: RealmResults<Pet>) {
+        existingPets = pets
     }
 
 
@@ -80,14 +80,15 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
 
         var resources: Resources = itemView.resources
 
-        private val isPetOwned: Boolean?
+        private val canHatch: Boolean
             get() {
                 val petKey: String = if (item is Egg) {
                     item?.key + "-" + hatchingItem?.key
                 } else {
                     hatchingItem?.key + "-" + item?.key
                 }
-                return ownedPets != null && ownedPets?.where()?.equalTo("key", petKey)?.count() ?: 0 > 0
+                val pet = existingPets?.where()?.equalTo("key", petKey)?.findFirst()
+                return pet != null && pet.trained <= 0
             }
 
         init {
@@ -116,7 +117,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
                 imageName = "Pet_" + type + "_" + item?.key
 
                 if (isHatching) {
-                    disabled = this.isPetOwned ?: false
+                    disabled = !this.canHatch
                 }
             }
             DataBindingUtils.loadImage(imageView, imageName ?: "head_0")
@@ -131,6 +132,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
         }
 
         override fun onClick(v: View) {
+            val context = context ?: return
             if (!isHatching && !isFeeding) {
                 val menu = BottomSheetMenu(context)
                 if (item !is QuestContent && item !is SpecialItem) {
@@ -177,7 +179,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
                 }
                 menu.show()
             } else if (isHatching) {
-                if (this.isPetOwned == true) {
+                if (!this.canHatch) {
                     return
                 }
                 if (item is Egg) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
index b64600d45..bafada9f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.adapter.inventory
 
 import android.content.Context
-import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
@@ -29,7 +28,7 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: B
 
     var itemType: String? = null
     var context: Context? = null
-    private var ownedMounts: RealmResults<Mount>? = null
+    private var existingMounts: RealmResults<Mount>? = null
     private val equipEvents = PublishSubject.create<String>()
 
     fun getEquipFlowable(): Flowable<String> {
@@ -46,8 +45,8 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: B
         }
     }
 
-    fun setOwnedMounts(ownedMounts: RealmResults<Mount>) {
-        this.ownedMounts = ownedMounts
+    fun setExistingMounts(existingMounts: RealmResults<Mount>) {
+        this.existingMounts = existingMounts
         notifyDataSetChanged()
     }
 
@@ -61,11 +60,11 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: B
         private val isOwned: Boolean
             get() = this.animal?.trained ?: 0 > 0
 
-        private val isMountOwned: Boolean
+        private val canRaiseToMount: Boolean
             get() {
-                for (ownedMount in ownedMounts ?: emptyList<Mount>()) {
-                    if (ownedMount.key == animal?.key) {
-                        return true
+                for (mount in existingMounts ?: emptyList<Mount>()) {
+                    if (mount.key == animal?.key) {
+                        return !mount.owned
                     }
                 }
                 return false
@@ -81,10 +80,10 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: B
             this.trainedProgressbar.visibility = if (animal?.animalGroup == "specialPets") View.GONE else View.VISIBLE
             this.imageView.alpha = 1.0f
             if (this.animal?.trained ?: 0 > 0) {
-                if (this.isMountOwned) {
-                    this.trainedProgressbar.visibility = View.GONE
-                } else {
+                if (this.canRaiseToMount) {
                     this.trainedProgressbar.progress = animal?.trained ?: 0
+                } else {
+                    this.trainedProgressbar.visibility = View.GONE
                 }
                 DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.color)
             } else {
@@ -102,9 +101,10 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: B
             if (!this.isOwned) {
                 return
             }
+            val context = context ?: return
             val menu = BottomSheetMenu(context)
             menu.addMenuItem(BottomSheetMenuItem(itemView.resources.getString(R.string.use_animal)))
-            if (animal?.animalGroup != "specialPets" && !this.isMountOwned) {
+            if (animal?.animalGroup != "specialPets" && canRaiseToMount) {
                 menu.addMenuItem(BottomSheetMenuItem(itemView.resources.getString(R.string.feed)))
             }
             menu.setSelectionRunnable { index ->
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index ffae902b4..48f62111a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -192,7 +192,7 @@ class ItemRecyclerFragment : BaseFragment() {
             }, RxErrorHandler.handleEmptyError()))
         }
 
-        compositeSubscription.add(inventoryRepository.getOwnedPets().subscribe(Consumer { adapter?.setOwnedPets(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(inventoryRepository.getPets().subscribe(Consumer { adapter?.setExistingPets(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun openMarket() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
index 52417536b..631cdb1e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
@@ -106,7 +106,7 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
     private fun loadItems() {
         if (animalType.isNotEmpty() && animalGroup.isNotEmpty()) {
             compositeSubscription.add(inventoryRepository.getPets(animalType, animalGroup).firstElement().subscribe(Consumer<RealmResults<Pet>> { adapter.updateData(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(inventoryRepository.getOwnedMounts(animalType, animalGroup).subscribe(Consumer<RealmResults<Mount>> { adapter.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(inventoryRepository.getMounts(animalType, animalGroup).subscribe(Consumer<RealmResults<Mount>> { adapter.setExistingMounts(it) }, RxErrorHandler.handleEmptyError()))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index 42e82e7dd..0a0c5e7c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -164,6 +164,10 @@ class StableRecyclerFragment : BaseFragment() {
                     }
                 }
             }
+            if (!((lastAnimal.animalGroup == "premiumPets" || lastAnimal.animalGroup == "specialPets"
+                            || lastAnimal.animalGroup == "specialMounts" || lastAnimal.animalGroup == "premiumMounts") && lastAnimal.numberOwned == 0)) {
+                items.add(lastAnimal)
+            }
             Single.just<List<Any>>(items)
         }.subscribe(Consumer { items -> adapter?.setItemList(items) }, RxErrorHandler.handleEmptyError()))
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java
deleted file mode 100644
index a84da11d5..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-import android.content.Context;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.habitrpg.android.habitica.R;
-
-public class BottomSheetMenu extends BottomSheetDialog implements View.OnClickListener {
-
-    private LayoutInflater inflater;
-    private Context context;
-    private LinearLayout contentView;
-    private BottomSheetMenuSelectionRunnable runnable;
-
-    public BottomSheetMenu(Context context) {
-        super(context);
-        this.context = context;
-        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        this.contentView = (LinearLayout) inflater.inflate(R.layout.menu_bottom_sheet, null);
-        this.setContentView(this.contentView);
-    }
-
-    public void setSelectionRunnable(BottomSheetMenuSelectionRunnable runnable) {
-        this.runnable = runnable;
-    }
-
-    public void addMenuItems(BottomSheetMenuItem... menuItems) {
-        for (BottomSheetMenuItem menuItem : menuItems) {
-            this.addMenuItem(menuItem);
-        }
-    }
-
-    public void addMenuItem(BottomSheetMenuItem menuItem) {
-        View item = menuItem.inflate(this.context, this.inflater, this.contentView);
-        item.setOnClickListener(this);
-        this.contentView.addView(item);
-    }
-
-    public void removeMenuItem(Integer index) {
-        this.contentView.removeViewAt(index);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (this.runnable != null) {
-            Integer index = this.contentView.indexOfChild(v);
-            if (index != -1) {
-                this.runnable.selectedItemAt(index);
-                this.dismiss();
-            }
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
new file mode 100644
index 000000000..7d72eb0de
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
@@ -0,0 +1,46 @@
+package com.habitrpg.android.habitica.ui.menu
+
+import android.content.Context
+import android.view.View
+import android.widget.LinearLayout
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.habitrpg.android.habitica.R
+
+class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnClickListener {
+    private var contentView = layoutInflater.inflate(R.layout.menu_bottom_sheet, null) as LinearLayout
+    private var runnable: ((Int) -> Unit)? = null
+
+    init {
+        setContentView(contentView)
+    }
+
+    fun setSelectionRunnable(runnable: (Int) -> Unit) {
+        this.runnable = runnable
+    }
+
+    fun addMenuItems(vararg menuItems: BottomSheetMenuItem) {
+        for (menuItem in menuItems) {
+            this.addMenuItem(menuItem)
+        }
+    }
+
+    fun addMenuItem(menuItem: BottomSheetMenuItem) {
+        val item = menuItem.inflate(this.context, layoutInflater, this.contentView)
+        item.setOnClickListener(this)
+        this.contentView.addView(item)
+    }
+
+    fun removeMenuItem(index: Int) {
+        this.contentView.removeViewAt(index)
+    }
+
+    override fun onClick(v: View) {
+        if (this.runnable != null) {
+            val index = this.contentView.indexOfChild(v)
+            if (index != -1) {
+                runnable?.let { it(index) }
+                this.dismiss()
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuSelectionRunnable.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuSelectionRunnable.java
deleted file mode 100644
index 3386f81e8..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuSelectionRunnable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-public interface BottomSheetMenuSelectionRunnable {
-
-    void selectedItemAt(Integer index);
-
-}