honor the future dates setting in the new transaction date picker

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 0c4a1c1b72c506167ce5a93cf978b218abe97b6e..8ccb6c4ef972d75cbb04b40f46b45b902b954b3a 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
@@ -26,6 +26,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDialogFragment;
 
 import net.ktnx.mobileledger.R;
 import androidx.appcompat.app.AppCompatDialogFragment;
 
 import net.ktnx.mobileledger.R;

+import net.ktnx.mobileledger.model.MobileLedgerProfile;

 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;


@@ -39,6 +40,13 @@ public class DatePickerFragment extends AppCompatDialogFragment
     static final Pattern reMD = Pattern.compile("^\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$");
     static final Pattern reD = Pattern.compile("\\s*(\\d+)\\s*$");
     private DatePickedListener onDatePickedListener;
     static final Pattern reMD = Pattern.compile("^\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$");
     static final Pattern reD = Pattern.compile("\\s*(\\d+)\\s*$");
     private DatePickedListener onDatePickedListener;

+    private MobileLedgerProfile.FutureDates futureDates = MobileLedgerProfile.FutureDates.None;
+    public MobileLedgerProfile.FutureDates getFutureDates() {
+        return futureDates;
+    }
+    public void setFutureDates(MobileLedgerProfile.FutureDates futureDates) {
+        this.futureDates = futureDates;
+    }

     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {


@@ -78,8 +86,36 @@ public class DatePickerFragment extends AppCompatDialogFragment
         dpd.setContentView(R.layout.date_picker_view);
         dpd.setTitle(null);
         CalendarView cv = dpd.findViewById(R.id.calendarView);
         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(c.getTime()
+                    .getTime());
+
+        if (futureDates == MobileLedgerProfile.FutureDates.All) {
+            cv.setMaxDate(Long.MAX_VALUE);
+        }
+        else {
+            switch (futureDates) {
+                case None:
+                    // already there
+                    break;
+                case OneMonth:
+                    c.add(Calendar.MONTH, 1);
+                    break;
+                case TwoMonths:
+                    c.add(Calendar.MONTH, 2);
+                    break;
+                case ThreeMonths:
+                    c.add(Calendar.MONTH, 3);
+                    break;
+                case SixMonths:
+                    c.add(Calendar.MONTH, 6);
+                    break;
+                case OneYear:
+                    c.add(Calendar.YEAR, 1);
+                    break;
+            }
+            cv.setMaxDate(c.getTime()
+                           .getTime());
+        }

 
         cv.setOnDateChangeListener(this);
 
 
         cv.setOnDateChangeListener(this);
 

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
index f83eec8ae036b859f5de9f3b57cca88b922e9329..667c0452b253ad667c05115a8d636eafb7ce92f2 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
@@ -358,6 +358,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
     }
     private void pickTransactionDate() {
         DatePickerFragment picker = new DatePickerFragment();
     }
     private void pickTransactionDate() {
         DatePickerFragment picker = new DatePickerFragment();

+        picker.setFutureDates(mProfile.getFutureDates());

         picker.setOnDatePickedListener(this);
         picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(),
                 "datePicker");
         picker.setOnDatePickedListener(this);
         picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(),
                 "datePicker");