From cc75af539ee658984f81bfcaa408c64fb0938e8a Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Thu, 9 Mar 2023 15:23:07 +1100
Subject: [PATCH 1/8] Update cog icon to following icon

Updates cog icon to following icon on Reader
---
 .../main/res/layout/reader_home_settings_menu_action_layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/layout/reader_home_settings_menu_action_layout.xml b/WordPress/src/main/res/layout/reader_home_settings_menu_action_layout.xml
index 1938873215f7..6f0bed3826f6 100644
--- a/WordPress/src/main/res/layout/reader_home_settings_menu_action_layout.xml
+++ b/WordPress/src/main/res/layout/reader_home_settings_menu_action_layout.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/margin_medium_large"
         android:layout_marginStart="@dimen/margin_medium_large"
-        android:src="@drawable/ic_cog_white_24dp"
+        android:src="@drawable/ic_reader_following_white_24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From c90ecf597b13a65353a612f96a0bc3757178ac0a Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Thu, 9 Mar 2023 15:35:06 +1100
Subject: [PATCH 2/8] Remove large title on Reader

---
 WordPress/src/main/res/layout/reader_fragment_layout.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/res/layout/reader_fragment_layout.xml b/WordPress/src/main/res/layout/reader_fragment_layout.xml
index 96e308b1e701..fdf6daa1061f 100644
--- a/WordPress/src/main/res/layout/reader_fragment_layout.xml
+++ b/WordPress/src/main/res/layout/reader_fragment_layout.xml
@@ -15,6 +15,7 @@
             style="@style/WordPress.CollapsedToolbarLayout"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:expandedTitleTextAppearance="@style/TextAppearance.App.Toolbar.Title"
             android:layout_height="@dimen/prominent_toolbar_height">
 
             <com.google.android.material.appbar.MaterialToolbar

From 07cf72030a7841a625819a01c89ca11a53b3284f Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Thu, 9 Mar 2023 15:37:51 +1100
Subject: [PATCH 3/8] Remove large title on Notifications

---
 WordPress/src/main/res/layout/notifications_list_fragment.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/res/layout/notifications_list_fragment.xml b/WordPress/src/main/res/layout/notifications_list_fragment.xml
index 18b15b5b246f..09d48c5e3859 100644
--- a/WordPress/src/main/res/layout/notifications_list_fragment.xml
+++ b/WordPress/src/main/res/layout/notifications_list_fragment.xml
@@ -26,6 +26,7 @@
             style="@style/WordPress.CollapsedToolbarLayout"
             android:layout_width="match_parent"
             app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
+            app:expandedTitleTextAppearance="@style/TextAppearance.App.Toolbar.Title"
             android:layout_height="@dimen/prominent_toolbar_height">
 
             <com.google.android.material.appbar.MaterialToolbar

From 30196f908202c17b75e2757a74941963bac38a0d Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Fri, 10 Mar 2023 12:21:20 +1100
Subject: [PATCH 4/8] Remove collapsing toolbar on Reader

---
 .../src/main/res/layout/reader_fragment_layout.xml   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/WordPress/src/main/res/layout/reader_fragment_layout.xml b/WordPress/src/main/res/layout/reader_fragment_layout.xml
index fdf6daa1061f..80b1657d14a0 100644
--- a/WordPress/src/main/res/layout/reader_fragment_layout.xml
+++ b/WordPress/src/main/res/layout/reader_fragment_layout.xml
@@ -8,15 +8,7 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/prominent_toolbar_with_tabs_height">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            style="@style/WordPress.CollapsedToolbarLayout"
-            android:layout_width="match_parent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:expandedTitleTextAppearance="@style/TextAppearance.App.Toolbar.Title"
-            android:layout_height="@dimen/prominent_toolbar_height">
+        android:layout_height="wrap_content">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
@@ -25,8 +17,6 @@
                 android:layout_height="@dimen/toolbar_height"
                 app:theme="@style/WordPress.ActionBar" />
 
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"

From e6479357acda8362a8d7be714a51cf37e85cc2fa Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Fri, 10 Mar 2023 12:21:37 +1100
Subject: [PATCH 5/8] Remove collapsing toolbar on Notifications

---
 .../main/res/layout/notifications_list_fragment.xml  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/WordPress/src/main/res/layout/notifications_list_fragment.xml b/WordPress/src/main/res/layout/notifications_list_fragment.xml
index 09d48c5e3859..8fc280e3ec2a 100644
--- a/WordPress/src/main/res/layout/notifications_list_fragment.xml
+++ b/WordPress/src/main/res/layout/notifications_list_fragment.xml
@@ -19,15 +19,7 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/prominent_toolbar_with_tabs_height">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            style="@style/WordPress.CollapsedToolbarLayout"
-            android:layout_width="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
-            app:expandedTitleTextAppearance="@style/TextAppearance.App.Toolbar.Title"
-            android:layout_height="@dimen/prominent_toolbar_height">
+        android:layout_height="wrap_content">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar_main"
@@ -36,8 +28,6 @@
                 app:layout_collapseMode="pin"
                 app:theme="@style/WordPress.ActionBar" />
 
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"

From 6453e760eba395702f0febe30a0622c64f1af818 Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Fri, 10 Mar 2023 12:21:59 +1100
Subject: [PATCH 6/8] Update title to sans-serif

---
 WordPress/src/main/res/values/styles_toolbar.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WordPress/src/main/res/values/styles_toolbar.xml b/WordPress/src/main/res/values/styles_toolbar.xml
index 5f9ca785ad14..f9687e3ebc3a 100644
--- a/WordPress/src/main/res/values/styles_toolbar.xml
+++ b/WordPress/src/main/res/values/styles_toolbar.xml
@@ -39,19 +39,16 @@
 
     <!-- TextAppearance -->
     <style name="TextAppearance.App.Toolbar.Title" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="fontFamily">serif</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="TextAppearance.App.CollapsingToolbar.Expanded" parent="TextAppearance.MaterialComponents.Headline4">
         <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="fontFamily">serif</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="TextAppearance.App.CollapsingToolbar.Collapsed" parent="TextAppearance.MaterialComponents.Headline6">
         <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="fontFamily">serif</item>
         <item name="android:textStyle">bold</item>
     </style>
 

From 378be489acb425d7eaf26abba3f63906637418cf Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Fri, 10 Mar 2023 12:22:14 +1100
Subject: [PATCH 7/8] Remove unused resources

---
 WordPress/src/main/res/values/dimens.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index b7976d9b0f65..b58bb9baa169 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -11,8 +11,6 @@
     <dimen name="me_menu_width">64dp</dimen>
     <dimen name="me_menu_avatar_end_offset">11dp</dimen>
     <dimen name="toolbar_height">56dp</dimen>
-    <dimen name="prominent_toolbar_height">112dp</dimen>
-    <dimen name="prominent_toolbar_with_tabs_height">168dp</dimen>
     <dimen name="toolbar_content_offset">72dp</dimen>
     <dimen name="toolbar_content_offset_end">0dp</dimen>
     <dimen name="collapsible_toolbar_expanded_bottom_margin">28dp</dimen>

From 191babb0e7ef35a0eeed464c05b717cbea1919ba Mon Sep 17 00:00:00 2001
From: Ravi <ravi.program@gmail.com>
Date: Mon, 13 Mar 2023 11:14:57 +1100
Subject: [PATCH 8/8] Scroll app and tab bars with content

---
 WordPress/src/main/res/layout/notifications_list_fragment.xml | 2 +-
 WordPress/src/main/res/layout/reader_fragment_layout.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/res/layout/notifications_list_fragment.xml b/WordPress/src/main/res/layout/notifications_list_fragment.xml
index 8fc280e3ec2a..e37e140fb948 100644
--- a/WordPress/src/main/res/layout/notifications_list_fragment.xml
+++ b/WordPress/src/main/res/layout/notifications_list_fragment.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/toolbar_main"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/toolbar_height"
-                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways"
                 app:theme="@style/WordPress.ActionBar" />
 
         <com.google.android.material.tabs.TabLayout
diff --git a/WordPress/src/main/res/layout/reader_fragment_layout.xml b/WordPress/src/main/res/layout/reader_fragment_layout.xml
index 80b1657d14a0..0e1e36762769 100644
--- a/WordPress/src/main/res/layout/reader_fragment_layout.xml
+++ b/WordPress/src/main/res/layout/reader_fragment_layout.xml
@@ -13,7 +13,7 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways"
                 android:layout_height="@dimen/toolbar_height"
                 app:theme="@style/WordPress.ActionBar" />