X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FDatePickerFragment.java;h=80c69e59bfece97bc7fd313b888f012bf4100b16;hp=6f71acee2241e2646b633a29b2d0b1dae876dcde;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hpb=865334093695e52f99d93ad9a255252b9d575053 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 6f71acee..80c69e59 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -20,16 +20,17 @@ package net.ktnx.mobileledger.ui; import android.app.Dialog; import android.os.Bundle; import android.widget.CalendarView; -import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatDialogFragment; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.utils.SimpleDate; import java.util.Calendar; import java.util.GregorianCalendar; -import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -38,19 +39,62 @@ public class DatePickerFragment extends AppCompatDialogFragment static final Pattern reYMD = Pattern.compile("^\\s*(\\d+)\\d*/\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$"); static final Pattern reMD = Pattern.compile("^\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$"); static final Pattern reD = Pattern.compile("\\s*(\\d+)\\s*$"); + private Calendar presentDate = GregorianCalendar.getInstance(); private DatePickedListener onDatePickedListener; - @NonNull - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - final Calendar c = GregorianCalendar.getInstance(); - 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); + private long minDate = 0; + private long maxDate = Long.MAX_VALUE; + public void setDateRange(@Nullable SimpleDate minDate, @Nullable SimpleDate maxDate) { + if (minDate == null) + this.minDate = 0; + else + this.minDate = minDate.toDate().getTime(); - CharSequence present = date.getText(); + if (maxDate == null) + this.maxDate = Long.MAX_VALUE; + else + this.maxDate = maxDate.toDate().getTime(); + } + public void setFutureDates(MobileLedgerProfile.FutureDates futureDates) { + if (futureDates == MobileLedgerProfile.FutureDates.All) { + maxDate = 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: + dateLimit.add(Calendar.MONTH, 1); + break; + case TwoMonths: + dateLimit.add(Calendar.MONTH, 2); + break; + case ThreeMonths: + dateLimit.add(Calendar.MONTH, 3); + break; + case SixMonths: + dateLimit.add(Calendar.MONTH, 6); + break; + case OneYear: + dateLimit.add(Calendar.YEAR, 1); + break; + } + maxDate = dateLimit.getTime() + .getTime(); + } + } + public void setCurrentDateFromText(CharSequence present) { + final Calendar now = GregorianCalendar.getInstance(); + int year = now.get(GregorianCalendar.YEAR); + int month = now.get(GregorianCalendar.MONTH); + int day = now.get(GregorianCalendar.DAY_OF_MONTH); Matcher m = reYMD.matcher(present); if (m.matches()) { @@ -72,14 +116,20 @@ public class DatePickerFragment extends AppCompatDialogFragment } } - c.set(year, month, day); - + presentDate.set(year, month, day); + } + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { Dialog dpd = new Dialog(Objects.requireNonNull(getActivity())); dpd.setContentView(R.layout.date_picker_view); dpd.setTitle(null); CalendarView cv = dpd.findViewById(R.id.calendarView); - cv.setDate(c.getTime().getTime()); - cv.setMaxDate(todayStamp); + cv.setDate(presentDate.getTime() + .getTime()); + + cv.setMinDate(minDate); + cv.setMaxDate(maxDate); cv.setOnDateChangeListener(this); @@ -88,9 +138,9 @@ public class DatePickerFragment extends AppCompatDialogFragment @Override public void onSelectedDayChange(@NonNull CalendarView view, int year, int month, int dayOfMonth) { + this.dismiss(); if (onDatePickedListener != null) onDatePickedListener.onDatePicked(year, month, dayOfMonth); - this.dismiss(); } public void setOnDatePickedListener(DatePickedListener listener) { onDatePickedListener = listener;