UI: Align all toolbar heights with contextual action mode heights

d4rken-org · Nov 28, 2023 · 6a3e1a8 · 6a3e1a8
1 parent 4e1143b
commit 6a3e1a8
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 33 deletions.
diff --git a/app/src/foss/res/layout/upgrade_fragment.xml b/app/src/foss/res/layout/upgrade_fragment.xml
@@ -8,6 +8,7 @@
         android:id="@+id/toolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="0dp"
+        android:minHeight="?actionBarSize"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/gplay/res/layout/upgrade_fragment.xml b/app/src/gplay/res/layout/upgrade_fragment.xml
@@ -9,6 +9,7 @@
         android:id="@+id/toolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="0dp"
+        android:minHeight="?actionBarSize"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/analyzer_app_fragment.xml b/app/src/main/res/layout/analyzer_app_fragment.xml
@@ -9,6 +9,7 @@
         android:id="@+id/toolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Primary"
         android:layout_width="0dp"
+        android:minHeight="?actionBarSize"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/analyzer_apps_fragment.xml b/app/src/main/res/layout/analyzer_apps_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/analyzer_content_fragment.xml b/app/src/main/res/layout/analyzer_content_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/analyzer_device_fragment.xml b/app/src/main/res/layout/analyzer_device_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/analyzer_storage_fragment.xml b/app/src/main/res/layout/analyzer_storage_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/appcleaner_details_fragment.xml b/app/src/main/res/layout/appcleaner_details_fragment.xml
@@ -15,7 +15,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:subtitle="@string/general_details_label"

diff --git a/app/src/main/res/layout/appcleaner_list_fragment.xml b/app/src/main/res/layout/appcleaner_list_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/appcontrol_list_fragment.xml b/app/src/main/res/layout/appcontrol_list_fragment.xml
@@ -7,9 +7,8 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Toolbar"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/layout/corpsefinder_details_fragment.xml b/app/src/main/res/layout/corpsefinder_details_fragment.xml
@@ -15,7 +15,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:subtitle="@string/general_details_label"

diff --git a/app/src/main/res/layout/corpsefinder_list_fragment.xml b/app/src/main/res/layout/corpsefinder_list_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/data_areas_fragment.xml b/app/src/main/res/layout/data_areas_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/debug_logview_fragment.xml b/app/src/main/res/layout/debug_logview_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/deduplicator_details_fragment.xml b/app/src/main/res/layout/deduplicator_details_fragment.xml
@@ -15,7 +15,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:subtitle="@string/general_details_label"

diff --git a/app/src/main/res/layout/deduplicator_list_fragment.xml b/app/src/main/res/layout/deduplicator_list_fragment.xml
@@ -7,9 +7,8 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/menu_deduplicator_list"

diff --git a/app/src/main/res/layout/exclusion_editor_path_fragment.xml b/app/src/main/res/layout/exclusion_editor_path_fragment.xml
@@ -11,7 +11,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/menu_exclusion_editor_path"

diff --git a/app/src/main/res/layout/exclusion_editor_pkg_fragment.xml b/app/src/main/res/layout/exclusion_editor_pkg_fragment.xml
@@ -11,7 +11,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/menu_exclusion_editor_pkg"

diff --git a/app/src/main/res/layout/exclusion_editor_segment_fragment.xml b/app/src/main/res/layout/exclusion_editor_segment_fragment.xml
@@ -11,7 +11,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/menu_exclusion_editor_pkg"

diff --git a/app/src/main/res/layout/exclusion_list_fragment.xml b/app/src/main/res/layout/exclusion_list_fragment.xml
@@ -11,7 +11,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/menu_exclusions_list"

diff --git a/app/src/main/res/layout/scheduler_manager_fragment.xml b/app/src/main/res/layout/scheduler_manager_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/settings_base_fragment.xml b/app/src/main/res/layout/settings_base_fragment.xml
@@ -8,7 +8,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
@@ -8,7 +8,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/setup_fragment.xml b/app/src/main/res/layout/setup_fragment.xml
@@ -10,6 +10,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:minHeight="?actionBarSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,10 +36,10 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
+        style="@style/BaseRecyclerList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        style="@style/BaseRecyclerList"
         android:paddingVertical="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/systemcleaner_customfilter_editor_fragment.xml b/app/src/main/res/layout/systemcleaner_customfilter_editor_fragment.xml
@@ -11,7 +11,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/menu_systemcleaner_customfilter_editor"

diff --git a/app/src/main/res/layout/systemcleaner_customfilter_list_fragment.xml b/app/src/main/res/layout/systemcleaner_customfilter_list_fragment.xml
@@ -11,7 +11,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:menu="@menu/menu_systemcleaner_customfilter_list"

diff --git a/app/src/main/res/layout/systemcleaner_details_fragment.xml b/app/src/main/res/layout/systemcleaner_details_fragment.xml
@@ -14,7 +14,7 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
+            style="@style/SDMToolbar.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:subtitle="@string/general_details_label"

diff --git a/app/src/main/res/layout/systemcleaner_list_fragment.xml b/app/src/main/res/layout/systemcleaner_list_fragment.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Primary"
+        style="@style/SDMToolbar.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,5 +1,4 @@
 <resources>
-
     <style name="DashboardCardItem" parent="Widget.Material3.CardView.Elevated">
         <item name="android:layout_marginTop">4dp</item>
         <item name="android:layout_marginBottom">4dp</item>
@@ -27,11 +26,6 @@
         <item name="iconPadding">4dp</item>
     </style>
 
-    <style name="Toolbar" parent="@style/Widget.MaterialComponents.Toolbar.Primary">
-        <item name="android:layout_height">?actionBarSize</item>
-        <item name="android:layout_width">match_parent</item>
-    </style>
-
     <style name="BaseRecyclerList">
         <item name="android:fastScrollEnabled">false</item>
         <item name="fastScrollEnabled">false</item>
@@ -186,4 +180,9 @@
         <item name="cornerSize">32dp</item>
     </style>
 
+    <style name="SDMToolbar.Primary" parent="Widget.MaterialComponents.Toolbar.Primary">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">?actionBarSize</item>
+    </style>
+
 </resources>