From 6962d139746347aff034e3a84eaecf3e98062160 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Thu, 4 Dec 2014 16:34:32 +0100
Subject: Updated audio player layout

---
 .../core/preferences/UserPreferences.java          |  9 +++
 .../antennapod/core/util/playback/Timeline.java    |  2 +-
 core/src/main/res/values/colors.xml                |  4 +-
 core/src/main/res/values/dimens.xml                |  2 +
 core/src/main/res/values/styles.xml                | 83 ++++++++++++++++++++++
 5 files changed, 97 insertions(+), 3 deletions(-)

(limited to 'core/src')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index ef4569e5d..186b390a8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -291,6 +291,15 @@ public class UserPreferences implements
         return instance.theme;
     }
 
+    public static int getNoTitleTheme() {
+        int theme = getTheme();
+        if (theme == R.style.Theme_AntennaPod_Dark) {
+            return R.style.Theme_AntennaPod_Dark_NoTitle;
+        } else {
+            return R.style.Theme_AntennaPod_Light_NoTitle;
+        }
+    }
+
     public static boolean isEnableAutodownloadWifiFilter() {
         instanceAvailable();
         return instance.enableAutodownloadWifiFilter;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
index 443ff0ad1..f31297b41 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
@@ -28,7 +28,7 @@ import de.danoeh.antennapod.core.util.ShownotesProvider;
 public class Timeline {
     private static final String TAG = "Timeline";
 
-    private static final String WEBVIEW_STYLE = "@font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } a.timecode { color: #669900; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }";
+    private static final String WEBVIEW_STYLE = "@font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 13pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } a.timecode { color: #669900; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }";
 
 
     private ShownotesProvider shownotesProvider;
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index f062f23ea..e558a5c4e 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -11,8 +11,8 @@
     <color name="download_failed_red">#CC0000</color>
     <color name="status_progress">#E033B5E5</color>
     <color name="status_playing">#E0EE5F52</color>
-    <color name="overlay_dark">#262C31</color>
-    <color name="overlay_light">#DDDDDD</color>
+    <color name="overlay_dark">#2C2C2C</color>
+    <color name="overlay_light">#FFFFFF</color>
     <color name="swipe_refresh_secondary_color_light">#EDEDED</color>
     <color name="swipe_refresh_secondary_color_dark">#060708</color>
     <color name="new_indicator_green">#669900</color>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index 38c14b024..81a55142a 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -33,4 +33,6 @@
     <dimen name="listitem_icon_leftpadding">16dp</dimen>
     <dimen name="listitem_icon_rightpadding">16dp</dimen>
 
+    <dimen name="audioplayer_playercontrols_length">64dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index d9f6a775a..4d05a4cb9 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -82,6 +82,89 @@
         <item name="attr/av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
     </style>
 
+    <style name="Theme.AntennaPod.Light.NoTitle" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="colorPrimary">@color/primary_light</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item>
+        <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item>
+        <item name="attr/action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
+        <item name="attr/av_download">@drawable/ic_file_download_grey600_24dp</item>
+        <item name="attr/av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
+        <item name="attr/av_pause">@drawable/ic_pause_grey600_24dp</item>
+        <item name="attr/av_play">@drawable/ic_play_arrow_grey600_24dp</item>
+        <item name="attr/av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
+        <item name="attr/content_discard">@drawable/ic_delete_grey600_24dp</item>
+        <item name="attr/content_new">@drawable/ic_add_grey600_24dp</item>
+        <item name="attr/device_access_time">@drawable/ic_timer_grey600_24dp</item>
+        <item name="attr/location_web_site">@drawable/ic_web_grey600_24dp</item>
+        <item name="attr/navigation_accept">@drawable/ic_done_grey600_24dp</item>
+        <item name="attr/navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
+        <item name="attr/navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
+        <item name="attr/navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="attr/navigation_up">@drawable/navigation_up</item>
+        <item name="attr/navigation_shownotes">@drawable/ic_description_grey600_36dp</item>
+        <item name="attr/navigation_chapters">@drawable/ic_toc_grey600_36dp</item>
+        <item name="attr/social_share">@drawable/ic_share_grey600_24dp</item>
+        <item name="attr/stat_playlist">@drawable/ic_list_grey600_24dp</item>
+        <item name="attr/type_audio">@drawable/ic_hearing_grey600_18dp</item>
+        <item name="attr/type_video">@drawable/ic_remove_red_eye_grey600_18dp</item>
+        <item name="attr/non_transparent_background">@color/white</item>
+        <item name="attr/overlay_background">@color/overlay_light</item>
+        <item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_handle</item>
+        <item name="attr/dragview_float_background">@color/white</item>
+        <item name="attr/nav_drawer_background">@color/white</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_grey600_24dp</item>
+        <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item>
+        <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item>
+        <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
+        <item name="attr/av_pause_big">@drawable/ic_pause_grey600_36dp</item>
+        <item name="attr/av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
+        <item name="attr/av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
+    </style>
+
+    <style name="Theme.AntennaPod.Dark.NoTitle" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="attr/action_about">@drawable/ic_info_white_24dp</item>
+        <item name="attr/action_search">@drawable/ic_search_white_24dp</item>
+        <item name="attr/action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
+        <item name="attr/av_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="attr/av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
+        <item name="attr/av_pause">@drawable/ic_pause_white_24dp</item>
+        <item name="attr/av_play">@drawable/ic_play_arrow_white_24dp</item>
+        <item name="attr/av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
+        <item name="attr/content_discard">@drawable/ic_delete_white_24dp</item>
+        <item name="attr/content_new">@drawable/ic_add_white_24dp</item>
+        <item name="attr/device_access_time">@drawable/ic_timer_white_24dp</item>
+        <item name="attr/location_web_site">@drawable/ic_web_white_24dp</item>
+        <item name="attr/navigation_accept">@drawable/ic_done_white_24dp</item>
+        <item name="attr/navigation_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="attr/navigation_expand">@drawable/ic_expand_more_white_36dp</item>
+        <item name="attr/navigation_refresh">@drawable/ic_refresh_white_24dp</item>
+        <item name="attr/navigation_up">@drawable/navigation_up_dark</item>
+        <item name="attr/navigation_shownotes">@drawable/ic_description_white_36dp</item>
+        <item name="attr/navigation_chapters">@drawable/ic_toc_white_36dp</item>
+        <item name="attr/social_share">@drawable/ic_share_white_24dp</item>
+        <item name="attr/stat_playlist">@drawable/ic_list_white_24dp</item>
+        <item name="attr/type_audio">@drawable/ic_hearing_white_18dp</item>
+        <item name="attr/type_video">@drawable/ic_remove_red_eye_white_18dp</item>
+        <item name="attr/non_transparent_background">@color/black</item>
+        <item name="attr/overlay_background">@color/overlay_dark</item>
+        <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_handle_dark</item>
+        <item name="attr/dragview_float_background">@color/black</item>
+        <item name="attr/nav_drawer_background">#3B3B3B</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_white_24dp</item>
+        <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item>
+        <item name="attr/ic_history">@drawable/ic_history_white_24dp</item>
+        <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item>
+        <item name="attr/av_pause_big">@drawable/ic_pause_white_36dp</item>
+        <item name="attr/av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
+        <item name="attr/av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
+    </style>
+
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
         <item name="windowActionBarOverlay">true</item>
     </style>
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0