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=9b416e2c5343c82e8e907518b66e338942474667;hp=cb2726a6aaeba4f34d53f07865f6210a4ecc4b70;hb=4ba98ffd3c944060a02a2b510828e194dba5879f;hpb=fc1c229186c7602372f381c434f99a16a13733f3

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..9b416e2c 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
@@ -83,9 +83,7 @@ public class DatePickerFragment extends AppCompatDialogFragment
 
         return dpd;
     }
-
-    @TargetApi(Build.VERSION_CODES.O)
-    public void onDateSet(DatePicker view, int year, int month, int day) {
+    private void updateDateInput(int year, int month, int day) {
         TextView date =
                 Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
 
@@ -101,26 +99,14 @@ public class DatePickerFragment extends AppCompatDialogFragment
                 .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);
+    }
 
     @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 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();
+        updateDateInput(year, monthOfYear, dayOfMonth);
 
         this.dismiss();
     }