Close #41 Add dynamic number of servers

2 files changed, 7 insertions, 96 deletions

diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index e494aef0..61fca626 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -175,9 +175,10 @@
 

     <string name="settings.title">DSub settings</string>

     <string name="settings.test_connection_title">Test connection</string>

+	<string name="settings.servers_add">Add Server</string>

+	<string name="settings.servers_remove">Remove Server</string>

     <string name="settings.servers_title">Servers</string>

-    <string name="settings.server_unused1">Unused 1</string>

-    <string name="settings.server_unused2">Unused 2</string>

+    <string name="settings.server_unused">Unused</string>

     <string name="settings.server_name">Name</string>

     <string name="settings.server_address">Server address</string>

     <string name="settings.server_username">Username</string>

diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index 89ec5699..efa4a7da 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -4,102 +4,12 @@
                   android:title="@string/settings.title">
 
     <PreferenceCategory
+			android:key="server"
             android:title="@string/settings.servers_title">
 
-        <PreferenceScreen
-                android:key="server1">
-
-            <EditTextPreference
-                    android:key="serverName1"
-                    android:title="@string/settings.server_name"
-                    android:defaultValue="Subsonic demo"/>
-
-            <EditTextPreference
-                    android:key="serverUrl1"
-                    android:title="@string/settings.server_address"
-                    android:defaultValue="http://demo.subsonic.org"
-                    android:inputType="textUri"/>
-
-            <EditTextPreference
-                    android:key="username1"
-                    android:title="@string/settings.server_username"
-                    android:defaultValue="android-guest"/>
-
-            <EditTextPreference
-                    android:key="password1"
-                    android:title="@string/settings.server_password"
-                    android:password="true"
-                    android:defaultValue="guest"
-                    android:summary="****"/>
-
-            <Preference
-                    android:key="testConnection1"
-                    android:title="@string/settings.test_connection_title"
-                    android:persistent="false"/>
-
-        </PreferenceScreen>
-
-        <PreferenceScreen
-                android:key="server2">
-
-            <EditTextPreference
-                    android:key="serverName2"
-                    android:title="@string/settings.server_name"
-                    android:defaultValue="@string/settings.server_unused1"/>
-
-            <EditTextPreference
-                    android:key="serverUrl2"
-                    android:title="@string/settings.server_address"
-                    android:defaultValue="http://yourhost"
-                    android:inputType="textUri"/>
-
-            <EditTextPreference
-                    android:key="username2"
-                    android:title="@string/settings.server_username"/>
-
-            <EditTextPreference
-                    android:key="password2"
-                    android:title="@string/settings.server_password"
-                    android:password="true"
-                    android:summary="****"/>
-
-            <Preference
-                    android:key="testConnection2"
-                    android:title="@string/settings.test_connection_title"
-                    android:persistent="false"/>
-
-        </PreferenceScreen>
-
-        <PreferenceScreen
-                android:key="server3">
-
-            <EditTextPreference
-                    android:key="serverName3"
-                    android:title="@string/settings.server_name"
-                    android:defaultValue="@string/settings.server_unused2"/>
-
-            <EditTextPreference
-                    android:key="serverUrl3"
-                    android:title="@string/settings.server_address"
-                    android:defaultValue="http://yourhost"
-                    android:inputType="textUri"/>
-
-            <EditTextPreference
-                    android:key="username3"
-                    android:title="@string/settings.server_username"/>
-
-            <EditTextPreference
-                    android:key="password3"
-                    android:title="@string/settings.server_password"
-                    android:password="true"
-                    android:summary="****"/>
-
-            <Preference
-                    android:key="testConnection3"
-                    android:title="@string/settings.test_connection_title"
-                    android:persistent="false"/>
-
-        </PreferenceScreen>
+		<Preference
+                android:key="serverAdd"
+                android:title="@string/settings.servers_add"/>
 
     </PreferenceCategory>