]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java
fix method signature
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / DatePickerFragment.java
index f801bdaadc8961daa4083695eac3cfa0bc7e8251..abec8d6d8fb5915234c4981f74564b8be8766ed8 100644 (file)
@@ -1,30 +1,27 @@
 /*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2019 Damyan Ivanov.
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your opinion), any later version.
  *
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License terms for details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 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 androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import android.widget.CalendarView;
 import android.widget.TextView;
 
 import net.ktnx.mobileledger.R;
@@ -37,8 +34,10 @@ 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*$");
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -46,68 +45,65 @@ implements DatePickerDialog.OnDateSetListener, DatePicker.OnDateChangedListener
         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();
 
-        Pattern re_mon_day = Pattern.compile("^\\s*(\\d+)\\s*/\\s*(\\d+)\\s*$");
-        Matcher m_mon_day = re_mon_day.matcher(present);
-
-        if (m_mon_day.matches()) {
-            month = Integer.parseInt(m_mon_day.group(1))-1;
-            day = Integer.parseInt(m_mon_day.group(2));
+        Matcher m = reYMD.matcher(present);
+        if (m.matches()) {
+            year = Integer.parseInt(m.group(1));
+            month = Integer.parseInt(m.group(2)) - 1;   // month is 0-based
+            day = Integer.parseInt(m.group(3));
         }
         else {
-            Pattern re_day = Pattern.compile("^\\s*(\\d{1,2})\\s*$");
-            Matcher m_day = re_day.matcher(present);
-            if (m_day.matches()) {
-                day = Integer.parseInt(m_day.group(1));
+            m = reMD.matcher(present);
+            if (m.matches()) {
+                month = Integer.parseInt(m.group(1)) - 1;
+                day = Integer.parseInt(m.group(2));
+            }
+            else {
+                m = reD.matcher(present);
+                if (m.matches()) {
+                    day = Integer.parseInt(m.group(1));
+                }
             }
         }
 
-        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);
+
+        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);
+
+        cv.setOnDateChangeListener(this);
 
         return dpd;
     }
-
-    @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);
+    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 && 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 (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 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();
-
+    public void onSelectedDayChange(@NonNull CalendarView view, int year, int month,
+                                    int dayOfMonth) {
+        updateDateInput(year, month, dayOfMonth);
         this.dismiss();
     }
 }