Merge pull request #18070 from wordpress-mobile/Remove-large-titles

Remove large titles
wordpress-mobile · Mar 13, 2023 · 06704ed · 06704ed
2 parents 40028b9 + 191babb
commit 06704ed
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 28 deletions.
diff --git a/WordPress/src/main/res/layout/notifications_list_fragment.xml b/WordPress/src/main/res/layout/notifications_list_fragment.xml
@@ -19,24 +19,15 @@
     <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"
-            android:layout_height="@dimen/prominent_toolbar_height">
+        android:layout_height="wrap_content">
 
             <com.google.android.material.appbar.MaterialToolbar
                 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.appbar.CollapsingToolbarLayout>
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"

diff --git a/WordPress/src/main/res/layout/reader_fragment_layout.xml b/WordPress/src/main/res/layout/reader_fragment_layout.xml
@@ -8,24 +8,15 @@
     <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"
-            android:layout_height="@dimen/prominent_toolbar_height">
+        android:layout_height="wrap_content">
 
             <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" />
 
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"

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
@@ -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"

diff --git 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>

diff --git 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>