From 7334d909d577d2bd4e0344c62cc2852b50f8dba8 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 26 Jul 2022 16:00:46 +0200
Subject: [PATCH] Adds options menu

---
 .../src/main/res/drawable/ic_home_search.xml  |  4 ++
 .../src/main/res/values/styles_toolbar.xml    |  4 +-
 .../im/vector/app/core/extensions/EditText.kt |  2 +-
 .../vector/app/features/home/HomeActivity.kt  |  2 +-
 .../features/home/NewHomeDetailFragment.kt    |  4 +-
 .../res/drawable/ic_search_no_results.xml     |  2 +-
 .../res/layout/fragment_new_home_detail.xml   |  2 +-
 .../res/menu/menu_emoji_reaction_picker.xml   |  2 +-
 .../main/res/menu/{home.xml => menu_home.xml} |  0
 vector/src/main/res/menu/menu_new_home.xml    | 39 +++++++++++++++++++
 10 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 library/ui-styles/src/main/res/drawable/ic_home_search.xml
 rename vector/src/main/res/menu/{home.xml => menu_home.xml} (100%)
 create mode 100644 vector/src/main/res/menu/menu_new_home.xml

diff --git a/library/ui-styles/src/main/res/drawable/ic_home_search.xml b/library/ui-styles/src/main/res/drawable/ic_home_search.xml
new file mode 100644
index 0000000000..5cb88ba1e4
--- /dev/null
+++ b/library/ui-styles/src/main/res/drawable/ic_home_search.xml
@@ -0,0 +1,4 @@
+<vector android:height="22dp" android:viewportHeight="22"
+    android:viewportWidth="22" android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#737D8C" android:fillType="evenOdd" android:pathData="M16.999,14.899C18.07,13.407 18.7,11.577 18.7,9.6C18.7,4.574 14.626,0.5 9.6,0.5C4.574,0.5 0.5,4.574 0.5,9.6C0.5,14.626 4.574,18.7 9.6,18.7C11.577,18.7 13.406,18.07 14.899,16.999C14.941,17.055 14.988,17.109 15.039,17.161L18.939,21.061C19.525,21.646 20.475,21.646 21.06,21.061C21.646,20.475 21.646,19.525 21.06,18.939L17.16,15.039C17.109,14.988 17.055,14.941 16.999,14.899ZM15.7,9.6C15.7,12.969 12.969,15.7 9.6,15.7C6.231,15.7 3.5,12.969 3.5,9.6C3.5,6.231 6.231,3.5 9.6,3.5C12.969,3.5 15.7,6.231 15.7,9.6Z"/>
+</vector>
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
index 9631cc89e2..893de92aae 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -41,9 +41,7 @@
 
     <!-- Material 3 -->
 
-    <style name="Widget.Vector.Material3.Toolbar" parent="Widget.Material3.Toolbar">
-
-    </style>
+    <style name="Widget.Vector.Material3.Toolbar" parent="Widget.Material3.Toolbar" />
 
     <style name="Widget.Vector.Material3.CollapsingToolbar.Medium" parent="Widget.Material3.CollapsingToolbar.Medium">
         <item name="expandedTitleTextAppearance">@style/TextAppearance.Vector.Title.Medium</item>
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 24c8e6bd36..2e2c8429d0 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -28,7 +28,7 @@ import im.vector.app.R
 import im.vector.app.core.platform.SimpleTextWatcher
 
 fun EditText.setupAsSearch(
-        @DrawableRes searchIconRes: Int = R.drawable.ic_search,
+        @DrawableRes searchIconRes: Int = R.drawable.ic_home_search,
         @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray
 ) {
     addTextChangedListener(object : SimpleTextWatcher() {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 7a1b15fc69..1bf96a60ed 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -549,7 +549,7 @@ class HomeActivity :
         }
     }
 
-    override fun getMenuRes() = R.menu.home
+    override fun getMenuRes() = if (vectorFeatures.isNewAppLayoutEnabled()) R.menu.menu_new_home else R.menu.menu_home
 
     override fun handlePrepareMenu(menu: Menu) {
         menu.findItem(R.id.menu_home_init_sync_legacy).isVisible = vectorPreferences.developerMode()
diff --git a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
index 909d8b6a31..135a7b0b7c 100644
--- a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
@@ -286,9 +286,11 @@ class NewHomeDetailFragment @Inject constructor(
     }
 
     private fun setupToolbar() {
-        // TODO: Reimplement
+        setupToolbar(views.toolbar)
     }
 
+
+
     private fun setupBottomNavigationView() {
         views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible = vectorPreferences.labAddNotificationTab()
         views.bottomNavigationView.setOnItemSelectedListener {
diff --git a/vector/src/main/res/drawable/ic_search_no_results.xml b/vector/src/main/res/drawable/ic_search_no_results.xml
index 24c0f00131..b87f25f0eb 100644
--- a/vector/src/main/res/drawable/ic_search_no_results.xml
+++ b/vector/src/main/res/drawable/ic_search_no_results.xml
@@ -17,4 +17,4 @@
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml
index b7c7004fc1..87e853317c 100644
--- a/vector/src/main/res/layout/fragment_new_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_new_home_detail.xml
@@ -49,13 +49,13 @@
             app:layout_constraintTop_toBottomOf="@id/syncStateView">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:id="@+id/groupToolbar"
                 style="@style/Widget.Vector.Material3.CollapsingToolbar.Medium"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
                     style="@style/Widget.Vector.Material3.Toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
diff --git a/vector/src/main/res/menu/menu_emoji_reaction_picker.xml b/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
index 637d709707..8ccff89c9d 100644
--- a/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
+++ b/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_home_search"
         app:iconTint="?vctr_content_primary"
         android:title="@string/search"
         app:actionViewClass="android.widget.SearchView"
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/menu_home.xml
similarity index 100%
rename from vector/src/main/res/menu/home.xml
rename to vector/src/main/res/menu/menu_home.xml
diff --git a/vector/src/main/res/menu/menu_new_home.xml b/vector/src/main/res/menu/menu_new_home.xml
new file mode 100644
index 0000000000..9abe297c04
--- /dev/null
+++ b/vector/src/main/res/menu/menu_new_home.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <item
+        android:id="@+id/menu_home_setting"
+        android:icon="@drawable/ic_settings_x"
+        android:title="@string/settings"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_home_suggestion"
+        android:icon="@drawable/ic_material_bug_report"
+        android:title="@string/send_suggestion" />
+
+    <item
+        android:id="@+id/menu_home_report_bug"
+        android:icon="@drawable/ic_material_bug_report"
+        android:title="@string/send_bug_report" />
+
+    <item
+        android:id="@+id/menu_home_init_sync_legacy"
+        android:title="Do a legacy init sync"
+        tools:ignore="HardcodedText" />
+
+    <item
+        android:id="@+id/menu_home_init_sync_optimized"
+        android:title="Do an optimized init sync"
+        tools:ignore="HardcodedText" />
+
+    <item
+        android:id="@+id/menu_home_filter"
+        android:icon="@drawable/ic_home_search"
+        android:title="@string/home_filter_placeholder_home"
+        app:iconTint="?vctr_content_secondary"
+        app:showAsAction="always" />
+
+</menu>