aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-09-09 14:54:11 -0700
committerScott Jackson <daneren2005@gmail.com>2012-09-09 14:54:11 -0700
commit89ebb04737aeefefd5081c4157de90c735eab80c (patch)
tree29605d47e5c8f7ae215cb6ee580741f6550a234a /subsonic-android
parentb644ac5aa4278cfeaa337cbede7c3b240ff40da3 (diff)
downloaddsub-89ebb04737aeefefd5081c4157de90c735eab80c.tar.gz
dsub-89ebb04737aeefefd5081c4157de90c735eab80c.tar.bz2
dsub-89ebb04737aeefefd5081c4157de90c735eab80c.zip
Removed Wheat theme + re-added back dynamic themeing to activities
Diffstat (limited to 'subsonic-android')
-rw-r--r--subsonic-android/AndroidManifest.xml2
-rw-r--r--subsonic-android/res/values/arrays.xml1
-rw-r--r--subsonic-android/res/values/colors.xml4
-rw-r--r--subsonic-android/res/values/styles.xml14
-rw-r--r--subsonic-android/res/xml/settings.xml2
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java11
6 files changed, 11 insertions, 23 deletions
diff --git a/subsonic-android/AndroidManifest.xml b/subsonic-android/AndroidManifest.xml
index 04136ffc..ac786d26 100644
--- a/subsonic-android/AndroidManifest.xml
+++ b/subsonic-android/AndroidManifest.xml
@@ -18,7 +18,7 @@
<supports-screens android:anyDensity="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
- <application android:label="@string/common.appname" android:icon="@drawable/launch2" android:theme="@style/Theme.Sherlock.Light">
+ <application android:label="@string/common.appname" android:icon="@drawable/launch2" android:theme="@style/Theme.DSub.Light">
<activity android:name="github.daneren2005.dsub.activity.MainActivity"
android:label="DSub"
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 17ea4b6a..e70b566f 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -8,7 +8,6 @@
</string-array>
<string-array name="themeNames">
- <item>@string/settings.theme_wheat</item>
<item>@string/settings.theme_light</item>
<item>@string/settings.theme_dark</item>
</string-array>
diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml
index 69ab22a1..7a86d370 100644
--- a/subsonic-android/res/values/colors.xml
+++ b/subsonic-android/res/values/colors.xml
@@ -6,10 +6,6 @@
<color name="appwidget_text">#FFFFFF</color>
<color name="notificationArtist">#434343</color>
<color name="notificationTitle">#000000</color>
-
- <color name="wheatBackground">#F1F0E6</color>
- <color name="wheatForeground1">#494B26</color>
- <color name="wheatForeground2">#830009</color>
<color name="ics_opaque">#8033b5e5</color>
<color name="cyan">#ff0099cc</color>
diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml
index a970fe1b..9760bb0c 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="Wheat" parent="android:Theme.Light">
- <item name="android:windowBackground">@color/wheatBackground</item>
- <item name="android:textColorPrimary">@color/wheatForeground1</item>
- <item name="android:textColorSecondary">@color/wheatForeground2</item>
- <item name="android:listViewStyle">@style/WheatListView</item>
- </style>
-
- <style name="WheatListView" parent="android:style/Widget.ListView.White">
- <item name="android:cacheColorHint">@color/wheatBackground</item>
- </style>
-
+ <style name="Theme.DSub.Wheat" parent="Theme.Sherlock.Light"></style>
+ <style name="Theme.DSub.Light" parent="Theme.Sherlock.Light"></style>
+ <style name="Theme.DSub.Dark" parent="Theme.Sherlock"></style>
</resources>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index daa98b90..455a9dc0 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -109,7 +109,7 @@
<ListPreference
android:title="@string/settings.theme_title"
android:key="theme"
- android:defaultValue="wheat"
+ android:defaultValue="light"
android:entryValues="@array/themeValues"
android:entries="@array/themeNames"/>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index 7d303a8d..03fcf357 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -67,9 +67,8 @@ public class SubsonicTabActivity extends SherlockActivity {
@Override
protected void onCreate(Bundle bundle) {
setUncaughtExceptionHandler();
- // applyTheme();
+ applyTheme();
super.onCreate(bundle);
- // requestWindowFeature(Window.FEATURE_NO_TITLE);
startService(new Intent(this, DownloadServiceImpl.class));
setVolumeControlStream(AudioManager.STREAM_MUSIC);
}
@@ -169,10 +168,12 @@ public class SubsonicTabActivity extends SherlockActivity {
private void applyTheme() {
String theme = Util.getTheme(this);
if ("dark".equals(theme)) {
- setTheme(android.R.style.Theme);
+ setTheme(R.style.Theme_DSub_Dark);
} else if ("light".equals(theme)) {
- setTheme(android.R.style.Theme_Light);
- }
+ setTheme(R.style.Theme_DSub_Light);
+ } else {
+ setTheme(R.style.Theme_DSub_Light);
+ }
}
public boolean isDestroyed() {