From 3df337fa0761f1eb28b857e3acbd03a925012c02 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 26 Jul 2022 12:38:29 +0200
Subject: [PATCH] Adds new layout toolbar

---
 .../ui-styles/src/main/res/values/dimens.xml  |  3 +
 .../src/main/res/values/styles_toolbar.xml    | 11 ++-
 .../src/main/res/values/theme_common.xml      |  2 +-
 .../src/main/res/values/theme_dark.xml        |  3 +
 .../src/main/res/values/theme_light.xml       |  4 +
 .../res/layout/fragment_new_home_detail.xml   | 92 +++++++++++++++++++
 vector/src/main/res/values/strings.xml        |  1 +
 7 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/res/layout/fragment_new_home_detail.xml

diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index 70d051b457..53f1044a12 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -71,4 +71,7 @@
     <dimen name="location_sharing_compass_button_margin_horizontal">8dp</dimen>
     <dimen name="location_sharing_live_duration_choice_margin_horizontal">12dp</dimen>
     <dimen name="location_sharing_live_duration_choice_margin_vertical">22dp</dimen>
+
+    <!-- Material 3 -->
+    <dimen name="collapsing_toolbar_layout_medium_size">112dp</dimen>
 </resources>
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 505419c6fe..b822dd3db7 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -39,4 +39,13 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <!-- Material 3 -->
+
+    <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>
+        <item name="expandedTitleMarginBottom">20dp</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_common.xml b/library/ui-styles/src/main/res/values/theme_common.xml
index 2e9c2c5123..107534fe1a 100644
--- a/library/ui-styles/src/main/res/values/theme_common.xml
+++ b/library/ui-styles/src/main/res/values/theme_common.xml
@@ -25,4 +25,4 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index f86a05ed66..9f4e5c1e28 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -149,6 +149,9 @@
 
         <!-- Location sharing -->
         <item name="vctr_live_location">@color/vctr_live_location_dark</item>
+
+        <!-- Material 3 -->
+        <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 173b502dcd..c8182abecc 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -150,8 +150,12 @@
 
         <!-- Location sharing -->
         <item name="vctr_live_location">@color/vctr_live_location_light</item>
+
+        <!-- Material 3 -->
+        <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
 
 </resources>
+
diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml
new file mode 100644
index 0000000000..b5a3ccafe9
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_new_home_detail.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <im.vector.app.core.ui.views.KeysBackupBanner
+        android:id="@+id/homeKeysBackupBanner"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?vctr_keys_backup_banner_accent_color"
+        android:minHeight="67dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
+
+    <im.vector.app.core.ui.views.CurrentCallsView
+        android:id="@+id/currentCallsView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner"
+        tools:visibility="gone" />
+
+    <im.vector.app.features.sync.widget.SyncStateView
+        android:id="@+id/syncStateView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/currentCallsView"
+        tools:visibility="gone" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/currentCallsView">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
+            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:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:elevation="0dp"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/all_chats" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/roomListContainer"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottomNavigationView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:menu="@menu/home_bottom_navigation" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b162814a9d..9a4261be7d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -136,6 +136,7 @@
     <string name="matrix_error">Matrix error</string>
 
     <!-- Home Screen -->
+    <string name="all_chats">All Chats</string>
 
     <!-- Last seen time -->