Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit aaf2f57

Browse files
author
Evgenii Kanivets
committed
#57[30m]. Fix custom period issue.
1 parent 73ddf5c commit aaf2f57

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/PeriodSpinner.java

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,18 @@ private void showFromDateDialog() {
131131
if (lastPeriod == null) return;
132132
ChangeDateDialog dialog = new ChangeDateDialog(context, lastPeriod.getFirst(),
133133
new ChangeDateDialog.OnDateChangedListener() {
134-
@Override
135-
public void OnDataChanged(Date fromDate) {
136-
showToDateDialog(fromDate);
137-
}
138-
});
134+
@Override
135+
public void OnDataChanged(Date fromDate) {
136+
Calendar cal = Calendar.getInstance();
137+
cal.setTime(fromDate);
138+
cal.set(Calendar.HOUR_OF_DAY, 0);
139+
cal.set(Calendar.MINUTE, 0);
140+
cal.set(Calendar.SECOND, 0);
141+
cal.set(Calendar.MILLISECOND, 0);
142+
143+
showToDateDialog(cal.getTime());
144+
}
145+
});
139146
dialog.show();
140147
}
141148

@@ -146,7 +153,14 @@ private void showToDateDialog(final Date fromDate) {
146153
new ChangeDateDialog.OnDateChangedListener() {
147154
@Override
148155
public void OnDataChanged(Date toDate) {
149-
setPeriod(new Period(fromDate, toDate, Period.TYPE_CUSTOM));
156+
Calendar cal = Calendar.getInstance();
157+
cal.setTime(toDate);
158+
cal.set(Calendar.HOUR_OF_DAY, 23);
159+
cal.set(Calendar.MINUTE, 59);
160+
cal.set(Calendar.SECOND, 59);
161+
cal.set(Calendar.MILLISECOND, 999);
162+
163+
setPeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
150164
}
151165
});
152166
dialog.show();

0 commit comments

Comments
 (0)