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 a59d648199f666d2fe62a252e57e1bfac700f43e..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
@@ -19,16 +19,16 @@ package net.ktnx.mobileledger.ui;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatDialogFragment;
 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;
@@ -38,6 +38,7 @@ 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 DatePickedListener onDatePickedListener;
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -84,26 +85,17 @@ public class DatePickerFragment extends AppCompatDialogFragment
 
         return dpd;
     }
-    private void updateDateInput(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));
-        }
-        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 onSelectedDayChange(@NonNull CalendarView view, int year, int month,
                                     int dayOfMonth) {
-        updateDateInput(year, month, 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);
     }
 }