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

fix time picker not saving/loading time

Browse Source
This commit is contained in:
Weiyi Wang 2019-07-28 21:23:11 -04:00 committed by bunnei
parent 92676e7724
commit fc89b0f8c0
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/android/app/src/main/java/org/citra/citra_android/model/settings/view/DateTimeSetting.java
View File

@ -22,9 +22,15 @@ public final class DateTimeSetting extends SettingsItem {
} }
public StringSetting setSelectedValue(String datetime) { public StringSetting setSelectedValue(String datetime) {
StringSetting setting = new StringSetting(getKey(), getSection(), getFile(), datetime); if (getSetting() == null) {
setSetting(setting); StringSetting setting = new StringSetting(getKey(), getSection(), getFile(), datetime);
return setting; setSetting(setting);
return setting;
} else {
StringSetting setting = (StringSetting) getSetting();
setting.setValue(datetime);
return null;
}
} }
@Override @Override

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

@ -175,8 +175,8 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
dp.updateDate(Integer.parseInt(settingValue.substring(0, 4)), Integer.parseInt(settingValue.substring(5, 7)) - 1, Integer.parseInt(settingValue.substring(8, 10))); dp.updateDate(Integer.parseInt(settingValue.substring(0, 4)), Integer.parseInt(settingValue.substring(5, 7)) - 1, Integer.parseInt(settingValue.substring(8, 10)));
tp.setIs24HourView(true); tp.setIs24HourView(true);
tp.setCurrentHour(Integer.parseInt(settingValue.substring(11, 12))); tp.setCurrentHour(Integer.parseInt(settingValue.substring(11, 13)));
tp.setCurrentMinute(Integer.parseInt(settingValue.substring(14, 15))); tp.setCurrentMinute(Integer.parseInt(settingValue.substring(14, 16)));
DialogInterface.OnClickListener ok = new DialogInterface.OnClickListener() { DialogInterface.OnClickListener ok = new DialogInterface.OnClickListener() {
@Override @Override
@ -188,13 +188,18 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
} }
String month = ("00" + (dp.getMonth() + 1)).substring(String.valueOf(dp.getMonth() + 1).length()); String month = ("00" + (dp.getMonth() + 1)).substring(String.valueOf(dp.getMonth() + 1).length());
String day = ("00" + dp.getDayOfMonth()).substring(String.valueOf(dp.getDayOfMonth()).length()); String day = ("00" + dp.getDayOfMonth()).substring(String.valueOf(dp.getDayOfMonth()).length());
String hr = ("00" + tp.getHour()).substring(String.valueOf(tp.getHour()).length()); String hr = ("00" + tp.getCurrentHour()).substring(String.valueOf(tp.getCurrentHour()).length());
String min = ("00" + tp.getMinute()).substring(String.valueOf(tp.getMinute()).length()); String min = ("00" + tp.getCurrentMinute()).substring(String.valueOf(tp.getCurrentMinute()).length());
String datetime = year + "-" + month + "-" + day + " " + hr + ":" + min + ":01"; String datetime = year + "-" + month + "-" + day + " " + hr + ":" + min + ":01";
mView.putSetting(new StringSetting(item.getKey(), item.getSection(), item.getFile(), datetime));
StringSetting setting = item.setSelectedValue(datetime);
if (setting != null) {
mView.putSetting(setting);
}
mView.onSettingChanged(); mView.onSettingChanged();
mClickedItem = null; mClickedItem = null;
mSeekbarProgress = -1;
closeDialog(); closeDialog();
} }
}; };