Merge folder configuration

20 files changed, 7 insertions, 23 deletions

diff --git a/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png
deleted file mode 100644
index af99f4b3b..000000000
--- a/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png b/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png
deleted file mode 100755
index 398dffa4b..000000000
--- a/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png
index fb15f7ee1..af99f4b3b 100644
--- a/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png
+++ b/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png
diff --git a/core/src/main/res/drawable-hdpi/ic_stat_authentication.png b/core/src/main/res/drawable-hdpi/ic_stat_authentication.png
index f40820ef7..398dffa4b 100755..100644
--- a/core/src/main/res/drawable-hdpi/ic_stat_authentication.png
+++ b/core/src/main/res/drawable-hdpi/ic_stat_authentication.png
diff --git a/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png
deleted file mode 100644
index ddf545c0b..000000000
--- a/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png
index 501dfa848..ddf545c0b 100644
--- a/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png
+++ b/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png
diff --git a/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png
deleted file mode 100644
index 41fd20655..000000000
--- a/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png b/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png
deleted file mode 100755
index 550b56b33..000000000
--- a/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png
index 152239888..41fd20655 100644
--- a/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png
+++ b/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png
diff --git a/core/src/main/res/drawable-mdpi/ic_stat_authentication.png b/core/src/main/res/drawable-mdpi/ic_stat_authentication.png
index 7fab11a83..550b56b33 100755..100644
--- a/core/src/main/res/drawable-mdpi/ic_stat_authentication.png
+++ b/core/src/main/res/drawable-mdpi/ic_stat_authentication.png
diff --git a/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png
deleted file mode 100644
index 30431ed6a..000000000
--- a/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png b/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png
deleted file mode 100755
index e83cbc333..000000000
--- a/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png
index 3d8a046a8..30431ed6a 100644
--- a/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png
+++ b/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png b/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png
index 200b60c96..e83cbc333 100755..100644
--- a/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png
+++ b/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png
diff --git a/core/src/main/res/values-v11/colors.xml b/core/src/main/res/values-v11/colors.xml
deleted file mode 100644
index 520efaa06..000000000
--- a/core/src/main/res/values-v11/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <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/core/src/main/res/values-v14/dimens.xml b/core/src/main/res/values-v14/dimens.xml
deleted file mode 100644
index 090a476a8..000000000
--- a/core/src/main/res/values-v14/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="widget_margin">0dp</dimen>
-    
-</resources>
\ No newline at end of file
diff --git a/core/src/main/res/values-v14/styles.xml b/core/src/main/res/values-v14/styles.xml
deleted file mode 100644
index 6a39d6175..000000000
--- a/core/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AntennaPod.TextView.UnreadIndicator" parent="@android:style/TextAppearance.Small">
-        <item name="android:textSize">@dimen/text_size_micro</item>
-        <item name="android:textColor">@color/new_indicator_green</item>
-        <item name="android:text">@string/new_label</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index a570a3fcb..55f9fed46 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -22,8 +22,8 @@
     <color name="image_readability_tint">#80000000</color>
 
     <!-- Use Gingerbread-orange -->
-    <color name="selection_background_color_dark">#FEBB20</color>
-    <color name="selection_background_color_light">#FEBB20</color>
+    <color name="selection_background_color_dark">#286E8A</color>
+    <color name="selection_background_color_light">#81CFEA</color>
 
     <!-- Theme colors -->
     <color name="primary_light">#FFFFFF</color>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index a9a3aa8d9..46da1d68e 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <dimen name="widget_margin">8dp</dimen>
+    <dimen name="widget_margin">0dp</dimen>
     <dimen name="thumbnail_length">70dp</dimen>
     <dimen name="external_player_height">56dp</dimen>
     <dimen name="enc_icons_size">20dp</dimen>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index a88d8c3a8..dc996f2d4 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -296,7 +296,10 @@
     </style>
 
     <style name="AntennaPod.TextView.UnreadIndicator" parent="@android:style/TextAppearance.Small">
-        <item name="android:textSize">@dimen/text_size_micro</item>
+        @dimen/text_size_micro
+        @color/new_indicator_green
+        @string/new_label
+        true
         <item name="android:textColor">@color/new_indicator_green</item>
         <item name="android:text">@string/new_label</item>
     </style>