From 49b5de26f5b26f0be64ac6c26922996382d9a150 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 3 Apr 2015 11:15:36 +0200
Subject: [PATCH] fix actionbar color and draggable row

---
 res/layout-v21/draggable_row.xml | 72 ++++++++++++++++++++++++++++++++
 res/values-v21/theme.xml         |  8 ++--
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 res/layout-v21/draggable_row.xml

diff --git a/res/layout-v21/draggable_row.xml b/res/layout-v21/draggable_row.xml
new file mode 100644
index 00000000..e766e934
--- /dev/null
+++ b/res/layout-v21/draggable_row.xml
@@ -0,0 +1,72 @@
+<?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="@color/divider_color"/>
+
+</ch.blinkenlights.android.vanilla.DraggableRow>
diff --git a/res/values-v21/theme.xml b/res/values-v21/theme.xml
index fb263275..b5e0b0af 100644
--- a/res/values-v21/theme.xml
+++ b/res/values-v21/theme.xml
@@ -22,16 +22,17 @@ THE SOFTWARE.
 -->
 <resources>
 	<!-- Color used in LibraryActivity list dividers -->
-	<color name="divider_color">#00ff00</color>
+	<color name="divider_color">#f888</color>
 	<color name="overlay_color">#feee</color>
 
 	<!-- Material design primary colors -->
 	<color name="vanillaPrimary">#607D8B</color>
 	<color name="vanillaPrimaryDark">#455A64</color>
-	<color name="vanillaAccent">#9E9E9E</color>
+	<color name="vanillaAccent">#607D8B</color>
+	<color name="material_grey_900">#ff212121</color>
 
 	<!-- styles -->
-	<style name="VanillaBase" parent="android:Theme.Material.Light">
+	<style name="VanillaBase" parent="android:Theme.Material.Light.DarkActionBar">
 		<item name="android:colorAccent">@color/vanillaAccent</item>
 		<item name="android:colorPrimary">@color/vanillaPrimary</item>
 		<item name="android:colorPrimaryDark">@color/vanillaPrimaryDark</item>
@@ -63,6 +64,7 @@ THE SOFTWARE.
 	<style name="LibraryActionBarTabText" parent="android:Widget.Material.ActionBar.TabText">
 		<item name="android:singleLine">true</item>
 		<item name="android:textSize">11.5sp</item>
+		<item name="android:textColor">@color/material_grey_900</item>
 	</style>
 
 </resources>