X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FDatePickerFragment.java;h=4c2721d46651119789a96686669d3d4d296d35d1;hb=684e2ca7c63cc4d5491b2dd0784d232e906e813a;hp=8ccb6c4ef972d75cbb04b40f46b45b902b954b3a;hpb=0838dde2f82aa5e93836ad3380d8097a15ef0bc7;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java index 8ccb6c4e..4c2721d4 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java @@ -54,9 +54,8 @@ public class DatePickerFragment extends AppCompatDialogFragment int year = c.get(GregorianCalendar.YEAR); int month = c.get(GregorianCalendar.MONTH); int day = c.get(GregorianCalendar.DAY_OF_MONTH); - long todayStamp = c.getTimeInMillis(); - TextView date = - Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date); + TextView date = Objects.requireNonNull(getActivity()) + .findViewById(R.id.new_transaction_date); CharSequence present = date.getText(); @@ -93,28 +92,35 @@ public class DatePickerFragment extends AppCompatDialogFragment cv.setMaxDate(Long.MAX_VALUE); } else { + final Calendar dateLimit = GregorianCalendar.getInstance(); switch (futureDates) { case None: // already there break; + case OneWeek: + dateLimit.add(Calendar.DAY_OF_MONTH, 7); + break; + case TwoWeeks: + dateLimit.add(Calendar.DAY_OF_MONTH, 14); + break; case OneMonth: - c.add(Calendar.MONTH, 1); + dateLimit.add(Calendar.MONTH, 1); break; case TwoMonths: - c.add(Calendar.MONTH, 2); + dateLimit.add(Calendar.MONTH, 2); break; case ThreeMonths: - c.add(Calendar.MONTH, 3); + dateLimit.add(Calendar.MONTH, 3); break; case SixMonths: - c.add(Calendar.MONTH, 6); + dateLimit.add(Calendar.MONTH, 6); break; case OneYear: - c.add(Calendar.YEAR, 1); + dateLimit.add(Calendar.YEAR, 1); break; } - cv.setMaxDate(c.getTime() - .getTime()); + cv.setMaxDate(dateLimit.getTime() + .getTime()); } cv.setOnDateChangeListener(this);