From 7d000f964efc6af91e01ee432ebb45194834a4e7 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 10 Jun 2020 17:52:48 +0200
Subject: [PATCH] perperly align 3-dot menu of folder items

Fixes #6259

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 src/main/res/layout/synced_folders_item_header.xml | 10 ++++------
 src/main/res/layout/trashbin_item.xml              |  2 --
 src/main/res/values/dims.xml                       |  1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/res/layout/synced_folders_item_header.xml b/src/main/res/layout/synced_folders_item_header.xml
index 510ba86cb8..995fca1e1d 100644
--- a/src/main/res/layout/synced_folders_item_header.xml
+++ b/src/main/res/layout/synced_folders_item_header.xml
@@ -68,7 +68,7 @@
         <ImageButton
             android:id="@+id/syncStatusButton"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:background="@color/transparent"
             android:clickable="true"
             android:contentDescription="@string/sync_status_button"
@@ -79,15 +79,13 @@
         <ImageButton
             android:id="@+id/settingsButton"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:background="@color/transparent"
             android:clickable="true"
             android:contentDescription="@string/synced_folder_settings_button"
             android:focusable="true"
-            android:paddingBottom="@dimen/standard_half_padding"
-            android:paddingEnd="@dimen/standard_padding"
+            android:paddingEnd="@dimen/synced_folder_padding_end"
             android:paddingStart="@dimen/standard_half_padding"
-            android:paddingTop="@dimen/standard_half_padding"
-            android:src="@drawable/ic_dots_vertical" />
+            android:src="@drawable/ic_dots_vertical"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/src/main/res/layout/trashbin_item.xml b/src/main/res/layout/trashbin_item.xml
index da4daa8f4a..5d38155e6a 100644
--- a/src/main/res/layout/trashbin_item.xml
+++ b/src/main/res/layout/trashbin_item.xml
@@ -144,8 +144,6 @@
                 android:contentDescription="@string/overflow_menu"
                 android:focusable="true"
                 android:paddingEnd="@dimen/alternate_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/standard_half_padding"
                 android:paddingStart="@dimen/standard_half_padding"
                 android:src="@drawable/ic_dots_vertical"/>
 
diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index c99143033f..62706b842b 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -53,6 +53,7 @@
     <dimen name="alternate_margin">10dp</dimen>
     <dimen name="alternate_half_margin">5dp</dimen>
     <dimen name="alternate_padding">10dp</dimen>
+    <dimen name="synced_folder_padding_end">10dp</dimen>
     <dimen name="alternate_half_padding">5dp</dimen>
     <dimen name="alternate_padding_right">55dp</dimen>
     <dimen name="display_text_min_height">32dp</dimen>