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=ecaca2f2ddf04f1c1e89caf0cadb1d3bd51fe180;hp=cb2726a6aaeba4f34d53f07865f6210a4ecc4b70;hb=9fc964d2191f987c6ba26274d9af005e944f2bfa;hpb=998dd32a089d199a2569069415755eb3169b35b0

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 cb2726a6..ecaca2f2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
@@ -17,30 +17,36 @@
 
 package net.ktnx.mobileledger.ui;
 
-import android.annotation.TargetApi;
-import android.app.DatePickerDialog;
 import android.app.Dialog;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatDialogFragment;
-import android.widget.DatePicker;
+import android.widget.CalendarView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+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.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class DatePickerFragment extends AppCompatDialogFragment
-        implements DatePickerDialog.OnDateSetListener, DatePicker.OnDateChangedListener {
+        implements CalendarView.OnDateChangeListener {
     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 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) {
@@ -48,8 +54,9 @@ 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);
-        TextView date =
-                Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
+        long todayStamp = c.getTimeInMillis();
+        TextView date = Objects.requireNonNull(getActivity())
+                               .findViewById(R.id.new_transaction_date);
 
         CharSequence present = date.getText();
 
@@ -73,55 +80,58 @@ public class DatePickerFragment extends AppCompatDialogFragment
             }
         }
 
-        DatePickerDialog dpd =
-                new DatePickerDialog(Objects.requireNonNull(getActivity()), this, year, month, day);
-        // quicker date selection available in API 26
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            DatePicker dp = dpd.getDatePicker();
-            dp.setOnDateChangedListener(this);
-        }
+        c.set(year, month, day);
 
-        return dpd;
-    }
+        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());
 
-    @TargetApi(Build.VERSION_CODES.O)
-    public void onDateSet(DatePicker view, int year, int month, int day) {
-        TextView date =
-                Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
-
-        final Calendar c = GregorianCalendar.getInstance();
-        if (c.get(GregorianCalendar.YEAR) == year) {
-            if (c.get(GregorianCalendar.MONTH) == month)
-                date.setText(String.format(Locale.US, "%d", day));
-            else date.setText(String.format(Locale.US, "%d/%d", month + 1, day));
+        if (futureDates == MobileLedgerProfile.FutureDates.All) {
+            cv.setMaxDate(Long.MAX_VALUE);
         }
-        else date.setText(String.format(Locale.US, "%d/%d/%d", year, month + 1, day));
-
-        TextView description = Objects.requireNonNull(getActivity())
-                .findViewById(R.id.new_transaction_description);
-        description.requestFocus();
-    }
-
-    @Override
-    public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
-        TextView date =
-                Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
-
-        final Calendar c = GregorianCalendar.getInstance();
-        if (c.get(GregorianCalendar.YEAR) == year) {
-            if (c.get(GregorianCalendar.MONTH) == monthOfYear) {
-                date.setText(String.format(Locale.US, "%d", dayOfMonth));
-            }
-            else {
-                date.setText(String.format(Locale.US, "%d/%d", monthOfYear + 1, dayOfMonth));
+        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());
         }
-        else date.setText(String.format(Locale.US, "%d/%d/%d", year, monthOfYear + 1, dayOfMonth));
 
-        TextView description = Objects.requireNonNull(getActivity())
-                .findViewById(R.id.new_transaction_description);
-        description.requestFocus();
+        cv.setOnDateChangeListener(this);
 
+        return dpd;
+    }
+    @Override
+    public void onSelectedDayChange(@NonNull CalendarView view, int year, int month,
+                                    int dayOfMonth) {
         this.dismiss();
+        if (onDatePickedListener != null)
+            onDatePickedListener.onDatePicked(year, month, dayOfMonth);
+    }
+    public void setOnDatePickedListener(DatePickedListener listener) {
+        onDatePickedListener = listener;
+    }
+    public interface DatePickedListener {
+        void onDatePicked(int year, int month, int day);
     }
 }