From a43340a15bf248531ac05d0033d1e44e3fdcc32b Mon Sep 17 00:00:00 2001
From: Leland Wu <leland.wu4@gmail.com>
Date: Fri, 22 May 2020 14:17:45 -0400
Subject: [PATCH] resize mounts cards

---
 Habitica/res/layout/mount_overview_item.xml   | 47 +++++++++++++++++++
 ...verview_item.xml => pet_overview_item.xml} |  0
 Habitica/res/values/dimens.xml                |  3 ++
 .../inventory/MountDetailRecyclerAdapter.kt   |  2 +-
 .../inventory/StableRecyclerAdapter.kt        | 20 +++++---
 .../stable/StableRecyclerFragment.kt          |  3 +-
 6 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 Habitica/res/layout/mount_overview_item.xml
 rename Habitica/res/layout/{animal_overview_item.xml => pet_overview_item.xml} (100%)

diff --git a/Habitica/res/layout/mount_overview_item.xml b/Habitica/res/layout/mount_overview_item.xml
new file mode 100644
index 000000000..cf1fcdb2d
--- /dev/null
+++ b/Habitica/res/layout/mount_overview_item.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:background="@color/white"
+    android:focusable="true">
+
+    <LinearLayout
+        android:id="@+id/card_view"
+        android:layout_width="124dp"
+        android:layout_height="156dp"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="6dp"
+        android:background="@drawable/layout_rounded_bg_shopitem"
+        android:orientation="vertical">
+        style="@style/CardContent">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/mount_image_width"
+            android:layout_height="@dimen/mount_image_height"
+            android:layout_gravity="center_horizontal"
+            android:scaleType="fitEnd" />
+
+        <TextView
+            android:id="@+id/titleTextView"
+            style="@style/RowTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="3.5dp"
+            android:gravity="center"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/ownedTextView"
+            style="@style/RowText"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@drawable/layout_rounded_bg_shopitem_price"
+            android:gravity="center"
+            android:textSize="12sp" />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/Habitica/res/layout/animal_overview_item.xml b/Habitica/res/layout/pet_overview_item.xml
similarity index 100%
rename from Habitica/res/layout/animal_overview_item.xml
rename to Habitica/res/layout/pet_overview_item.xml
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 32120ca63..e8f7edcbe 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -51,9 +51,12 @@
     <dimen name="row_text_size">14sp</dimen>
     <dimen name="row_title_bottommargin">2dp</dimen>
     <dimen name="pet_width">84dp</dimen>
+    <dimen name="mount_width">120dp</dimen>
     <dimen name="bottom_menu_padding">28dp</dimen>
     <dimen name="pet_image_width">68dp</dimen>
     <dimen name="pet_image_height">65dp</dimen>
+    <dimen name="mount_image_width">81dp</dimen>
+    <dimen name="mount_image_height">99dp</dimen>
     <dimen name="shop_height">124dp</dimen>
     <dimen name="bar_icon_padding">10dp</dimen>
     <dimen name="task_text_padding">16dp</dimen>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
index 0401cee20..e9ff8f3e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
@@ -39,7 +39,7 @@ class MountDetailRecyclerAdapter(data: OrderedRealmCollection<Mount>?, autoUpdat
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MountViewHolder {
-        return MountViewHolder(parent.inflate(R.layout.animal_overview_item))
+        return MountViewHolder(parent.inflate(R.layout.pet_overview_item))
     }
 
     override fun onBindViewHolder(holder: MountViewHolder, position: Int) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index 37591ee7b..a9ec80f00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -6,7 +6,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
@@ -45,9 +44,11 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
             } else if (viewType == 1) {
                 val view = parent.inflate(R.layout.customization_section_header)
                 SectionViewHolder(view)
-            }
-            else {
-                val view = parent.inflate(R.layout.animal_overview_item)
+            } else if (viewType == 2) {
+                val view = parent.inflate(R.layout.pet_overview_item)
+                StableViewHolder(view)
+            } else {
+                val view = parent.inflate(R.layout.mount_overview_item)
                 StableViewHolder(view)
             }
     
@@ -70,15 +71,20 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (itemList[position] == "header") {
+        var item = itemList[position]
+
+        return if (item == "header") {
             0
         }
-        else if (itemList[position].javaClass == String::class.java) {
+        else if (item.javaClass == String::class.java) {
             1
         }
-        else {
+        else if (itemType == "pets") {
             2
         }
+        else {
+            3
+        }
     }
 
     override fun getItemCount(): Int = itemList.size
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 ebbd660d2..b82bf9c92 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
@@ -106,7 +106,8 @@ class StableRecyclerFragment : BaseFragment() {
     private fun setGridSpanCount(width: Int) {
         var spanCount = 0
         if (context != null && context?.resources != null) {
-            val itemWidth: Float = context?.resources?.getDimension(R.dimen.pet_width) ?: 0.toFloat()
+            var animal_width = if (itemType == "pets") R.dimen.pet_width else R.dimen.mount_width
+            val itemWidth: Float = context?.resources?.getDimension(animal_width) ?: 0.toFloat()
 
             spanCount = (width / itemWidth).toInt()
         }