Added dark version of borderless button

11 files changed, 34 insertions, 25 deletions

diff --git a/res/drawable/borderless_button.xml b/res/drawable/borderless_button.xml
index d44878b6f..27d723eed 100644
--- a/res/drawable/borderless_button.xml
+++ b/res/drawable/borderless_button.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"><shape android:shape="rectangle">
-            <solid android:color="#FEBB20" />
+            <solid android:color="@color/selection_background_color_light" />
         </shape></item>
     <item android:state_focused="true"><shape android:shape="rectangle">          
-            <solid android:color="#FEBB20" />
+            <solid android:color="@color/selection_background_color_light" />
         </shape></item>
     <item><shape android:shape="rectangle">
             <solid android:color="@android:color/transparent" />
diff --git a/res/drawable-v11/borderless_button.xml b/res/drawable/borderless_button_dark.xml
index 28945a631..6d263938d 100644
--- a/res/drawable-v11/borderless_button.xml
+++ b/res/drawable/borderless_button_dark.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="true"><shape android:shape="rectangle">
-            <solid android:color="@color/selection_background" />
+            <solid android:color="@color/selection_background_color_dark" />
         </shape></item>
-    <item android:state_focused="true"><shape android:shape="rectangle">
-            <solid android:color="@color/selection_background" />
+    <item android:state_focused="true"><shape android:shape="rectangle">          
+            <solid android:color="@color/selection_background_color_dark" />
         </shape></item>
     <item><shape android:shape="rectangle">
             <solid android:color="@android:color/transparent" />
diff --git a/res/layout-land/mediaplayer_activity.xml b/res/layout-land/mediaplayer_activity.xml
index f44ee05f9..f505ec4c4 100644
--- a/res/layout-land/mediaplayer_activity.xml
+++ b/res/layout-land/mediaplayer_activity.xml
@@ -38,7 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:background="@drawable/borderless_button"
+                android:background="?attr/borderless_button"
                 android:src="@drawable/av_pause" />
 
             <ImageButton
@@ -48,7 +48,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/butPlay"
-                android:background="@drawable/borderless_button"
+                android:background="?attr/borderless_button"
                 android:src="@drawable/av_fast_forward" />
 
             <ImageButton
@@ -58,7 +58,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginRight="8dp"
                 android:layout_toLeftOf="@+id/butPlay"
-                android:background="@drawable/borderless_button"
+                android:background="?attr/borderless_button"
                 android:src="@drawable/av_rewind" />
         </RelativeLayout>
 
diff --git a/res/layout/external_player_fragment.xml b/res/layout/external_player_fragment.xml
index cb4351324..ad607374a 100644
--- a/res/layout/external_player_fragment.xml
+++ b/res/layout/external_player_fragment.xml
@@ -20,7 +20,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/borderless_button" >
+            android:background="?attr/borderless_button" >
 
             <ImageView
                 android:id="@+id/imgvCover"
@@ -78,7 +78,7 @@
             android:id="@+id/butPlay"
             android:layout_width="@dimen/external_player_height"
             android:layout_height="@dimen/external_player_height"
-            android:background="@drawable/borderless_button" />
+            android:background="?attr/borderless_button" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml
index 70d258f48..3f24fd422 100644
--- a/res/layout/feeditemlist_item.xml
+++ b/res/layout/feeditemlist_item.xml
@@ -91,7 +91,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="@drawable/borderless_button"
+            android:background="?attr/borderless_button"
             android:clickable="false"
             android:focusable="false"
             android:focusableInTouchMode="false"
diff --git a/res/layout/mediaplayer_activity.xml b/res/layout/mediaplayer_activity.xml
index 679aeb37d..e9e62bd3e 100644
--- a/res/layout/mediaplayer_activity.xml
+++ b/res/layout/mediaplayer_activity.xml
@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0.02"
-            android:background="@drawable/borderless_button"
+            android:background="?attr/borderless_button"
             android:src="?attr/av_rewind" />
 
         <View
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0.14"
-            android:background="@drawable/borderless_button"
+            android:background="?attr/borderless_button"
             android:src="?attr/av_pause" />
 
         <View
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0.02"
-            android:background="@drawable/borderless_button"
+            android:background="?attr/borderless_button"
             android:src="?attr/av_fast_forward" />
     </LinearLayout>
 
diff --git a/res/layout/player_widget.xml b/res/layout/player_widget.xml
index 6d53a55fe..23a1ffff3 100644
--- a/res/layout/player_widget.xml
+++ b/res/layout/player_widget.xml
@@ -15,7 +15,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_margin="12dp"
-            android:background="@drawable/borderless_button"
+            android:background="?attr/borderless_button"
             android:src="@drawable/av_play" />
 
         <LinearLayout
@@ -24,7 +24,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@id/butPlay"
-            android:background="@drawable/borderless_button"
+            android:background="?attr/borderless_button"
             android:gravity="center_vertical"
             android:orientation="vertical" >
 
diff --git a/res/values-v11/colors.xml b/res/values-v11/colors.xml
index a21634ea8..520efaa06 100644
--- a/res/values-v11/colors.xml
+++ b/res/values-v11/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="selection_background">#81CFEA</color>
-    
+    <color name="selection_background_color_dark">#286E8A</color>
+    <color name="selection_background_color_light">#81CFEA</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index dbafca0b8..505dc54a3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <attr name="action_about" format="reference" />
     <attr name="action_search" format="reference" />
     <attr name="action_settings" format="reference" />
@@ -22,6 +23,8 @@
     <attr name="stat_playlist" format="reference" />
     <attr name="type_audio" format="reference" />
     <attr name="type_video" format="reference" />
-	<!-- Used in itemdescription -->
-	<attr name="non_transparent_background" format="reference" />
+    <attr name="borderless_button" format="reference" />
+    <!-- Used in itemdescription -->
+    <attr name="non_transparent_background" format="reference" />
+
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f1e4fbd9d..019213277 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,9 +22,13 @@
     <color name="selection_background">#FEBB20</color>
     <color name="actionbar_gray">#DDDDDD</color>
     <color name="download_success_green">#669900</color>
-	<color name="download_failed_red">#CC0000</color>
-	<color name="status_unread">#99CC00</color>
-	<color name="status_progress">#FFBB33</color>
-	<color name="status_playing">#EE5F52</color>
+    <color name="download_failed_red">#CC0000</color>
+    <color name="status_unread">#99CC00</color>
+    <color name="status_progress">#FFBB33</color>
+    <color name="status_playing">#EE5F52</color>
     
+    <!-- Use Gingerbread-orange -->
+    <color name="selection_background_color_dark">#FEBB20</color>
+    <color name="selection_background_color_light">#FEBB20</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4997d92ad..964ee2824 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,6 +26,8 @@
         <item name="attr/type_audio">@drawable/type_audio</item>
         <item name="attr/type_video">@drawable/type_video</item>
         <item name="attr/non_transparent_background">@color/white</item>
+        <item name="attr/borderless_button">@drawable/borderless_button</item>
+        
     </style>
 
     <style name="AntennaPod.LightTabPageIndicator" parent="Widget.TabPageIndicator">
@@ -57,6 +59,7 @@
         <item name="attr/type_audio">@drawable/type_audio_dark</item>
         <item name="attr/type_video">@drawable/type_video_dark</item>
         <item name="attr/non_transparent_background">@color/black</item>
+        <item name="attr/borderless_button">@drawable/borderless_button_dark</item>
     </style>
 
     <style name="AntennaPod.DarkTabPageIndicator" parent="Widget.TabPageIndicator">