Replace fully qualified names with imports

This commit is contained in:
veyndan 2017-03-01 15:34:14 +00:00
parent 9a6dd2e97e
commit fe42731ee6
13 changed files with 43 additions and 36 deletions

View file

@ -13,7 +13,7 @@ import android.view.View;
import android.view.ViewGroup;
public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
fr.free.nrw.commons.CommonsApplication app;
CommonsApplication app;
private AppCompatDelegate mDelegate;
@ -23,7 +23,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
getDelegate().onCreate(savedInstanceState);
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences);
ListPreference licensePreference = (ListPreference) findPreference(fr.free.nrw.commons.Prefs.DEFAULT_LICENSE);
ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE);
// WARNING: ORDERING NEEDS TO MATCH FOR THE LICENSE NAMES AND DISPLAY VALUES
licensePreference.setEntries(new String[]{
getString(R.string.license_name_cc0),
@ -31,21 +31,21 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
getString(R.string.license_name_cc_by_sa)
});
licensePreference.setEntryValues(new String[]{
fr.free.nrw.commons.Prefs.Licenses.CC0,
fr.free.nrw.commons.Prefs.Licenses.CC_BY,
fr.free.nrw.commons.Prefs.Licenses.CC_BY_SA
Prefs.Licenses.CC0,
Prefs.Licenses.CC_BY,
Prefs.Licenses.CC_BY_SA
});
licensePreference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor(licensePreference.getValue())));
licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue())));
licensePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
preference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor((String)newValue)));
preference.setSummary(getString(Utils.licenseNameFor((String)newValue)));
return true;
}
});
app = (fr.free.nrw.commons.CommonsApplication)getApplicationContext();
app = (CommonsApplication)getApplicationContext();
}
@Override