From 2dbbac0b41c0372b27af92a3af909ac6df65aa80 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@thelen.space>
Date: Mon, 13 Jul 2020 17:28:26 +0200
Subject: [PATCH] display pet name in menu popup

---
 Habitica/res/layout/menu_bottom_sheet.xml     | 18 +++++++++++++++++-
 Habitica/res/values/dimens.xml                |  2 +-
 .../habitica/ui/menu/BottomSheetMenu.kt       | 19 +++++++++++++------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/menu_bottom_sheet.xml b/Habitica/res/layout/menu_bottom_sheet.xml
index 943ae2746..fcc654b20 100644
--- a/Habitica/res/layout/menu_bottom_sheet.xml
+++ b/Habitica/res/layout/menu_bottom_sheet.xml
@@ -1,7 +1,23 @@
 <?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/BottomMenu"
     android:clickable="false">
+    <TextView
+        android:id="@+id/title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:text="Title"
+        android:gravity="center"
+        style="@style/Subheader1"
+        android:background="@color/gray_700"
+        android:padding="8dp"/>
+    <LinearLayout
+        android:id="@+id/menu_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 4287e6204..7df9b73c1 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -58,7 +58,7 @@
     <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="bottom_menu_padding">20dp</dimen>
     <dimen name="pet_image_width">68dp</dimen>
     <dimen name="pet_image_height">65dp</dimen>
     <dimen name="mount_image_width">81dp</dimen>
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
index 7d72eb0de..7c6b0f99b 100644
--- 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
@@ -5,13 +5,15 @@ import android.view.View
 import android.widget.LinearLayout
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.MenuBottomSheetBinding
 
 class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnClickListener {
-    private var contentView = layoutInflater.inflate(R.layout.menu_bottom_sheet, null) as LinearLayout
+    private var binding = MenuBottomSheetBinding.inflate(layoutInflater)
     private var runnable: ((Int) -> Unit)? = null
 
     init {
-        setContentView(contentView)
+        setContentView(binding.root)
+        binding.titleView.visibility = View.GONE
     }
 
     fun setSelectionRunnable(runnable: (Int) -> Unit) {
@@ -24,19 +26,24 @@ class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnCli
         }
     }
 
+    override fun setTitle(title: CharSequence?) {
+        binding.titleView.text = title
+        binding.titleView.visibility = View.VISIBLE
+    }
+
     fun addMenuItem(menuItem: BottomSheetMenuItem) {
-        val item = menuItem.inflate(this.context, layoutInflater, this.contentView)
+        val item = menuItem.inflate(this.context, layoutInflater, this.binding.menuItems)
         item.setOnClickListener(this)
-        this.contentView.addView(item)
+        this.binding.menuItems.addView(item)
     }
 
     fun removeMenuItem(index: Int) {
-        this.contentView.removeViewAt(index)
+        this.binding.menuItems.removeViewAt(index)
     }
 
     override fun onClick(v: View) {
         if (this.runnable != null) {
-            val index = this.contentView.indexOfChild(v)
+            val index = this.binding.menuItems.indexOfChild(v)
             if (index != -1) {
                 runnable?.let { it(index) }
                 this.dismiss()