From 9f0bcb6d185b5a366a92cf3ff09e635292e2e786 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sun, 24 Jul 2016 15:53:43 +0200
Subject: [PATCH] reduce nesting of draggable row

---
 res/layout/draggable_row.xml                  | 103 ++++++++----------
 res/layout/filebrowser_content.xml            |   3 +-
 res/layout/listview.xml                       |   3 +-
 res/layout/playlist_activity.xml              |   3 +-
 res/layout/showqueue_listview.xml             |   3 +-
 res/layout/tab_order.xml                      |   3 +-
 .../android/vanilla/MediaAdapter.java         |   2 +-
 .../android/vanilla/PlaylistAdapter.java      |   2 +-
 .../android/vanilla/TabOrderAdapter.java      |   2 +-
 9 files changed, 56 insertions(+), 68 deletions(-)

diff --git a/res/layout/draggable_row.xml b/res/layout/draggable_row.xml
index 12f6f576..c3a76311 100644
--- a/res/layout/draggable_row.xml
+++ b/res/layout/draggable_row.xml
@@ -19,67 +19,50 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<View
-			android:id="@+id/pmark"
-			android:visibility="gone"
-			android:layout_width="@dimen/pmark_size"
-			android:layout_height="@dimen/row_normal_height"
-			android:background="?now_playing_marker" />
-
-		<ch.blinkenlights.android.vanilla.LazyCoverView
-			android:id="@+id/cover"
-			android:scaleType="centerCrop"
-			android:layout_width="@dimen/cover_size"
-			android:layout_height="@dimen/cover_size"
-			android:layout_marginLeft="@dimen/cover_padding_with_pmark"
-			android:layout_gravity="center_vertical"
-			android:visibility="gone" />
-		<TextView
-			android:id="@+id/text"
-			android:maxLines="2"
-			android:textColor="?android:textColorPrimary"
-			android:gravity="left|center_vertical"
-			android:layout_width="0px"
-			android:layout_height="@dimen/row_normal_height"
-			android:layout_marginLeft="@dimen/text_padding"
-			android:layout_weight="1" />
-
-		<View
-			android:id="@+id/divider"
-			android:layout_width="@dimen/divider_size"
-			android:layout_height="fill_parent"
-			android:visibility="gone"
-			android:background="?android:attr/dividerHorizontal" />
-
-		<CheckedTextView
-			android:id="@+id/checkbox"
-			android:visibility="gone"
-			android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-			android:gravity="center_vertical"
-			android:layout_height="match_parent"
-			android:layout_width="@dimen/row_normal_height"/>
-
-		<ImageView
-			android:id="@+id/dragger"
-			android:visibility="gone"
-			android:src="@drawable/grabber"
-			android:scaleType="center"
-			android:layout_width="@dimen/row_normal_height"
-			android:layout_height="@dimen/row_normal_height"
-	/>
-	</LinearLayout>
+	android:orientation="horizontal">
 
 	<View
-		android:layout_width="match_parent"
-		android:layout_height="1dip"
-		android:background="@drawable/inset_divider" />
+		android:id="@+id/pmark"
+		android:visibility="gone"
+		android:layout_width="@dimen/pmark_size"
+		android:layout_height="@dimen/row_normal_height"
+		android:background="?now_playing_marker" />
 
+	<ch.blinkenlights.android.vanilla.LazyCoverView
+		android:id="@+id/cover"
+		android:scaleType="centerCrop"
+		android:layout_width="@dimen/cover_size"
+		android:layout_height="@dimen/cover_size"
+		android:layout_marginLeft="@dimen/cover_padding_with_pmark"
+		android:layout_gravity="center_vertical"
+		android:visibility="gone" />
+	<TextView
+		android:id="@+id/text"
+		android:maxLines="2"
+		android:textColor="?android:textColorPrimary"
+		android:gravity="left|center_vertical"
+		android:layout_width="0px"
+		android:layout_height="@dimen/row_normal_height"
+		android:layout_marginLeft="@dimen/text_padding"
+		android:layout_weight="1" />
+	<View
+		android:id="@+id/divider"
+		android:layout_width="@dimen/divider_size"
+		android:layout_height="fill_parent"
+		android:visibility="gone"
+		android:background="?android:attr/dividerHorizontal" />
+	<CheckedTextView
+		android:id="@+id/checkbox"
+		android:visibility="gone"
+		android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+		android:gravity="center_vertical"
+		android:layout_height="match_parent"
+		android:layout_width="@dimen/row_normal_height"/>
+	<ImageView
+		android:id="@+id/dragger"
+		android:visibility="gone"
+		android:src="@drawable/grabber"
+		android:scaleType="center"
+		android:layout_width="@dimen/row_normal_height"
+		android:layout_height="@dimen/row_normal_height" />
 </ch.blinkenlights.android.vanilla.DraggableRow>
diff --git a/res/layout/filebrowser_content.xml b/res/layout/filebrowser_content.xml
index 76d5f489..8e202276 100644
--- a/res/layout/filebrowser_content.xml
+++ b/res/layout/filebrowser_content.xml
@@ -57,7 +57,8 @@ THE SOFTWARE.
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:listSelector="?android:attr/selectableItemBackground"
-		android:divider="@null" />
+		android:divider="@drawable/inset_divider"
+		android:dividerHeight="1dip" />
 
 </LinearLayout>
 
diff --git a/res/layout/listview.xml b/res/layout/listview.xml
index 91d7c6be..77aa3f59 100644
--- a/res/layout/listview.xml
+++ b/res/layout/listview.xml
@@ -24,5 +24,6 @@ THE SOFTWARE.
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
-	android:divider="@null"
+	android:divider="@drawable/inset_divider"
+	android:dividerHeight="1dip"
 	android:fastScrollEnabled="true"/>
diff --git a/res/layout/playlist_activity.xml b/res/layout/playlist_activity.xml
index e337e82e..9bb2179d 100644
--- a/res/layout/playlist_activity.xml
+++ b/res/layout/playlist_activity.xml
@@ -19,7 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:dslv="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/list"
-	android:divider="@null"
+	android:divider="@drawable/inset_divider"
+	android:dividerHeight="1dip"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	dslv:drag_enabled="false"
diff --git a/res/layout/showqueue_listview.xml b/res/layout/showqueue_listview.xml
index 247ae713..14c4bb1d 100644
--- a/res/layout/showqueue_listview.xml
+++ b/res/layout/showqueue_listview.xml
@@ -6,7 +6,8 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:listSelector="?android:attr/selectableItemBackground"
-	android:divider="@null"
+	android:divider="@drawable/inset_divider"
+	android:dividerHeight="1dip"
 	dslv:drag_enabled="true"
 	dslv:drag_start_mode="onMove"
 	dslv:float_background_color="?float_color"
diff --git a/res/layout/tab_order.xml b/res/layout/tab_order.xml
index 20bbc1c2..2d52e0f1 100644
--- a/res/layout/tab_order.xml
+++ b/res/layout/tab_order.xml
@@ -30,7 +30,8 @@ THE SOFTWARE.
 	android:layout_width="fill_parent">
 	<com.mobeta.android.dslv.DragSortListView
 		android:id="@+id/list"
-		android:divider="@null"
+		android:divider="@drawable/inset_divider"
+		android:dividerHeight="1dip"
 		android:layout_height="0px"
 		android:layout_width="fill_parent"
 		android:layout_weight="1"
diff --git a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
index ad02d06c..10445e2b 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
@@ -636,7 +636,7 @@ public class MediaAdapter
 	public void onClick(View view)
 	{
 		int id = view.getId();
-		view = (View)view.getParent().getParent(); // get view of linear layout, not the click consumer
+		view = (View)view.getParent(); // get view of linear layout, not the click consumer
 		Intent intent = createData(view);
 		mActivity.onItemExpanded(intent);
 	}
diff --git a/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java b/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java
index 7a4b7988..53792d8d 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java
@@ -125,7 +125,7 @@ public class PlaylistAdapter extends CursorAdapter implements Handler.Callback {
 	@Override
 	public View newView(Context context, Cursor cursor, ViewGroup parent)
 	{
-		return mInflater.inflate(R.layout.draggable_row, null);
+		return mInflater.inflate(R.layout.draggable_row, parent, false);
 	}
 
 	/**
diff --git a/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java b/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java
index 2d8f6803..adb30656 100644
--- a/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java
@@ -89,7 +89,7 @@ public class TabOrderAdapter extends BaseAdapter {
 	{
 		DraggableRow view;
 		if (convert == null) {
-			view = (DraggableRow)mInflater.inflate(R.layout.draggable_row, null);
+			view = (DraggableRow)mInflater.inflate(R.layout.draggable_row, parent, false);
 			view.setupLayout(DraggableRow.LAYOUT_CHECKBOXES);
 		} else {
 			view = (DraggableRow)convert;