Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add reset button to slider setting

Browse Source
This commit is contained in:
Weiyi Wang 2019-08-03 08:56:01 -04:00 committed by xperia64
parent 41ab284a42
commit 6363fe7581
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/java/org/citra/citra_android/model/settings/view/SliderSetting.java
View File

@ -24,6 +24,10 @@ public final class SliderSetting extends SettingsItem {
return mMax; return mMax;
} }
public int getDefaultValue() {
return mDefaultValue;
}
public int getSelectedValue() { public int getSelectedValue() {
Setting setting = getSetting(); Setting setting = getSetting();

8
src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
View File

@ -219,10 +219,16 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
LayoutInflater inflater = LayoutInflater.from(mView.getActivity()); LayoutInflater inflater = LayoutInflater.from(mView.getActivity());
View view = inflater.inflate(R.layout.dialog_seekbar, null); View view = inflater.inflate(R.layout.dialog_seekbar, null);
SeekBar seekbar = view.findViewById(R.id.seekbar);
builder.setTitle(item.getNameId()); builder.setTitle(item.getNameId());
builder.setView(view); builder.setView(view);
builder.setPositiveButton(R.string.ok, this); builder.setPositiveButton(R.string.ok, this);
builder.setNegativeButton(R.string.cancel, defaultCancelListener); builder.setNegativeButton(R.string.cancel, defaultCancelListener);
builder.setNeutralButton(R.string.slider_default, (DialogInterface dialog, int which) -> {
seekbar.setProgress(item.getDefaultValue());
onClick(dialog, which);
});
mDialog = builder.show(); mDialog = builder.show();
mTextSliderValue = view.findViewById(R.id.text_value); mTextSliderValue = view.findViewById(R.id.text_value);
@ -231,8 +237,6 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
TextView units = view.findViewById(R.id.text_units); TextView units = view.findViewById(R.id.text_units);
units.setText(item.getUnits()); units.setText(item.getUnits());
SeekBar seekbar = view.findViewById(R.id.seekbar);
seekbar.setMax(item.getMax()); seekbar.setMax(item.getMax());
seekbar.setProgress(mSeekbarProgress); seekbar.setProgress(mSeekbarProgress);

1
src/android/app/src/main/res/values/strings.xml
View File

@ -82,6 +82,7 @@
<string name="clear">Clear</string> <string name="clear">Clear</string>
<string name="disabled">Disabled</string> <string name="disabled">Disabled</string>
<string name="other">Other</string> <string name="other">Other</string>
<string name="slider_default">Default</string>
<!-- Game Grid Screen--> <!-- Game Grid Screen-->
<string name="grid_menu_core_settings">CPU Settings</string> <string name="grid_menu_core_settings">CPU Settings</string>