From 0d54bd18a74839a6b6c6ba47524903629bb4ffb4 Mon Sep 17 00:00:00 2001
From: recalculated <recalculated@users.noreply.github.com>
Date: Thu, 7 Jan 2016 19:05:41 -0600
Subject: Redesign ExternalPlayerFragment

---
 core/src/main/res/drawable-v21/progress_bar_horizontal.xml | 10 ++++++++++
 core/src/main/res/drawable/progress_bar_horizontal.xml     | 10 ++++++++++
 core/src/main/res/values/dimens.xml                        |  2 +-
 core/src/main/res/values/styles.xml                        |  5 +++++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/res/drawable-v21/progress_bar_horizontal.xml
 create mode 100644 core/src/main/res/drawable/progress_bar_horizontal.xml

(limited to 'core/src')

diff --git a/core/src/main/res/drawable-v21/progress_bar_horizontal.xml b/core/src/main/res/drawable-v21/progress_bar_horizontal.xml
new file mode 100644
index 000000000..2c0c18182
--- /dev/null
+++ b/core/src/main/res/drawable-v21/progress_bar_horizontal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="?attr/colorAccent"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/drawable/progress_bar_horizontal.xml b/core/src/main/res/drawable/progress_bar_horizontal.xml
new file mode 100644
index 000000000..f96a1c3e0
--- /dev/null
+++ b/core/src/main/res/drawable/progress_bar_horizontal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="@color/holo_blue_dark"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index c46537b3e..aa57e3051 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
 
     <dimen name="widget_margin">8dp</dimen>
     <dimen name="thumbnail_length">70dp</dimen>
-    <dimen name="external_player_height">70dp</dimen>
+    <dimen name="external_player_height">56dp</dimen>
     <dimen name="enc_icons_size">20dp</dimen>
     <dimen name="text_size_micro">12sp</dimen>
     <dimen name="text_size_small">14sp</dimen>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index b9ee70dbf..b006f31b9 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -253,4 +253,9 @@
 
     </style>
 
+    <style name="ProgressBarStyle">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@drawable/progress_bar_horizontal</item>
+    </style>
+
 </resources>
-- 
cgit v1.2.3


From 30e963fc3e4f1f49369e79ae131143c835d1a3fd Mon Sep 17 00:00:00 2001
From: recalculated <recalculated@users.noreply.github.com>
Date: Fri, 8 Jan 2016 17:42:05 -0600
Subject: Make progress bar theme-specific

---
 .../src/main/res/drawable-v21/progress_bar_horizontal.xml | 10 ----------
 core/src/main/res/drawable/progress_bar_horizontal.xml    | 10 ----------
 .../main/res/drawable/progress_bar_horizontal_dark.xml    | 15 +++++++++++++++
 .../main/res/drawable/progress_bar_horizontal_light.xml   | 15 +++++++++++++++
 core/src/main/res/values/attrs.xml                        |  1 +
 core/src/main/res/values/styles.xml                       | 13 +++++++++++--
 6 files changed, 42 insertions(+), 22 deletions(-)
 delete mode 100644 core/src/main/res/drawable-v21/progress_bar_horizontal.xml
 delete mode 100644 core/src/main/res/drawable/progress_bar_horizontal.xml
 create mode 100644 core/src/main/res/drawable/progress_bar_horizontal_dark.xml
 create mode 100644 core/src/main/res/drawable/progress_bar_horizontal_light.xml

(limited to 'core/src')

diff --git a/core/src/main/res/drawable-v21/progress_bar_horizontal.xml b/core/src/main/res/drawable-v21/progress_bar_horizontal.xml
deleted file mode 100644
index 2c0c18182..000000000
--- a/core/src/main/res/drawable-v21/progress_bar_horizontal.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <solid android:color="?attr/colorAccent"/>
-            </shape>
-        </clip>
-    </item>
-</layer-list>
diff --git a/core/src/main/res/drawable/progress_bar_horizontal.xml b/core/src/main/res/drawable/progress_bar_horizontal.xml
deleted file mode 100644
index f96a1c3e0..000000000
--- a/core/src/main/res/drawable/progress_bar_horizontal.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <solid android:color="@color/holo_blue_dark"/>
-            </shape>
-        </clip>
-    </item>
-</layer-list>
diff --git a/core/src/main/res/drawable/progress_bar_horizontal_dark.xml b/core/src/main/res/drawable/progress_bar_horizontal_dark.xml
new file mode 100644
index 000000000..73ad5b37c
--- /dev/null
+++ b/core/src/main/res/drawable/progress_bar_horizontal_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#33FFFFFF"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="@color/holo_blue_dark"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/drawable/progress_bar_horizontal_light.xml b/core/src/main/res/drawable/progress_bar_horizontal_light.xml
new file mode 100644
index 000000000..a1a7129e9
--- /dev/null
+++ b/core/src/main/res/drawable/progress_bar_horizontal_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#33212121"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="@color/holo_blue_light"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index de641f518..4e444c990 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -41,6 +41,7 @@
     <attr name="ic_lock_open" format="reference"/>
     <attr name="ic_lock_closed" format="reference"/>
     <attr name="ic_filter" format="reference"/>
+    <attr name="progressBarTheme" format="reference"/>
 
     <!-- Used in itemdescription -->
     <attr name="non_transparent_background" format="reference"/>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index b006f31b9..1f73fbba2 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -4,6 +4,7 @@
     <style name="Theme.AntennaPod.Light" parent="Theme.AppCompat.Light">
         <item name="colorPrimary">@color/primary_light</item>
         <item name="colorAccent">@color/holo_blue_light</item>
+        <item name="progressBarTheme">@style/ProgressBarLight</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
         <item name="attr/action_bar_icon_color">@color/grey600</item>
@@ -53,6 +54,7 @@
     <style name="Theme.AntennaPod.Dark" parent="Theme.AppCompat">
         <item name="colorAccent">@color/holo_blue_dark</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
+        <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
         <item name="attr/action_bar_icon_color">@color/white</item>
         <item name="attr/action_about">@drawable/ic_info_white_24dp</item>g
@@ -101,6 +103,7 @@
     <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="progressBarTheme">@style/ProgressBarLight</item>
         <item name="colorPrimary">@color/primary_light</item>
         <item name="colorAccent">@color/holo_blue_light</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
@@ -151,6 +154,7 @@
     <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.AppCompat.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="colorAccent">@color/holo_blue_dark</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
@@ -253,9 +257,14 @@
 
     </style>
 
-    <style name="ProgressBarStyle">
+    <style name="ProgressBarLight">
         <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@drawable/progress_bar_horizontal</item>
+        <item name="android:progressDrawable">@drawable/progress_bar_horizontal_light</item>
+    </style>
+
+    <style name="ProgressBarDark">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@drawable/progress_bar_horizontal_dark</item>
     </style>
 
 </resources>
-- 
cgit v1.2.3