third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-29 07:01:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Switch to default shared preferences

Browse Source
This commit is contained in:
Joshua Bahnsen 2013-05-04 18:57:38 -07:00
parent 4d33b0246f
commit d2452c3212
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/settings.xml
View File

@ -3,12 +3,6 @@
a:title="@string/common.appname" > a:title="@string/common.appname" >
<PreferenceCategory a:key="serversKey" a:title="@string/settings.servers_title" > <PreferenceCategory a:key="serversKey" a:title="@string/settings.servers_title" >
<EditTextPreference
a:defaultValue="3"
a:enabled="false"
a:shouldDisableView="true"
a:key="serverNum"
a:title="@string/settings.server_number" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory a:title="@string/settings.appearance_title" > <PreferenceCategory a:title="@string/settings.appearance_title" >
<ListPreference <ListPreference

24
src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java
View File

@ -27,6 +27,7 @@ import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.SearchRecentSuggestions; import android.provider.SearchRecentSuggestions;
import android.text.InputType; import android.text.InputType;
@ -91,8 +92,8 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
View playlistsMenuItem = null; View playlistsMenuItem = null;
View menuMain = null; View menuMain = null;
PreferenceCategory serversCategory; PreferenceCategory serversCategory;
EditTextPreference serverNumPreference;
Preference addServerPreference; Preference addServerPreference;
SharedPreferences settings;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -158,9 +159,8 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
} }
}); });
serverNumPreference = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_SERVER_NUMBER); settings = PreferenceManager.getDefaultSharedPreferences(this );
serverNumPreference.setSummary(serverNumPreference.getText()); activeServers = settings.getInt(Constants.PREFERENCES_KEY_ACTIVE_SERVERS, 3);
activeServers = Integer.parseInt(serverNumPreference.getText());
serversCategory = (PreferenceCategory) findPreference(Constants.PREFERENCES_KEY_SERVERS_KEY); serversCategory = (PreferenceCategory) findPreference(Constants.PREFERENCES_KEY_SERVERS_KEY);
@ -197,15 +197,17 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
} }
activeServers++; activeServers++;
String instance = String.valueOf(activeServers);
serverNumPreference.setText(instance); SharedPreferences.Editor prefEditor = settings.edit();
serverNumPreference.setSummary(instance); prefEditor.putInt(Constants.PREFERENCES_KEY_ACTIVE_SERVERS, activeServers);
prefEditor.commit();
Preference addServerPreference = findPreference(Constants.PREFERENCES_KEY_ADD_SERVER); Preference addServerPreference = findPreference(Constants.PREFERENCES_KEY_ADD_SERVER);
serversCategory.removePreference(addServerPreference); serversCategory.removePreference(addServerPreference);
serversCategory.addPreference(addServer(activeServers)); serversCategory.addPreference(addServer(activeServers));
serversCategory.addPreference(addServerPreference); serversCategory.addPreference(addServerPreference);
String instance = String.valueOf(activeServers);
serverSettings.put(instance, new ServerSettings(instance)); serverSettings.put(instance, new ServerSettings(instance));
addServerPreference.setEnabled(activeServers < maxServerCount); addServerPreference.setEnabled(activeServers < maxServerCount);
@ -290,9 +292,11 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
activeServers--; activeServers--;
serversCategory.removePreference(screen); serversCategory.removePreference(screen);
String instance = String.valueOf(activeServers);
serverNumPreference.setText(instance); SharedPreferences.Editor prefEditor = settings.edit();
serverNumPreference.setSummary(instance); prefEditor.putInt(Constants.PREFERENCES_KEY_ACTIVE_SERVERS, activeServers);
prefEditor.commit();
addServerPreference.setEnabled(activeServers < maxServerCount); addServerPreference.setEnabled(activeServers < maxServerCount);
screen.getDialog().dismiss(); screen.getDialog().dismiss();

2
src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java
View File

@ -64,10 +64,10 @@ public final class Constants {
public static final String PREFERENCES_KEY_SERVER_INSTANCE = "serverInstanceId"; public static final String PREFERENCES_KEY_SERVER_INSTANCE = "serverInstanceId";
public static final String PREFERENCES_KEY_SERVER_NAME = "serverName"; public static final String PREFERENCES_KEY_SERVER_NAME = "serverName";
public static final String PREFERENCES_KEY_SERVER_URL = "serverUrl"; public static final String PREFERENCES_KEY_SERVER_URL = "serverUrl";
public static final String PREFERENCES_KEY_SERVER_NUMBER = "serverNum";
public static final String PREFERENCES_KEY_SERVERS_KEY = "serversKey"; public static final String PREFERENCES_KEY_SERVERS_KEY = "serversKey";
public static final String PREFERENCES_KEY_ADD_SERVER = "addServer"; public static final String PREFERENCES_KEY_ADD_SERVER = "addServer";
public static final String PREFERENCES_KEY_REMOVE_SERVER = "removeServer"; public static final String PREFERENCES_KEY_REMOVE_SERVER = "removeServer";
public static final String PREFERENCES_KEY_ACTIVE_SERVERS = "activeServers";
public static final String PREFERENCES_KEY_MUSIC_FOLDER_ID = "musicFolderId"; public static final String PREFERENCES_KEY_MUSIC_FOLDER_ID = "musicFolderId";
public static final String PREFERENCES_KEY_USERNAME = "username"; public static final String PREFERENCES_KEY_USERNAME = "username";
public static final String PREFERENCES_KEY_PASSWORD = "password"; public static final String PREFERENCES_KEY_PASSWORD = "password";

6
src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
View File

@ -39,6 +39,7 @@ import android.net.NetworkInfo;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.Parcelable; import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
@ -184,9 +185,8 @@ public class Util extends DownloadActivity {
} }
public static int getActiveServers(Context context) { public static int getActiveServers(Context context) {
SharedPreferences prefs = getPreferences(context); SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
String value = prefs.getString(Constants.PREFERENCES_KEY_SERVER_NUMBER, "3"); return settings.getInt(Constants.PREFERENCES_KEY_ACTIVE_SERVERS, 3);
return Integer.parseInt(value);
} }
public static String getServerName(Context context, int instance) { public static String getServerName(Context context, int instance) {