From 3081a9195fca00c86695250deb398d53fb66ba56 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 25 Dec 2018 09:44:58 +0000
Subject: [PATCH] Improved/fixed drawer item layout

---
 app/src/main/res/layout/item_drawer.xml       | 21 ++++++++++---------
 .../main/res/layout/item_drawer_separator.xml |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/item_drawer.xml b/app/src/main/res/layout/item_drawer.xml
index ec3cbccfa5..1f1b0ad863 100644
--- a/app/src/main/res/layout/item_drawer.xml
+++ b/app/src/main/res/layout/item_drawer.xml
@@ -2,14 +2,13 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/ivItem"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
         android:gravity="center_vertical"
         android:src="@drawable/baseline_mail_outline_24"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -20,14 +19,16 @@
         android:id="@+id/tvItem"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:ellipsize="end"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:ellipsize="start"
         android:gravity="center_vertical"
-        android:maxLines="1"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        android:minHeight="42dp"
+        android:singleLine="true"
         android:text="Menu item"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/ivItem"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_drawer_separator.xml b/app/src/main/res/layout/item_drawer_separator.xml
index 16bab7a774..dcd7aadb88 100644
--- a/app/src/main/res/layout/item_drawer_separator.xml
+++ b/app/src/main/res/layout/item_drawer_separator.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="12dp"
-    android:paddingTop="12dp">
+    android:paddingTop="9dp"
+    android:paddingBottom="9dp">
 
     <View
         android:id="@+id/vSeparator"