From 4f210a3e159188aecbfbc591b46fe07f8c7ccd69 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sun, 9 Aug 2015 19:18:09 +0200
Subject: [PATCH] unify draggable_row

---
 res/layout-v21/draggable_row.xml | 72 --------------------------------
 res/layout/draggable_row.xml     |  2 +-
 res/values-v21/theme.xml         |  3 ++
 res/values/theme.xml             |  3 ++
 4 files changed, 7 insertions(+), 73 deletions(-)
 delete mode 100644 res/layout-v21/draggable_row.xml

diff --git a/res/layout-v21/draggable_row.xml b/res/layout-v21/draggable_row.xml
deleted file mode 100644
index 219e06e5..00000000
--- a/res/layout-v21/draggable_row.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2014 Adrian Ulrich <adrian@blinkenlights.ch>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>. 
--->
-<ch.blinkenlights.android.vanilla.DraggableRow
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
-
-	<LinearLayout
-		android:background="?android:attr/selectableItemBackground"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<View
-			android:id="@+id/pmark"
-			android:layout_width="4dip"
-			android:layout_height="44dip"
-			android:visibility="invisible"
-			android:background="@color/vanillaAccent" />
-		<TextView
-			android:id="@+id/text"
-			android:maxLines="2"
-			android:textColor="?android:textColorPrimary"
-			android:gravity="left|center_vertical"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:paddingTop="2dip"
-			android:paddingBottom="2dip"
-			android:paddingLeft="4dip" />
-			<!-- spacer -->
-			<View
-				android:layout_height="match_parent"
-				android:layout_width="0px"
-				android:layout_weight="1"/>
-			<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="44dip"/>
-			<ImageView
-				android:id="@+id/dragger"
-				android:scaleType="center"
-				android:src="@drawable/grabber"
-				android:layout_width="44dip"
-				android:layout_height="44dip" />
-	</LinearLayout>
-
-	<View
-		android:layout_width="match_parent"
-		android:layout_height="1px"
-		android:background="?divider_color"/>
-
-</ch.blinkenlights.android.vanilla.DraggableRow>
diff --git a/res/layout/draggable_row.xml b/res/layout/draggable_row.xml
index e69e5d7f..1d54c7a0 100644
--- a/res/layout/draggable_row.xml
+++ b/res/layout/draggable_row.xml
@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 			android:layout_width="4dip"
 			android:layout_height="44dip"
 			android:visibility="invisible"
-			android:background="@android:color/holo_blue_dark" />
+			android:background="@color/now_playing_marker" />
 		<TextView
 			android:id="@+id/text"
 			android:maxLines="2"
diff --git a/res/values-v21/theme.xml b/res/values-v21/theme.xml
index 775e6a04..e019dd9a 100644
--- a/res/values-v21/theme.xml
+++ b/res/values-v21/theme.xml
@@ -35,6 +35,9 @@ Copyright (C) 2015 Adrian Ulrich <adrian@blinkenlights.ch>
 	<color name="controls_active">@color/vanillaAccent</color>
 	<color name="controls_normal">@color/material_grey_600</color>
 
+	<!-- showqueue info -->
+	<color name="now_playing_marker">@color/vanillaAccent</color>
+
 	<!-- styles -->
 	<style name="Dialog" parent="android:Theme.Material.Light.Dialog" />
 	<style name="DialogMinWidth" parent="android:Theme.Material.Light.Dialog.MinWidth" />
diff --git a/res/values/theme.xml b/res/values/theme.xml
index 78d34f3e..19c85b22 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -25,6 +25,9 @@ THE SOFTWARE.
 	<color name="controls_active">@android:color/holo_blue_dark</color>
 	<color name="controls_normal">#fff5f5f5</color>
 
+	<!-- showqueue info -->
+	<color name="now_playing_marker">@android:color/holo_blue_dark</color>
+
 	<!-- styles -->
 	<style name="Dialog" parent="android:Theme.Holo.Dialog" />
 	<style name="DialogMinWidth" parent="android:Theme.Holo.Dialog.MinWidth" />