From 2335a342b87d7e988df9d3b5f3cb3996da7d3d6b Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Thu, 24 Dec 2015 18:21:43 +0100
Subject: [PATCH] Adjusted menu button size and fixed wrong left padding in
 search items without an image

---
 .../gramophone/adapter/SearchAdapter.java     |  5 +--
 .../ui/fragments/player/PlayerFragment.java   |  2 +-
 app/src/main/res/layout/item_list.xml         | 32 +++++++++----------
 .../main/res/layout/item_list_single_row.xml  | 21 ++++++------
 app/src/main/res/values/styles_parents.xml    |  4 +--
 5 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
index 04f6f3b0..ffd498fb 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
@@ -175,8 +175,9 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
                     setImageTransitionName(activity.getString(R.string.transition_artist_image));
                     break;
                 default:
-                    if (image != null) {
-                        image.setVisibility(View.GONE);
+                    View container = itemView.findViewById(R.id.image_container);
+                    if (container != null) {
+                        container.setVisibility(View.GONE);
                     }
                     break;
             }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
index 2f7aaf76..27b0f8f3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
@@ -196,7 +196,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
     private void setUpDragSort() {
         DragSortRecycler dragSortRecycler = new DragSortRecycler();
-        dragSortRecycler.setViewHandleId(R.id.image);
+        dragSortRecycler.setViewHandleId(R.id.image_container);
         dragSortRecycler.setOnItemMovedListener(new DragSortRecycler.OnItemMovedListener() {
             @Override
             public void onItemMoved(int from, int to) {
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 87125fcf..54c1c7a6 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -7,7 +7,6 @@
     tools:ignore="UnusedAttribute">
 
     <ImageView
-        android:visibility="gone"
         android:id="@+id/drag_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,27 +15,29 @@
         android:layout_marginStart="-8dp"
         android:src="@drawable/ic_drag_vertical_white_24dp"
         android:tint="?icon_color"
+        android:visibility="gone"
         tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:descendantFocusability="blocksDescendants"
-        android:orientation="horizontal"
-        android:paddingEnd="0dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="0dp"
-        android:paddingStart="16dp">
+        android:orientation="horizontal">
 
         <FrameLayout
+            android:id="@+id/image_container"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
+            android:layout_height="match_parent"
+            android:paddingEnd="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="0dp"
+            android:paddingStart="16dp">
 
             <ImageView
                 android:id="@+id/image"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
+                android:layout_gravity="center"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription" />
 
@@ -46,6 +47,7 @@
                 android:layout_height="match_parent"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
+                android:minHeight="40dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:visibility="gone" />
@@ -56,12 +58,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
             android:layout_weight="1"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingEnd="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="0dp"
+            android:paddingStart="16dp">
 
             <TextView
                 android:id="@+id/title"
@@ -85,10 +87,6 @@
             android:id="@+id/menu"
             style="@style/OverFlowButton"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="2dp"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_marginStart="2dp"
             tools:ignore="ContentDescription" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index 86bb99b0..90af2617 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -7,7 +7,6 @@
     tools:ignore="UnusedAttribute">
 
     <ImageView
-        android:visibility="gone"
         android:id="@+id/drag_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,28 +15,29 @@
         android:layout_marginStart="-8dp"
         android:src="@drawable/ic_drag_vertical_white_24dp"
         android:tint="?icon_color"
+        android:visibility="gone"
         tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:descendantFocusability="blocksDescendants"
-        android:orientation="horizontal"
-        android:paddingEnd="0dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="0dp"
-        android:paddingStart="16dp">
+        android:orientation="horizontal">
 
         <FrameLayout
             android:id="@+id/image_container"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
+            android:layout_height="match_parent"
+            android:paddingEnd="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="0dp"
+            android:paddingStart="16dp">
 
             <ImageView
                 android:id="@+id/image"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
+                android:layout_gravity="center"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription" />
 
@@ -47,6 +47,7 @@
                 android:layout_height="match_parent"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
+                android:minHeight="40dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:visibility="gone" />
@@ -71,10 +72,6 @@
             android:id="@+id/menu"
             style="@style/OverFlowButton"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="2dp"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_marginStart="2dp"
             tools:ignore="ContentDescription" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index af0b7cf6..27819c5e 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -80,11 +80,11 @@
     <style name="OverFlowButtonParent">
         <item name="android:tint">?icon_color</item>
         <item name="android:src">@drawable/abc_ic_menu_moreoverflow_mtrl_alpha</item>
-        <item name="android:padding">12dp</item>
+        <item name="android:layout_margin">8dp</item>
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>
+        <item name="android:scaleType">center</item>
         <item name="android:background">?round_selector</item>
-        <item name="android:layout_centerVertical">true</item>
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:focusable">false</item>
     </style>