DatePickerFragment: dismiss before invoking the date picked listener

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / DatePickerFragment.java

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 9b416e2c5343c82e8e907518b66e338942474667..0c4a1c1b72c506167ce5a93cf978b218abe97b6e 100644 (file)
--- 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,28 @@
 
 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 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;
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -48,6 +46,7 @@ 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);
 
@@ -73,41 +72,30 @@ 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;
-    }
-    private void updateDateInput(int year, int month, int day) {
-        TextView date =
-                Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
+        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);
 
-        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));
-        }
-        else date.setText(String.format(Locale.US, "%d/%d/%d", year, month + 1, day));
+        cv.setOnDateChangeListener(this);
 
-        TextView description = Objects.requireNonNull(getActivity())
-                .findViewById(R.id.new_transaction_description);
-        description.requestFocus();
-    }
-    @TargetApi(Build.VERSION_CODES.O)
-    public void onDateSet(DatePicker view, int year, int month, int day) {
-        updateDateInput(year, month, day);
+        return dpd;
     }
-
     @Override
-    public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
-        updateDateInput(year, monthOfYear, dayOfMonth);
-
+    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);
     }
 }