Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move pref names to Preferences.java

Browse Source
This commit is contained in:
Daniel Martí 2013-12-31 21:35:37 +01:00
parent aaad028f3a
commit 1b83bf38ac
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/fdroid/fdroid/Preferences.java
View File

@ -26,7 +26,13 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
preferences.registerOnSharedPreferenceChangeListener(this);
}
private static final String PREF_COMPACT_LAYOUT = "compactlayout";
public static final String PREF_UPD_INTERVAL = "updateInterval";
public static final String PREF_UPD_WIFI_ONLY = "updateOnWifiOnly";
public static final String PREF_ROOTED = "rooted";
public static final String PREF_INCOMP_VER = "incompatibleVersions";
public static final String PREF_THEME = "theme";
public static final String PREF_COMPACT_LAYOUT = "compactlayout";
private static final boolean DEFAULT_COMPACT_LAYOUT = false;
private boolean compactLayout = DEFAULT_COMPACT_LAYOUT;

23
src/org/fdroid/fdroid/PreferencesActivity.java
View File

@ -28,6 +28,7 @@ import android.view.MenuItem;
import android.support.v4.app.NavUtils;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.compat.ActionBarCompat;
public class PreferencesActivity extends PreferenceActivity implements
@ -38,12 +39,6 @@ public class PreferencesActivity extends PreferenceActivity implements
public static final int RESULT_RESTART = 4;
private int result = 0;
public static final String KEY_UP_INT = "updateInterval";
public static final String KEY_UP_WI_O = "updateOnWifiOnly";
public static final String KEY_ROOTED = "rooted";
public static final String KEY_INC_VER = "incompatibleVersions";
public static final String KEY_THEME = "theme";
@Override
protected void onCreate(Bundle savedInstanceState) {
((FDroidApp) getApplication()).applyTheme(this);
@ -59,9 +54,9 @@ public class PreferencesActivity extends PreferenceActivity implements
.registerOnSharedPreferenceChangeListener(
(OnSharedPreferenceChangeListener)this);
CheckBoxPreference onlyOnWifi = (CheckBoxPreference)
findPreference(KEY_UP_WI_O);
onlyOnWifi.setEnabled(Integer.parseInt(
((ListPreference)findPreference(KEY_UP_INT))
findPreference(Preferences.PREF_UPD_WIFI_ONLY);
onlyOnWifi.setEnabled(Integer.parseInt(((ListPreference)
findPreference(Preferences.PREF_UPD_INTERVAL))
.getValue()) > 0);
}
@ -85,27 +80,27 @@ public class PreferencesActivity extends PreferenceActivity implements
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (key.equals(KEY_UP_INT)) {
if (key.equals(Preferences.PREF_UPD_INTERVAL)) {
int interval = Integer.parseInt(
sharedPreferences.getString(key, "").toString());
CheckBoxPreference onlyOnWifi = (CheckBoxPreference)
findPreference(KEY_UP_WI_O);
findPreference(Preferences.PREF_UPD_WIFI_ONLY);
onlyOnWifi.setEnabled(interval > 0);
return;
}
if (key.equals(KEY_INC_VER)) {
if (key.equals(Preferences.PREF_INCOMP_VER)) {
result ^= RESULT_RELOAD;
setResult(result);
return;
}
if (key.equals(KEY_ROOTED)) {
if (key.equals(Preferences.PREF_ROOTED)) {
result ^= RESULT_REFILTER;
setResult(result);
return;
}
if (key.equals(KEY_THEME)) {
if (key.equals(Preferences.PREF_THEME)) {
result |= RESULT_RESTART;
setResult(result);
return;