ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use generic spinner builder, Remove TV default

This commit is contained in:
Ender's Games 2018-10-01 21:35:50 -04:00
parent b0d26f1117
commit b29b9fb6bb
2 changed files with 41 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
View File

@ -311,44 +311,11 @@ public class OptionsFragment extends Fragment {
unstable_opt.setChecked(mPrefs.getBoolean(Emulator.pref_unstable, Emulator.unstableopt));
unstable_opt.setOnCheckedChangeListener(unstable_option);
String[] cables = getResources().getStringArray(R.array.cable);
Spinner cable_spnr = (Spinner) getView().findViewById(R.id.cable_spinner);
ArrayAdapter<String> cableAdapter = new ArrayAdapter<>(
getActivity(), R.layout.spinner_selected, cables);
cableAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
cable_spnr.setAdapter(cableAdapter);
setSpinner(R.array.cable, R.id.cable_spinner,
Emulator.pref_cable, Emulator.cable, false);
cable_spnr.setSelection(mPrefs.getInt(Emulator.pref_cable, Emulator.cable), true);
cable_spnr.setOnItemSelectedListener(new OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
mPrefs.edit().putInt(Emulator.pref_cable, pos == 0 ? 3 : pos).apply();
}
public void onNothingSelected(AdapterView<?> arg0) {
}
});
String[] regions = getResources().getStringArray(R.array.region);
Spinner region_spnr = (Spinner) getView().findViewById(R.id.region_spinner);
ArrayAdapter<String> regionAdapter = new ArrayAdapter<>(
getActivity(), R.layout.spinner_selected, regions);
regionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
region_spnr.setAdapter(regionAdapter);
region_spnr.setSelection(mPrefs.getInt(Emulator.pref_dcregion, Emulator.dcregion), true);
region_spnr.setOnItemSelectedListener(new OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
mPrefs.edit().putInt(Emulator.pref_dcregion, pos).apply();
}
public void onNothingSelected(AdapterView<?> arg0) {
}
});
setSpinner(R.array.region, R.id.region_spinner,
Emulator.pref_dcregion, Emulator.dcregion, false);
String[] broadcasts = getResources().getStringArray(R.array.broadcast);
Spinner broadcast_spnr = (Spinner) getView().findViewById(R.id.broadcast_spinner);
@ -541,28 +508,9 @@ public class OptionsFragment extends Fragment {
sound_opt.setChecked(sound);
sound_opt.setOnCheckedChangeListener(emu_sound);
String[] depths = getResources().getStringArray(R.array.depth);
Spinner depth_spnr = (Spinner) getView().findViewById(R.id.depth_spinner);
ArrayAdapter<String> depthAdapter = new ArrayAdapter<>(
getActivity(), R.layout.spinner_selected, depths);
depthAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
depth_spnr.setAdapter(depthAdapter);
String depth = String.valueOf(mPrefs.getInt(Config.pref_renderdepth, 24));
depth_spnr.setSelection(depthAdapter.getPosition(depth), true);
depth_spnr.setOnItemSelectedListener(new OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
int render = Integer.parseInt(parent.getItemAtPosition(pos).toString());
mPrefs.edit().putInt(Config.pref_renderdepth, render).apply();
}
public void onNothingSelected(AdapterView<?> arg0) {
}
});
setSpinner(R.array.depth, R.id.depth_spinner,
Config.pref_renderdepth, 24, true);
Button resetEmu = (Button) getView().findViewById(R.id.reset_emu_btn);
resetEmu.setOnClickListener(new View.OnClickListener() {
@ -582,6 +530,40 @@ public class OptionsFragment extends Fragment {
});
}
private void setSpinner(int array, int view, final String pref, int def, final boolean parse) {
String[] stringArray = getResources().getStringArray(array);
Spinner spinner = (Spinner) getView().findViewById(view);
ArrayAdapter<String> adapter = new ArrayAdapter<>(
getActivity(), R.layout.spinner_selected, stringArray);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(adapter);
if (parse) {
String value = String.valueOf(mPrefs.getInt(pref, def));
spinner.setSelection(adapter.getPosition(value), true);
} else {
spinner.setSelection(mPrefs.getInt(pref, def), true);
}
spinner.setOnItemSelectedListener(new OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
if (parse) {
int value = Integer.parseInt(parent.getItemAtPosition(pos).toString());
mPrefs.edit().putInt(pref, value).apply();
} else {
mPrefs.edit().putInt(pref, pos).apply();
}
}
public void onNothingSelected(AdapterView<?> arg0) {
}
});
}
private static class LocateThemes extends AsyncTask<String, Integer, List<File>> {
private WeakReference<OptionsFragment> options;

3
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/PGConfigFragment.java
View File

@ -123,8 +123,7 @@ public class PGConfigFragment extends Fragment {
.putBoolean(Emulator.pref_syncedrender, synced_render.isChecked())
.putBoolean(Emulator.pref_modvols, modifier_volumes.isChecked()).apply();
int cablePosition = cable_spnr.getSelectedItemPosition();
mPrefs.edit().putInt(Emulator.pref_cable, cablePosition == 0 ? 3 : cablePosition).apply();
mPrefs.edit().putInt(Emulator.pref_cable, cable_spnr.getSelectedItemPosition()).apply();
mPrefs.edit().putInt(Emulator.pref_dcregion, region_spnr.getSelectedItemPosition()).apply();
String item = broadcastAdapter.getItem(broadcast_spnr.getSelectedItemPosition());
int broadcastValue = getBroadcastValue(item);