diff options
-rw-r--r-- | AndroidManifest.xml | 17 | ||||
-rw-r--r-- | res/values-port/styles.xml | 6 | ||||
-rw-r--r-- | res/values/attrs.xml | 27 | ||||
-rw-r--r-- | res/values/styles.xml | 66 | ||||
-rw-r--r-- | src/de/danoeh/antennapod/activity/AboutActivity.java | 1 |
5 files changed, 90 insertions, 27 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9fd4c7404..2ed5857c2 100644 --- a/AndroidManifest.xml +++ b/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> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml deleted file mode 100644 index 268acde11..000000000 --- a/res/values-port/styles.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <style name="Theme.MediaPlayer" parent="@style/StyledIndicators"></style> - -</resources>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml new file mode 100644 index 000000000..eb87bc03a --- /dev/null +++ b/res/values/attrs.xml @@ -0,0 +1,27 @@ +<?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" /> + +</resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 88db1f5cd..a7784577d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,18 +1,64 @@ <?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 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> </style> - <style name="StyledIndicators" parent="PodTheme"> - <item name="vpiTabPageIndicatorStyle">@style/Widget.TabPageIndicator</item> - <item name="android:textColor">@color/black</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> + </style> - <style name="VideoplayerTheme" parent="@style/Theme.Sherlock.Light.ForceOverflow"> - <item name="android:windowActionBarOverlay">true</item> + <style name="AntennaPod.DarkTabPageIndicator" parent="Widget.TabPageIndicator"> + <item name="android:textColor">#FFFFFF</item> </style> - + </resources>
\ No newline at end of file diff --git a/src/de/danoeh/antennapod/activity/AboutActivity.java b/src/de/danoeh/antennapod/activity/AboutActivity.java index 625ef6c99..54240c5c7 100644 --- a/src/de/danoeh/antennapod/activity/AboutActivity.java +++ b/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"); |