Merge pull request #7860 from thunderbird/account_settings_toolbar

Fix toolbar height in account settings
thunderbird · May 27, 2024 · 4436fff · 4436fff
2 parents e1ac98f + fd21089
commit 4436fff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/ui/base/src/main/res/values/dimensions.xml b/app/ui/base/src/main/res/values/dimensions.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="toolbarTitleMarginVertical">8dp</dimen>
+</resources>
diff --git a/app/ui/legacy/src/main/res/layout/activity_account_settings.xml b/app/ui/legacy/src/main/res/layout/activity_account_settings.xml
@@ -6,20 +6,22 @@
     android:orientation="vertical"
     tools:context=".settings.account.AccountSettingsActivity">
 
-    <androidx.appcompat.widget.Toolbar
+    <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         style="?attr/toolbarStyle"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
         tools:navigationIcon="@drawable/ic_arrow_back">
 
         <com.fsck.k9.ui.settings.account.AccountSelectionSpinner
             android:id="@+id/accountSpinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/toolbarTitleMarginVertical"
             tools:listitem="@layout/account_spinner_item"/>
 
-    </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.MaterialToolbar>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/accountSettingsContainer"