Merge pull request #48 from henninghall/performance

Performance improvements

DatePickerAndroid.js

@@ -11,7 +11,7 @@ class DatePickerAndroid extends React.Component {
         minuteInterval: 1,
     };
 
-    render = () => {
+    render(){
         return (
             <NativeDatePicker
                 {...this.props}
@@ -30,7 +30,7 @@ class DatePickerAndroid extends React.Component {
         this.props.onDateChange(jsDate)
     }
 
-    _maximumDate = () => this.props.minimumDate && this._toIsoWithTimeZoneOffset(this.props.maximumDate);
+    _maximumDate = () => this.props.maximumDate && this._toIsoWithTimeZoneOffset(this.props.maximumDate);
 
     _minimumDate = () => this.props.minimumDate && this._toIsoWithTimeZoneOffset(this.props.minimumDate);
 

android/src/main/java/com/henninghall/date_picker/DateBoundary.java

@@ -0,0 +1,17 @@
+package com.henninghall.date_picker;
+
+import java.util.Calendar;
+
+public class DateBoundary {
+    private Calendar date;
+
+    public DateBoundary(PickerView pickerView, String date) {
+        if(date == null) return;
+        Calendar cal = Utils.isoToCalendar(date, pickerView.timeZone);
+        this.date = Utils.getTruncatedCalendarOrNull(cal);
+    }
+
+    protected Calendar get() {
+        return this.date;
+    }
+}

android/src/main/java/com/henninghall/date_picker/DatePickerManager.java

@@ -18,9 +18,6 @@ public class DatePickerManager extends SimpleViewManager  {
   public static final String REACT_CLASS = "DatePickerManager";
   public static ThemedReactContext context;
   private String date;
-  private String minimumDate;
-  private String maximumDate;
-  private boolean utc;
 
   @Override
   public String getName() {
@@ -57,12 +54,12 @@ public class DatePickerManager extends SimpleViewManager  {
 
   @ReactProp(name = "minimumDate")
   public void setMinimumDate(PickerView view, @Nullable String date) {
-    this.minimumDate = date;
+    view.setMinimumDate(date);
   }
 
   @ReactProp(name = "maximumDate")
   public void setMaximumDate(PickerView view, @Nullable String date) {
-    this.maximumDate = date;
+    view.setMaximumDate(date);
   }
 
   @ReactProp(name = "fadeToColor")
@@ -83,21 +80,17 @@ public class DatePickerManager extends SimpleViewManager  {
 
   @ReactProp(name = "utc")
   public void setUtc(PickerView view, @Nullable boolean utc) throws Exception {
-    this.utc = utc;
+    TimeZone timeZone = utc ? TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
+    view.setTimeZone(timeZone);
   }
 
   @Override
   protected void onAfterUpdateTransaction(PickerView view) {
    super.onAfterUpdateTransaction(view);
-
-    TimeZone timeZone = utc ? TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
-    view.setTimeZone(timeZone);
-    if(minimumDate != null) view.setMinimumDate(Utils.isoToCalendar(minimumDate, timeZone));
-    if(maximumDate != null) view.setMaximumDate(Utils.isoToCalendar(maximumDate, timeZone));
-
-    // Refresh which options are available. Should happen before updating the date
+    // updateDisplayValuesIfNeeded() refreshes
+    // which options are available. Should happen before updating the selected date.
     view.updateDisplayValuesIfNeeded();
-    view.setDate(Utils.isoToCalendar(date, timeZone));
+    view.setDate(date);
   }
 
   public Map getExportedCustomBubblingEventTypeConstants() {

android/src/main/java/com/henninghall/date_picker/PickerView.java

@@ -1,6 +1,7 @@
 package com.henninghall.date_picker;
 
 import android.os.Build;
+import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;
 
@@ -37,7 +38,7 @@ import cn.carbswang.android.numberpickerview.library.NumberPickerView;
 
 public class PickerView extends RelativeLayout {
 
-    private SimpleDateFormat dateFormat;
+    public SimpleDateFormat dateFormat;
     private HourWheel hourWheel;
     private DayWheel dayWheel;
     public MinutesWheel minutesWheel;
@@ -49,13 +50,12 @@ public class PickerView extends RelativeLayout {
     public DateWheel dateWheel;
     public MonthWheel monthWheel;
     public YearWheel yearWheel;
-    public Calendar maxDate;
-    public Calendar minDate;
     private WheelOrderUpdater wheelOrderUpdater;
-    public boolean isInitialized = false;
     public boolean requireDisplayValueUpdate = true;
-    public TimeZone timeZone;
-
+    public TimeZone timeZone = TimeZone.getDefault();
+    private DateBoundary minDate;
+    private DateBoundary maxDate;
+    private WheelChangeListener onWheelChangeListener = new WheelChangeListenerImpl(this);
 
     public PickerView() {
         super(DatePickerManager.context);
@@ -71,7 +71,6 @@ public class PickerView extends RelativeLayout {
         yearWheel = new YearWheel( this, R.id.year);
         monthWheel = new MonthWheel( this, R.id.month);
         dateWheel = new DateWheel( this, R.id.date);
-
         dayWheel = new DayWheel( this, R.id.day);
         minutesWheel = new MinutesWheel( this, R.id.minutes);
         ampmWheel = new AmPmWheel(this, R.id.ampm);
@@ -81,29 +80,6 @@ public class PickerView extends RelativeLayout {
         changeAmPmWhenPassingMidnightOrNoon();
     }
 
-    WheelChangeListener onWheelChangeListener = new WheelChangeListener(){
-        @Override
-        public void onChange(Wheel wheel) {
-            WritableMap event = Arguments.createMap();
-            try {
-                dateFormat.setTimeZone(timeZone);
-                Calendar date = Calendar.getInstance(timeZone);
-                date.setTime(dateFormat.parse(getDateString()));
-                update2DigitYearStart(date);
-
-                if (minDate != null && date.before(minDate)) applyOnVisibleWheels(new AnimateToDate(minDate));
-                else if (maxDate != null && date.after(maxDate)) applyOnVisibleWheels(new AnimateToDate(maxDate));
-                else {
-                    event.putString("date", Utils.dateToIso(date));
-                    DatePickerManager.context.getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "dateChange", event);
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-    };
-
-
     private final Runnable measureAndLayout = new Runnable() {
         @Override
         public void run() {
@@ -128,17 +104,18 @@ public class PickerView extends RelativeLayout {
         });
     }
 
-    public void setMinimumDate(Calendar cal) {
-        minDate = Utils.getTruncatedCalendarOrNull(cal);
+    public void setMinimumDate(String date) {
+        minDate = new DateBoundary(this, date);
         requireDisplayValueUpdate = true;
     }
 
-    public void setMaximumDate(Calendar cal) {
-        maxDate = Utils.getTruncatedCalendarOrNull(cal);
+    public void setMaximumDate(String date) {
+        maxDate = new DateBoundary(this, date);
         requireDisplayValueUpdate = true;
     }
 
-    public void setDate(Calendar cal) {
+    public void f(String isoDate) {
+        Calendar cal = Utils.isoToCalendar(isoDate, timeZone);
         applyOnAllWheels(new SetDate(cal));
         update2DigitYearStart(cal);
     }
@@ -181,7 +158,7 @@ public class PickerView extends RelativeLayout {
                 +  ampmWheel.getFormatTemplate();
     }
 
-    private String getDateString() {
+    public String getDateString() {
         String dateString= (mode == Mode.date)
                 ? (yearWheel.getValue() + " "
                 + monthWheel.getValue() + " "
@@ -237,10 +214,17 @@ public class PickerView extends RelativeLayout {
 
     public void setTimeZone(TimeZone timeZone) {
         this.timeZone = timeZone;
+        requireDisplayValueUpdate = true;
+    }
+
+    public Calendar getMinimumDate(){
+        if (minDate == null) return null;
+        return minDate.get();
     }
 
-    public TimeZone getTimeZone() {
-        return timeZone;
+    public Calendar getMaximumDate(){
+        if (maxDate == null) return null;
+        return maxDate.get();
     }
     public void setDateFormat(){
         dateFormat = new SimpleDateFormat(getDateFormatTemplate(), Locale.US);

android/src/main/java/com/henninghall/date_picker/WheelChangeListenerImpl.java

@@ -0,0 +1,50 @@
+package com.henninghall.date_picker;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.henninghall.date_picker.wheelFunctions.AnimateToDate;
+import com.henninghall.date_picker.wheels.Wheel;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+public class WheelChangeListenerImpl implements WheelChangeListener {
+
+
+    private final PickerView pickerView;
+
+    public WheelChangeListenerImpl(PickerView pickerView) {
+        this.pickerView = pickerView;
+    }
+
+    @Override
+    public void onChange(Wheel picker) {
+        WritableMap event = Arguments.createMap();
+        TimeZone timeZone = pickerView.timeZone;
+        SimpleDateFormat dateFormat = pickerView.dateFormat;
+        Calendar minDate = pickerView.getMinimumDate();
+        Calendar maxDate = pickerView.getMaximumDate();
+        try {
+            dateFormat.setTimeZone(timeZone);
+            Calendar date = Calendar.getInstance(timeZone);
+            date.setTime(dateFormat.parse(this.pickerView.getDateString()));
+
+            if (minDate != null && date.before(minDate)) pickerView.applyOnVisibleWheels(
+                    new AnimateToDate(minDate)
+            );
+            else if (maxDate != null && date.after(maxDate)) pickerView.applyOnVisibleWheels(
+                    new AnimateToDate(maxDate)
+            );
+            else {
+                event.putString("date", Utils.dateToIso(date));
+                DatePickerManager.context.getJSModule(RCTEventEmitter.class).receiveEvent(pickerView.getId(), "dateChange", event);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

android/src/main/java/com/henninghall/date_picker/wheels/DayWheel.java

@@ -35,8 +35,9 @@ public class DayWheel extends Wheel {
 
     private Calendar getStartCal(){
         Calendar cal;
-        if (pickerView.minDate != null) {
-            cal = (Calendar) pickerView.minDate.clone();
+        Calendar min = pickerView.getMinimumDate();
+        if (min != null) {
+            cal = (Calendar) min.clone();
             resetToMidnight(cal);
         } else {
             cal = (Calendar) pickerView.getInitialDate().clone();
@@ -47,8 +48,9 @@ public class DayWheel extends Wheel {
 
     private Calendar getEndCal(){
         Calendar cal;
-        if (pickerView.maxDate != null) {
-            cal = (Calendar) pickerView.maxDate.clone();
+        Calendar max = pickerView.getMaximumDate();
+        if (max != null) {
+            cal = (Calendar) max.clone();
             resetToMidnight(cal);
         } else {
             cal = (Calendar) pickerView.getInitialDate().clone();

android/src/main/java/com/henninghall/date_picker/wheels/YearWheel.java

@@ -34,17 +34,17 @@ public class YearWheel extends Wheel
     }
 
     private int getEndYear() {
-        if (this.pickerView.maxDate == null) {
+        if (this.pickerView.getMaximumDate() == null) {
             return this.defaultEndYear;
         }
-        return this.pickerView.maxDate.get(Calendar.YEAR);
+        return this.pickerView.getMaximumDate().get(Calendar.YEAR);
     }
 
     private int getStartYear() {
-        if (this.pickerView.minDate == null) {
+        if (this.pickerView.getMinimumDate() == null) {
             return this.defaultStartYear;
         }
-        return this.pickerView.minDate.get(Calendar.YEAR);
+        return this.pickerView.getMinimumDate().get(Calendar.YEAR);
     }
 
     @Override