Merge branch 'theme' into develop

AndroidManifest.xml

@@ -29,12 +29,11 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:logo="@drawable/ic_launcher"
-        android:theme="@style/Theme.Sherlock.Light.ForceOverflow" >
+        android:theme="@style/Theme.AntennaPod.Light" >
         <activity
             android:name=".activity.MainActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="@string/app_name"
-            android:theme="@style/StyledIndicators" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -75,8 +74,7 @@
             android:name=".activity.AudioplayerActivity"
             android:configChanges="keyboardHidden|orientation"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.MediaPlayer" />
+            android:screenOrientation="portrait"/>
 
         <service
             android:name=".service.download.DownloadService"
@@ -159,8 +157,7 @@
         </activity>
         <activity
             android:name=".activity.AboutActivity"
-            android:label="@string/about_pref"
-            android:theme="@style/Theme.Sherlock.Light.NoActionBar" >
+            android:label="@string/about_pref">
         </activity>
         <activity
             android:name=".activity.OpmlImportActivity"
@@ -211,8 +208,7 @@
         </activity>
         <activity
             android:name=".activity.MiroGuideCategoryActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:theme="@style/StyledIndicators" >
+            android:configChanges="keyboardHidden|orientation">
         </activity>
         <activity
             android:name=".activity.MiroGuideChannelViewActivity"
@@ -222,8 +218,7 @@
         <activity
             android:name=".activity.VideoplayerActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="landscape"
-            android:theme="@style/VideoplayerTheme" >
+            android:screenOrientation="landscape">
         </activity>
         <activity android:label="@string/playback_history_label" android:name=".activity.PlaybackHistoryActivity"></activity>
     </application>

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" />

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" />

res/layout-land/mediaplayer_activity.xml

@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
-        android:background="@color/actionbar_gray"
+        android:background="?attr/video_overlay_background"
         android:orientation="vertical" >
 
         <RelativeLayout
@@ -38,8 +38,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:background="@drawable/borderless_button"
-                android:src="@drawable/av_pause" />
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_pause" />
 
             <ImageButton
                 android:id="@+id/butFF"
@@ -48,8 +48,8 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/butPlay"
-                android:background="@drawable/borderless_button"
-                android:src="@drawable/av_fast_forward" />
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_fast_forward" />
 
             <ImageButton
                 android:id="@+id/butRev"
@@ -58,8 +58,8 @@
                 android:layout_alignParentTop="true"
                 android:layout_marginRight="8dp"
                 android:layout_toLeftOf="@+id/butPlay"
-                android:background="@drawable/borderless_button"
-                android:src="@drawable/av_rewind" />
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_rewind" />
         </RelativeLayout>
 
         <RelativeLayout

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>

res/layout/feeditemlist_item.xml

@@ -56,7 +56,7 @@
             android:layout_height="@dimen/enc_icons_size"
             android:layout_below="@id/txtvPublished"
             android:layout_toLeftOf="@+id/imgvDownloaded"
-            android:src="@drawable/stat_playlist"
+            android:src="?attr/stat_playlist"
             android:visibility="visible" />
 
         <ImageView
@@ -65,7 +65,7 @@
             android:layout_height="@dimen/enc_icons_size"
             android:layout_below="@id/txtvPublished"
             android:layout_toLeftOf="@+id/imgvDownloading"
-            android:src="@drawable/av_download"
+            android:src="?attr/av_download"
             android:visibility="visible" />
 
         <ImageView
@@ -74,7 +74,7 @@
             android:layout_height="@dimen/enc_icons_size"
             android:layout_below="@id/txtvPublished"
             android:layout_toLeftOf="@id/butAction"
-            android:src="@drawable/navigation_refresh"
+            android:src="?attr/navigation_refresh"
             android:visibility="visible" />
 
         <TextView
@@ -91,13 +91,13 @@
             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"
             android:padding="8dp"
             android:scaleType="center"
-            android:src="@drawable/navigation_expand" />
+            android:src="?attr/navigation_expand" />
     </RelativeLayout>
 
 </LinearLayout>

res/layout/feeditemview.xml

@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/white" >
+    android:background="?attr/non_transparent_background" >
 
     <LinearLayout
         android:layout_width="fill_parent"

res/layout/mediaplayer_activity.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="?attr/non_transparent_background"
     android:orientation="vertical" >
 
     <com.viewpagerindicator.TabPageIndicator
@@ -23,8 +23,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0.02"
-            android:background="@drawable/borderless_button"
-            android:src="@drawable/av_rewind" />
+            android:background="?attr/borderless_button"
+            android:src="?attr/av_rewind" />
 
         <View
             android:layout_width="0.5dp"
@@ -38,8 +38,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0.14"
-            android:background="@drawable/borderless_button"
-            android:src="@drawable/av_pause" />
+            android:background="?attr/borderless_button"
+            android:src="?attr/av_pause" />
 
         <View
             android:layout_width="0.5dp"
@@ -53,8 +53,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0.02"
-            android:background="@drawable/borderless_button"
-            android:src="@drawable/av_fast_forward" />
+            android:background="?attr/borderless_button"
+            android:src="?attr/av_fast_forward" />
     </LinearLayout>
 
     <SeekBar

res/layout/player_widget.xml

@@ -7,7 +7,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white" >
+        android:background="#262C31" >
 
         <ImageButton
             android:id="@+id/butPlay"
@@ -15,8 +15,8 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_margin="12dp"
-            android:background="@drawable/borderless_button"
-            android:src="@drawable/av_play" />
+            android:background="@drawable/borderless_button_dark"
+            android:src="@drawable/av_play_dark" />
 
         <LinearLayout
             android:id="@+id/layout_left"
@@ -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="@drawable/borderless_button_dark"
             android:gravity="center_vertical"
             android:orientation="vertical" >
 
@@ -35,7 +35,7 @@
                 android:layout_margin="8dp"
                 android:maxLines="1"
                 android:text="@string/no_media_playing_label"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="18dp"
                 android:textStyle="bold" />
 
@@ -44,7 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
-                android:textColor="@color/ics_gray" />
+                android:textColor="@color/gray" />
         </LinearLayout>
     </RelativeLayout>
 

res/menu/channelview.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/add_feed" android:icon="@drawable/content_new" android:title="@string/add_new_feed_label" android:showAsAction="ifRoom"></item>
-    <item android:id="@+id/visit_website_item" android:title="@string/visit_website_label" android:showAsAction="ifRoom" android:icon="@drawable/location_web_site"></item>
+    <item android:id="@+id/add_feed" android:icon="?attr/content_new" android:title="@string/add_new_feed_label" android:showAsAction="ifRoom"></item>
+    <item android:id="@+id/visit_website_item" android:title="@string/visit_website_label" android:showAsAction="ifRoom" android:icon="?attr/location_web_site"></item>
     
 
 </menu>

res/menu/feedinfo.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
         android:id="@+id/visit_website_item"
-        android:icon="@drawable/location_web_site"
+        android:icon="?attr/location_web_site"
         android:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="true">

res/menu/feeditem.xml

@@ -3,35 +3,35 @@
 
     <item
         android:id="@+id/download_item"
-        android:icon="@drawable/av_download"
+        android:icon="?attr/av_download"
         android:showAsAction="ifRoom"
         android:title="@string/download_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/stream_item"
-        android:icon="@drawable/action_stream"
+        android:icon="?attr/action_stream"
         android:showAsAction="ifRoom"
         android:title="@string/stream_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/play_item"
-        android:icon="@drawable/av_play"
+        android:icon="?attr/av_play"
         android:showAsAction="ifRoom"
         android:title="@string/play_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/remove_item"
-        android:icon="@drawable/content_discard"
+        android:icon="?attr/content_discard"
         android:showAsAction="collapseActionView"
         android:title="@string/remove_label"
         android:visible="false">
     </item>
     <item
         android:id="@+id/cancel_download_item"
-        android:icon="@drawable/navigation_cancel"
+        android:icon="?attr/navigation_cancel"
         android:showAsAction="ifRoom"
         android:title="@string/cancel_download_label">
     </item>
@@ -66,7 +66,7 @@
     </item>
     <item
         android:id="@+id/visit_website_item"
-        android:icon="@drawable/location_web_site"
+        android:icon="?attr/location_web_site"
         android:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="false">

res/menu/feedlist.xml

@@ -4,7 +4,7 @@
     <item
         android:id="@+id/refresh_item"
         android:showAsAction="ifRoom|collapseActionView"
-        android:title="@string/refresh_label" android:icon="@drawable/navigation_refresh">
+        android:title="@string/refresh_label" android:icon="?attr/navigation_refresh">
     </item>
     <item
         android:id="@+id/mark_all_read_item"
@@ -13,20 +13,20 @@
     </item>
     <item
         android:id="@+id/show_info_item"
-        android:icon="@drawable/action_about"
+        android:icon="?attr/action_about"
         android:showAsAction="collapseActionView"
         android:title="@string/show_info_label">
     </item>
     <item
         android:id="@+id/remove_item"
-        android:icon="@drawable/content_discard"
+        android:icon="?attr/content_discard"
         android:showAsAction="collapseActionView"
         android:title="@string/remove_feed_label"
         android:visible="true">
     </item>
     <item
         android:id="@+id/visit_website_item"
-        android:icon="@drawable/location_web_site"
+        android:icon="?attr/location_web_site"
         android:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="true">

res/menu/mediaplayer.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item android:id="@+id/disable_sleeptimer_item" android:icon="@drawable/device_access_time" android:title="@string/sleep_timer_label" android:showAsAction="always"></item><item android:id="@+id/set_sleeptimer_item" android:showAsAction="collapseActionView" android:title="@string/set_sleeptimer_label"></item><item
+    <item android:id="@+id/disable_sleeptimer_item" android:icon="?attr/device_access_time" android:title="@string/sleep_timer_label" android:showAsAction="always"></item><item android:id="@+id/set_sleeptimer_item" android:showAsAction="collapseActionView" android:title="@string/set_sleeptimer_label"></item><item
         android:id="@+id/share_link_item"
         android:showAsAction="collapseActionView"
         android:title="@string/share_link_label">
     </item>
     <item
         android:id="@+id/visit_website_item"
-        android:icon="@drawable/location_web_site"
+        android:icon="?attr/location_web_site"
         android:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="false">

res/menu/podfetcher.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/all_feed_refresh" android:title="@string/refresh_label" android:icon="@drawable/navigation_refresh" android:showAsAction="ifRoom|collapseActionView">
+    <item android:id="@+id/all_feed_refresh" android:title="@string/refresh_label" android:icon="?attr/navigation_refresh" android:showAsAction="ifRoom|collapseActionView">
     </item><item
         android:id="@+id/add_feed"
         android:title="@string/add_feed_label"
-        android:icon="@drawable/content_new"
+        android:icon="?attr/content_new"
         android:showAsAction="ifRoom|collapseActionView">
     </item>
     
     
     
-    <item android:id="@id/search_item" android:icon="@drawable/action_search" android:title="@string/search_label" android:showAsAction="ifRoom|collapseActionView"></item><item android:id="@+id/show_player" android:title="@string/show_player_label" android:icon="@drawable/av_play" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_playback_history" android:title="@string/playback_history_label" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_downloads" android:title="@string/downloads_label" android:icon="@drawable/av_download" android:showAsAction="collapseActionView">
-    </item><item android:id="@+id/show_preferences" android:title="@string/settings_label" android:icon="@drawable/action_settings" android:showAsAction="collapseActionView"></item>
+    <item android:id="@id/search_item" android:icon="?attr/action_search" android:title="@string/search_label" android:showAsAction="ifRoom|collapseActionView"></item><item android:id="@+id/show_player" android:title="@string/show_player_label" android:icon="@drawable/av_play" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_playback_history" android:title="@string/playback_history_label" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_downloads" android:title="@string/downloads_label" android:icon="@drawable/av_download" android:showAsAction="collapseActionView">
+    </item><item android:id="@+id/show_preferences" android:title="@string/settings_label" android:icon="?attr/action_settings" android:showAsAction="collapseActionView"></item>
     
     
 </menu>

res/values-port/styles.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.MediaPlayer" parent="@style/StyledIndicators"></style>
-
-</resources>

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>

res/values/arrays.xml

@@ -3,12 +3,12 @@
 
     <string-array name="update_intervall_options">
         <item>Manual</item>
-        <item>1 h</item>
-        <item>2 h</item>
-        <item>4 h</item>
-        <item>8 h</item>
-        <item>12 h</item>
-        <item>24 h</item>
+        <item>1 hour</item>
+        <item>2 hours</item>
+        <item>4 hours</item>
+        <item>8 hours</item>
+        <item>12 hours</item>
+        <item>24 hours</item>
     </string-array>
 
     <string-array name="update_intervall_values">
@@ -20,5 +20,15 @@
         <item>12</item>
         <item>24</item>
     </string-array>
+    
+    <string-array name="theme_options">
+        <item>Light</item>
+        <item>Dark</item>
+    </string-array>
+    
+    <string-array name="theme_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
 
 </resources>

res/values/attrs.xml

@@ -0,0 +1,31 @@
+<?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" />
+    <attr name="action_stream" format="reference" />
+    <attr name="av_download" format="reference" />
+    <attr name="av_fast_forward" format="reference" />
+    <attr name="av_pause" format="reference" />
+    <attr name="av_play" format="reference" />
+    <attr name="av_rewind" format="reference" />
+    <attr name="content_discard" format="reference" />
+    <attr name="content_new" format="reference" />
+    <attr name="default_cover" format="reference" />
+    <attr name="device_access_time" format="reference" />
+    <attr name="location_web_site" format="reference" />
+    <attr name="navigation_accept" format="reference" />
+    <attr name="navigation_cancel" format="reference" />
+    <attr name="navigation_expand" format="reference" />
+    <attr name="navigation_refresh" format="reference" />
+    <attr name="social_share" format="reference" />
+    <attr name="stat_playlist" format="reference" />
+    <attr name="type_audio" format="reference" />
+    <attr name="type_video" format="reference" />
+    <attr name="borderless_button" format="reference" />
+    <!-- Used in itemdescription -->
+    <attr name="non_transparent_background" format="reference" />
+    <attr name="video_overlay_background" format="color" />
+
+</resources>

res/values/colors.xml

@@ -19,12 +19,16 @@
     <color name="black">#000000</color>
     <color name="bright_blue">#33B5E5</color>
     <color name="ics_gray">#858585</color>
-    <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>
+    <color name="video_overlay_dark">#262C31</color>
+    <color name="video_overlay_light">#DDDDDD</color>
+    <!-- Use Gingerbread-orange -->
+    <color name="selection_background_color_dark">#FEBB20</color>
+    <color name="selection_background_color_light">#FEBB20</color>
+
 </resources>

res/values/strings.xml

@@ -164,6 +164,8 @@
     <string name="user_interface_label">User Interface</string>
     <string name="pref_auto_delete_title">Auto-delete</string>
     <string name="pref_auto_delete_sum">Delete an episode when playback completes or when it is removed from the queue.</string>
+    <string name="pref_set_theme_title">Select Theme</string>
+    <string name="pref_set_theme_sum">Change the appearance of AntennaPod.</string>
 
     <!-- Search -->
     <string name="search_hint">Search for Feeds or Episodes</string>

res/values/styles.xml

@@ -1,18 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="PodTheme" parent="@style/Theme.Sherlock.Light.ForceOverflow">
-        <item name="vpiTabPageIndicatorStyle">@style/Widget.TabPageIndicator</item>
-    </style>
-    
-    <style name="StyledIndicators" parent="PodTheme">
-            <item name="vpiTabPageIndicatorStyle">@style/Widget.TabPageIndicator</item>
-            <item name="android:textColor">@color/black</item>
-        </style>
+    <style name="Theme.AntennaPod.Light" parent="@style/Theme.Sherlock.Light.ForceOverflow">
+        <item name="vpiTabPageIndicatorStyle">@style/AntennaPod.LightTabPageIndicator</item>
+        <item name="attr/action_about">@drawable/action_about</item>
+        <item name="attr/action_search">@drawable/action_search</item>
+        <item name="attr/action_settings">@drawable/action_settings</item>
+        <item name="attr/action_stream">@drawable/action_stream</item>
+        <item name="attr/av_download">@drawable/av_download</item>
+        <item name="attr/av_fast_forward">@drawable/av_fast_forward</item>
+        <item name="attr/av_pause">@drawable/av_pause</item>
+        <item name="attr/av_play">@drawable/av_play</item>
+        <item name="attr/av_rewind">@drawable/av_rewind</item>
+        <item name="attr/content_discard">@drawable/content_discard</item>
+        <item name="attr/content_new">@drawable/content_new</item>
+        <item name="attr/default_cover">@drawable/default_cover</item>
+        <item name="attr/device_access_time">@drawable/device_access_time</item>
+        <item name="attr/location_web_site">@drawable/location_web_site</item>
+        <item name="attr/navigation_accept">@drawable/navigation_accept</item>
+        <item name="attr/navigation_cancel">@drawable/navigation_cancel</item>
+        <item name="attr/navigation_expand">@drawable/navigation_expand</item>
+        <item name="attr/navigation_refresh">@drawable/navigation_refresh</item>
+        <item name="attr/social_share">@drawable/social_share</item>
+        <item name="attr/stat_playlist">@drawable/stat_playlist</item>
+        <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>
+        <item name="attr/video_overlay_background">@color/video_overlay_light</item>
         
-    
-    <style name="VideoplayerTheme" parent="@style/Theme.Sherlock.Light.ForceOverflow">
-        <item name="android:windowActionBarOverlay">true</item>
     </style>
-        
+
+    <style name="AntennaPod.LightTabPageIndicator" parent="Widget.TabPageIndicator">
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+    <style name="Theme.AntennaPod.Dark" parent="@style/Theme.Sherlock.ForceOverflow">
+        <item name="vpiTabPageIndicatorStyle">@style/AntennaPod.DarkTabPageIndicator</item>
+        <item name="attr/action_about">@drawable/action_about_dark</item>
+        <item name="attr/action_search">@drawable/action_search_dark</item>
+        <item name="attr/action_settings">@drawable/action_settings_dark</item>
+        <item name="attr/action_stream">@drawable/action_stream_dark</item>
+        <item name="attr/av_download">@drawable/av_download_dark</item>
+        <item name="attr/av_fast_forward">@drawable/av_fast_forward_dark</item>
+        <item name="attr/av_pause">@drawable/av_pause_dark</item>
+        <item name="attr/av_play">@drawable/av_play_dark</item>
+        <item name="attr/av_rewind">@drawable/av_rewind_dark</item>
+        <item name="attr/content_discard">@drawable/content_discard_dark</item>
+        <item name="attr/content_new">@drawable/content_new_dark</item>
+        <item name="attr/default_cover">@drawable/default_cover_dark</item>
+        <item name="attr/device_access_time">@drawable/device_access_time_dark</item>
+        <item name="attr/location_web_site">@drawable/location_web_site_dark</item>
+        <item name="attr/navigation_accept">@drawable/navigation_accept_dark</item>
+        <item name="attr/navigation_cancel">@drawable/navigation_cancel_dark</item>
+        <item name="attr/navigation_expand">@drawable/navigation_expand_dark</item>
+        <item name="attr/navigation_refresh">@drawable/navigation_refresh_dark</item>
+        <item name="attr/social_share">@drawable/social_share_dark</item>
+        <item name="attr/stat_playlist">@drawable/stat_playlist_dark</item>
+        <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>
+        <item name="attr/video_overlay_background">@color/video_overlay_dark</item>
+    </style>
+
+    <style name="AntennaPod.DarkTabPageIndicator" parent="Widget.TabPageIndicator">
+        <item name="android:textColor">#FFFFFF</item>
+    </style>
+
 </resources>

res/xml/preferences.xml

@@ -3,6 +3,7 @@
 
     <PreferenceCategory android:title="@string/user_interface_label">
         <CheckBoxPreference android:title="@string/pref_display_only_episodes_title" android:summary="@string/pref_display_only_episodes_sum" android:key="prefDisplayOnlyEpisodes"/>
+        <ListPreference android:entryValues="@array/theme_values" android:entries="@array/theme_options" android:title="@string/pref_set_theme_title" android:key="prefTheme" android:summary="@string/pref_set_theme_sum" android:defaultValue="0"/>
     </PreferenceCategory><PreferenceCategory android:title="@string/playback_pref" >
         <CheckBoxPreference
             android:defaultValue="true"

src/de/danoeh/antennapod/PodcastApp.java

@@ -11,6 +11,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import de.danoeh.antennapod.activity.OpmlImportActivity;
@@ -35,6 +36,7 @@ public class PodcastApp extends Application implements
 	public static final String PREF_AUTO_QUEUE = "prefAutoQueue";
 	public static final String PREF_DISPLAY_ONLY_EPISODES = "prefDisplayOnlyEpisodes";
 	public static final String PREF_AUTO_DELETE = "prefAutoDelete";
+	public static final String PREF_THEME = "prefTheme";
 
 	private static float LOGICAL_DENSITY;
 
@@ -43,6 +45,9 @@ public class PodcastApp extends Application implements
 	private boolean displayOnlyEpisodes;
 
 	private static long currentlyPlayingMediaId;
+	
+	/** Resource id of the currently selected theme. */
+	private static int theme;
 
 	public static PodcastApp getInstance() {
 		return singleton;
@@ -60,6 +65,7 @@ public class PodcastApp extends Application implements
 		currentlyPlayingMediaId = prefs.getLong(
 				PlaybackService.PREF_CURRENTLY_PLAYING_MEDIA,
 				PlaybackService.NO_MEDIA_PLAYING);
+		readThemeValue();
 		createImportDirectory();
 		createNoMediaFile();
 		prefs.registerOnSharedPreferenceChangeListener(this);
@@ -162,6 +168,8 @@ public class PodcastApp extends Application implements
 			if (id != currentlyPlayingMediaId) {
 				currentlyPlayingMediaId = id;
 			}
+		} else if (key.equals(PREF_THEME)) {
+			readThemeValue();
 		}
 	}
 
@@ -182,4 +190,22 @@ public class PodcastApp extends Application implements
 				|| (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE;
 
 	}
+	
+	public static int getThemeResourceId() {
+		return theme;
+	}
+	
+	/** Read value of prefTheme and determine the correct resource id. */
+	private void readThemeValue() {
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+		int prefTheme = Integer.parseInt(prefs.getString(PREF_THEME, "0"));
+		switch (prefTheme) {
+		case 0:
+			theme = R.style.Theme_AntennaPod_Light;
+			break;
+		case 1:
+			theme = R.style.Theme_AntennaPod_Dark;
+			break;
+		}
+	}
 }

src/de/danoeh/antennapod/activity/AboutActivity.java

@@ -15,6 +15,7 @@ public class AboutActivity extends SherlockActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		getSupportActionBar().hide();
 		setContentView(R.layout.about);		
 		webview = (WebView) findViewById(R.id.webvAbout);
 		webview.loadUrl("file:///android_asset/about.html");

src/de/danoeh/antennapod/activity/AddFeedActivity.java

@@ -18,6 +18,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
 import de.danoeh.antennapod.AppConfig;
+import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.storage.DownloadRequestException;
@@ -44,6 +45,7 @@ public class AddFeedActivity extends SherlockActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTheme(PodcastApp.getThemeResourceId());
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		StorageUtils.checkStorageAvailability(this);
 		setContentView(R.layout.addfeed);

src/de/danoeh/antennapod/activity/DownloadActivity.java

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.res.TypedArray;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -21,6 +22,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
 import de.danoeh.antennapod.AppConfig;
+import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DownloadlistAdapter;
 import de.danoeh.antennapod.asynctask.DownloadStatus;
@@ -51,6 +53,7 @@ public class DownloadActivity extends SherlockListActivity implements
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTheme(PodcastApp.getThemeResourceId());
 		if (AppConfig.DEBUG)
 			Log.d(TAG, "Creating Activity");
 		requester = DownloadRequester.getInstance();
@@ -185,7 +188,8 @@ public class DownloadActivity extends SherlockListActivity implements
 		switch (item.getItemId()) {
 		case android.R.id.home:
 			Intent intent = new Intent(this, MainActivity.class);
-			intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+			intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
+					| Intent.FLAG_ACTIVITY_NEW_TASK);
 			startActivity(intent);
 			break;
 		case MENU_SHOW_LOG:
@@ -201,9 +205,10 @@ public class DownloadActivity extends SherlockListActivity implements
 	@Override
 	public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 		if (!selectedDownload.isDone()) {
+			TypedArray drawables = obtainStyledAttributes(new int[] { R.attr.navigation_cancel });
 			menu.add(Menu.NONE, R.id.cancel_download_item, Menu.NONE,
 					R.string.cancel_download_label).setIcon(
-					R.drawable.navigation_cancel);
+					drawables.getDrawable(0));
 		}
 		return true;
 	}

src/de/danoeh/antennapod/activity/DownloadLogActivity.java

@@ -10,6 +10,7 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
+import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
 import de.danoeh.antennapod.feed.FeedManager;
 
@@ -26,6 +27,7 @@ public class DownloadLogActivity extends SherlockListActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTheme(PodcastApp.getThemeResourceId());
 		manager = FeedManager.getInstance();
 
 		dla = new DownloadLogAdapter(this, 0, manager.getDownloadLog());

src/de/danoeh/antennapod/activity/FeedInfoActivity.java

@@ -11,6 +11,7 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 import de.danoeh.antennapod.AppConfig;
+import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.asynctask.FeedImageLoader;
 import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
@@ -37,6 +38,7 @@ public class FeedInfoActivity extends SherlockActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTheme(PodcastApp.getThemeResourceId());
 		setContentView(R.layout.feedinfo);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		long feedId = getIntent().getLongExtra(EXTRA_FEED_ID, -1);

src/de/danoeh/antennapod/activity/FeedItemlistActivity.java

@@ -3,6 +3,7 @@ package de.danoeh.antennapod.activity;
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -14,6 +15,7 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 
+import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.asynctask.FeedRemover;
 import de.danoeh.antennapod.dialog.ConfirmationDialog;
@@ -41,6 +43,7 @@ public class FeedItemlistActivity extends SherlockFragmentActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTheme(PodcastApp.getThemeResourceId());
 		StorageUtils.checkStorageAvailability(this);
 		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
@@ -76,8 +79,9 @@ public class FeedItemlistActivity extends SherlockFragmentActivity {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
+		TypedArray drawables = obtainStyledAttributes(new int[] { R.attr.action_search });
 		menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label)
-				.setIcon(R.drawable.action_search)
+				.setIcon(drawables.getDrawable(0))
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		return FeedMenuHandler
 				.onCreateOptionsMenu(new MenuInflater(this), menu);
@@ -110,7 +114,8 @@ public class FeedItemlistActivity extends SherlockFragmentActivity {
 							R.string.feed_delete_confirmation_msg) {
 
 						@Override
-						public void onConfirmButtonPressed(DialogInterface dialog) {
+						public void onConfirmButtonPressed(
+								DialogInterface dialog) {
 							dialog.dismiss();
 							remover.executeAsync();
 						}
@@ -129,7 +134,8 @@ public class FeedItemlistActivity extends SherlockFragmentActivity {
 			}
 		} catch (DownloadRequestException e) {
 			e.printStackTrace();
-			DownloadRequestErrorDialogCreator.newRequestErrorDialog(this, e.getMessage());
+			DownloadRequestErrorDialogCreator.newRequestErrorDialog(this,
+					e.getMessage());
 		}
 		return true;
 	}

src/de/danoeh/antennapod/activity/FlattrAuthActivity.java

@@ -17,6 +17,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
 import de.danoeh.antennapod.AppConfig;
+import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.util.flattr.FlattrUtils;
 
@@ -36,6 +37,7 @@ public class FlattrAuthActivity extends SherlockActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTheme(PodcastApp.getThemeResourceId());
 		singleton = this;
 		authSuccessful = false;
 		if (AppConfig.DEBUG) Log.d(TAG, "Activity created");