Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #5937

Browse source
This commit is contained in:
Chumva 2019-06-25 14:23:25 +03:00
parent ee7882fa96
commit 20ce84d428
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/osmedit/dialogs/OpeningHoursHoursDialogFragment.java
View file

@ -23,6 +23,9 @@ public class OpeningHoursHoursDialogFragment extends DialogFragment {
private static final String RULE_POSITION = "rule_position"; private static final String RULE_POSITION = "rule_position";
private static final String TIME_POSITION = "time_position"; private static final String TIME_POSITION = "time_position";
private static final int DEFAULT_START_TIME = 9 * 60;
private static final int DEFAULT_END_TIME = 18 * 60;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
@ -33,14 +36,16 @@ public class OpeningHoursHoursDialogFragment extends DialogFragment {
final int rulePosition = args.getInt(RULE_POSITION); final int rulePosition = args.getInt(RULE_POSITION);
final int timePosition = args.getInt(TIME_POSITION); final int timePosition = args.getInt(TIME_POSITION);
boolean newTimeSpan = timePosition == item.timesSize(); final boolean newTimeSpan = timePosition == item.timesSize();
if (newTimeSpan) {
item.addTimeRange(9 * 60, 18 * 60);
}
final boolean createNew = rulePosition == -1 || newTimeSpan; final boolean createNew = rulePosition == -1 || newTimeSpan;
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
int time = isStart ? item.getStartTime(timePosition) : item.getEndTime(timePosition); int time;
if (isStart) {
time = newTimeSpan ? DEFAULT_START_TIME : item.getStartTime(timePosition);
} else {
time = newTimeSpan ? DEFAULT_END_TIME : item.getEndTime(timePosition);
}
int hour = time / 60; int hour = time / 60;
int minute = time - hour * 60; int minute = time - hour * 60;
@ -59,6 +64,9 @@ public class OpeningHoursHoursDialogFragment extends DialogFragment {
int minute = timePicker.getCurrentMinute(); int minute = timePicker.getCurrentMinute();
int hourOfDay = timePicker.getCurrentHour(); int hourOfDay = timePicker.getCurrentHour();
int time = minute + hourOfDay * 60; int time = minute + hourOfDay * 60;
if (newTimeSpan) {
item.addTimeRange(DEFAULT_START_TIME, DEFAULT_END_TIME);
}
if (isStart && createNew) { if (isStart && createNew) {
item.setStartTime(time, timePosition); item.setStartTime(time, timePosition);
OpeningHoursHoursDialogFragment OpeningHoursHoursDialogFragment