From 0e1c94827800ee3ff28ef37ebb30f967e85225e1 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Thu, 16 Oct 2014 17:02:56 +0200
Subject: [PATCH] remove padding due to draglist bug and make showqueue
 dragable

---
 res/layout/playlist_row.xml                   |  1 -
 res/layout/showqueue_listview.xml             |  2 +-
 res/layout/showqueue_row.xml                  |  6 ++++--
 res/layout/tab_order_row.xml                  |  1 -
 .../android/vanilla/DragListView.java         |  2 +-
 .../android/vanilla/ShowQueueActivity.java    |  5 +++--
 .../android/vanilla/ShowQueueAdapter.java     | 19 ++++++++++++++++---
 7 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/res/layout/playlist_row.xml b/res/layout/playlist_row.xml
index 889397b5..2512b769 100644
--- a/res/layout/playlist_row.xml
+++ b/res/layout/playlist_row.xml
@@ -22,7 +22,6 @@ THE SOFTWARE.
 -->
 <ch.blinkenlights.android.vanilla.DragTextView
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:padding="3dip"
 	android:singleLine="true"
 	android:textColor="?android:textColorPrimary"
 	android:gravity="left|center_vertical" />
diff --git a/res/layout/showqueue_listview.xml b/res/layout/showqueue_listview.xml
index 4b3c8c89..76936c41 100644
--- a/res/layout/showqueue_listview.xml
+++ b/res/layout/showqueue_listview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ListView
+<ch.blinkenlights.android.vanilla.DragListView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/list"
 	android:layout_width="fill_parent"
diff --git a/res/layout/showqueue_row.xml b/res/layout/showqueue_row.xml
index e6e61165..f99c8ff4 100644
--- a/res/layout/showqueue_row.xml
+++ b/res/layout/showqueue_row.xml
@@ -2,7 +2,7 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
+	android:layout_height="wrap_content"
 	android:orientation="horizontal">
 	<View
 		android:id="@+id/playmark"
@@ -13,10 +13,12 @@
 		android:id="@+id/text"
 		android:background="@drawable/selectable_item_bg"
 		android:maxLines="2"
-		android:padding="3dip"
 		android:textColor="?android:textColorPrimary"
 		android:gravity="left|center_vertical"
 		android:layout_width="0px"
 		android:layout_height="44dip"
+		android:paddingTop="2dip"
+		android:paddingBottom="2dip"
+		android:paddingLeft="6dip"
 		android:layout_weight="1" />
 </LinearLayout>
diff --git a/res/layout/tab_order_row.xml b/res/layout/tab_order_row.xml
index 5545341e..e9bc2c2c 100644
--- a/res/layout/tab_order_row.xml
+++ b/res/layout/tab_order_row.xml
@@ -22,7 +22,6 @@ THE SOFTWARE.
 -->
 <ch.blinkenlights.android.vanilla.DragTextView
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:padding="3dip"
 	android:singleLine="true"
 	android:textColor="#ffff"
 	android:drawableLeft="@drawable/grabber"
diff --git a/src/ch/blinkenlights/android/vanilla/DragListView.java b/src/ch/blinkenlights/android/vanilla/DragListView.java
index affe7f42..9aab08a7 100644
--- a/src/ch/blinkenlights/android/vanilla/DragListView.java
+++ b/src/ch/blinkenlights/android/vanilla/DragListView.java
@@ -72,7 +72,7 @@ public class DragListView extends ListView implements Handler.Callback {
 	/**
 	 * Padding for each row in dip.
 	 */
-	public static final int PADDING = 3;
+	public static final int PADDING = 0;
 	/**
 	 * Background color of row while it is being dragged.
 	 */
diff --git a/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java b/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java
index 99bdcb65..a0d9a1c7 100644
--- a/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java
@@ -30,7 +30,7 @@ import android.widget.ListView;
 import android.util.Log;
 
 public class ShowQueueActivity extends Activity {
-	private ListView mListView;
+	private DragListView mListView;
 	private ShowQueueAdapter listAdapter;
 	
 	@Override  
@@ -41,10 +41,11 @@ public class ShowQueueActivity extends Activity {
 		setContentView(R.layout.showqueue_listview);
 		
 		
-		mListView   = (ListView) findViewById(R.id.list);
+		mListView   = (DragListView) findViewById(R.id.list);
 		listAdapter = new ShowQueueAdapter(this, R.layout.showqueue_row);
 		mListView.setAdapter(listAdapter);
 		mListView.setFastScrollAlwaysVisible(true);
+		mListView.setEditable(true);
 
 		mListView.setOnItemClickListener(new OnItemClickListener() {
 			@Override
diff --git a/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java b/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java
index 78bf1c44..c6e527ce 100644
--- a/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java
@@ -31,8 +31,11 @@ import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
+import android.util.Log;
 
-public class ShowQueueAdapter extends ArrayAdapter<Song> {
+public class ShowQueueAdapter
+	extends ArrayAdapter<Song>
+	implements DragListView.DragAdapter {
 	
 	int resource;
 	Context context;
@@ -70,8 +73,18 @@ public class ShowQueueAdapter extends ArrayAdapter<Song> {
 
 		View pmark = ((View)row.findViewById(R.id.playmark));
 		pmark.setVisibility( ( position == this.hl_row ? View.VISIBLE : View.INVISIBLE ));
-		
+
 		return row;
 	}
-	
+
+	@Override
+	public void remove(int position) {
+		// not implemented
+	}
+
+	@Override
+	public void move(int from, int to) {
+		Log.v("VanillaMusic", "Moved FROM "+from+" to "+to);
+	}
+
 }