Revert black modifications, add new separate black theme

5 files changed, 20 insertions, 1 deletions

diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 75ad2bea..80cc4fad 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -4,18 +4,22 @@
     <string-array name="themeValues">
         <item>light</item>
         <item>dark</item>
+		<item>black</item>
 		<item>holo</item>
 		<item>light_fullscreen</item>
 		<item>dark_fullscreen</item>
+		<item>black_fullscreen</item>
 		<item>holo_fullscreen</item>
     </string-array>
 
     <string-array name="themeNames">
         <item>@string/settings.theme_light</item>
         <item>@string/settings.theme_dark</item>
+		<item>@string/settings.theme_black</item>
 		<item>@string/settings.theme_holo</item>
 		<item>@string/settings.theme_light_fullscreen</item>
         <item>@string/settings.theme_dark_fullscreen</item>
+		<item>@string/settings.theme_black_fullscreen</item>
 		<item>@string/settings.theme_holo_fullscreen</item>
     </string-array>
 	
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index b61895dc..9ad821a6 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -201,9 +201,11 @@
     <string name="settings.theme_title">Theme</string>

     <string name="settings.theme_light">Light</string>

     <string name="settings.theme_dark">Dark</string>

+	<string name="settings.theme_black">Black</string>

 	<string name="settings.theme_holo">Holo</string>

 	<string name="settings.theme_light_fullscreen">Light Fullscreen</string>

     <string name="settings.theme_dark_fullscreen">Dark Fullscreen</string>

+	<string name="settings.theme_black_fullscreen">Black Fullscreen</string>

 	<string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>

     <string name="settings.network_title">Network</string>

     <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>

diff --git a/subsonic-android/res/values/themes.xml b/subsonic-android/res/values/themes.xml
index e48c3edc..33dd2de7 100644
--- a/subsonic-android/res/values/themes.xml
+++ b/subsonic-android/res/values/themes.xml
@@ -17,7 +17,6 @@
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:textColorSecondary">@color/cyan</item>
-		<item name="android:windowBackground">@android:color/black</item>
 		<item name="offline_icon">@drawable/main_offline</item>
 		<item name="media_button_backward">@drawable/media_backward</item>
 		<item name="media_button_forward">@drawable/media_forward</item>
@@ -28,6 +27,9 @@
 		<item name="chat">@drawable/ic_menu_chat_dark</item> 
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item> 
 	</style>
+	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
+		<item name="android:windowBackground">@android:color/black</item>
+	</style>
 	<style name="Theme.DSub.Holo" parent="Theme.Sherlock">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
@@ -50,6 +52,9 @@
 	<style name="Theme.DSub.Dark.Fullscreen" parent="Theme.DSub.Dark">
 		<item name="android:windowFullscreen">true</item>
 	</style>
+	<style name="Theme.DSub.Black.Fullscreen" parent="Theme.DSub.Black">
+		<item name="android:windowFullscreen">true</item>
+	</style>
 	<style name="Theme.DSub.Holo.Fullscreen" parent="Theme.DSub.Holo">
 		<item name="android:windowFullscreen">true</item>
 	</style>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 4fdf8431..88e487f1 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -306,10 +306,14 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		String activeTheme = Util.getTheme(this);
 		if ("dark".equals(activeTheme)) {
 			setTheme(R.style.Theme_DSub_Dark);
+		} else if ("black".equals(activeTheme)) {
+			setTheme(R.style.Theme_DSub_Black);
 		} else if ("light".equals(activeTheme)) {
 			setTheme(R.style.Theme_DSub_Light);
 		} else if ("dark_fullscreen".equals(activeTheme)) {
 			setTheme(R.style.Theme_DSub_Dark_Fullscreen);
+		} else if ("black_fullscreen".equals(activeTheme)) {
+			setTheme(R.style.Theme_DSub_Black_Fullscreen);
 		} else if ("light_fullscreen".equals(activeTheme)) {
 			setTheme(R.style.Theme_DSub_Light_Fullscreen);
 		} else if("holo".equals(activeTheme)) {
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index cb4cac6f..0c8d130a 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -277,10 +277,14 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		theme = Util.getTheme(this);

 		if ("dark".equals(theme)) {

 			setTheme(R.style.Theme_DSub_Dark);

+		} else if ("black".equals(theme)) {

+			setTheme(R.style.Theme_DSub_Black);

 		} else if ("light".equals(theme)) {

 			setTheme(R.style.Theme_DSub_Light);

 		} else if ("dark_fullscreen".equals(theme)) {

 			setTheme(R.style.Theme_DSub_Dark_Fullscreen);

+		} else if ("black_fullscreen".equals(theme)) {

+			setTheme(R.style.Theme_DSub_Black_Fullscreen);

 		} else if ("light_fullscreen".equals(theme)) {

 			setTheme(R.style.Theme_DSub_Light_Fullscreen);

 		} else if("holo".equals(theme)) {