when a date is picked, focus the transaction description

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/DatePickerFragment.java b/app/src/main/java/net/ktnx/mobileledger/DatePickerFragment.java
index 7aa2db06b1bc1ae626ceb0fd3dae58fde65a3c8c..a30913c091220e69ab1bb7578c8f50e7a66f2fcf 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/DatePickerFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/DatePickerFragment.java
@@ -7,6 +7,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatDialogFragment;
+import android.util.Log;
 import android.widget.DatePicker;
 import android.widget.TextView;
 
@@ -18,7 +19,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class DatePickerFragment extends AppCompatDialogFragment
-implements DatePickerDialog.OnDateSetListener
+implements DatePickerDialog.OnDateSetListener, DatePicker.OnDateChangedListener
 {
     @NonNull
     @Override
@@ -27,7 +28,7 @@ implements DatePickerDialog.OnDateSetListener
         int year = c.get(GregorianCalendar.YEAR);
         int month = c.get(GregorianCalendar.MONTH);
         int day = c.get(GregorianCalendar.DAY_OF_MONTH);
-        TextView date = getActivity().findViewById(R.id.new_transaction_date);
+        TextView date = Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
 
         CharSequence present = date.getText();
 
@@ -46,12 +47,19 @@ implements DatePickerDialog.OnDateSetListener
             }
         }
 
-        return new DatePickerDialog(Objects.requireNonNull(getActivity()), this, year, month, day);
+        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);
+        }
+
+        return dpd;
     }
 
     @TargetApi(Build.VERSION_CODES.O)
     public void onDateSet(DatePicker view, int year, int month, int day) {
-        TextView date = getActivity().findViewById(R.id.new_transaction_date);
+        TextView date = Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date);
 
         final Calendar c = GregorianCalendar.getInstance();
         if ( c.get(GregorianCalendar.YEAR) == year && c.get(GregorianCalendar.MONTH) == month) {
@@ -60,5 +68,28 @@ implements DatePickerDialog.OnDateSetListener
         else {
             date.setText(String.format(Locale.US, "%d/%d", 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 && 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));
+        }
+
+        TextView description = Objects.requireNonNull(getActivity())
+                .findViewById(R.id.new_transaction_description);
+        description.requestFocus();
+
+        this.dismiss();
     }
 }