From 2fa76e8021861126a14598455d3c07eff057c6d7 Mon Sep 17 00:00:00 2001 From: Henning Hall Date: Wed, 22 Jan 2020 19:42:24 +0100 Subject: [PATCH] Revert "Bugfix: onDateChange not called for some locales" This reverts commit a5d1da6e7aea9ff6fc9d81dfd742d2b0eb6ff5e4. --- .../henninghall/date_picker/PickerView.java | 2 +- .../date_picker/WheelChangeListenerImpl.java | 3 +- .../date_picker/wheels/AmPmWheel.java | 7 +-- .../date_picker/wheels/DateWheel.java | 5 -- .../date_picker/wheels/DayWheel.java | 7 +-- .../date_picker/wheels/HourWheel.java | 9 +--- .../date_picker/wheels/MinutesWheel.java | 5 -- .../date_picker/wheels/MonthWheel.java | 7 +-- .../henninghall/date_picker/wheels/Wheel.java | 3 +- .../date_picker/wheels/YearWheel.java | 6 --- examples/advanced/package.json | 52 +++++++++---------- examples/advanced/yarn.lock | 6 ++- 12 files changed, 38 insertions(+), 74 deletions(-) diff --git a/android/src/main/java/com/henninghall/date_picker/PickerView.java b/android/src/main/java/com/henninghall/date_picker/PickerView.java index fb80d15..de55dfb 100644 --- a/android/src/main/java/com/henninghall/date_picker/PickerView.java +++ b/android/src/main/java/com/henninghall/date_picker/PickerView.java @@ -155,7 +155,7 @@ public class PickerView extends RelativeLayout { return dateTemplate + " " + hourWheel.getFormatTemplate() + " " + minutesWheel.getFormatTemplate() - + ampmWheel.getFormatTemplate(); + + ampmWheel.getFormatTemplate(); } public String getDateString() { diff --git a/android/src/main/java/com/henninghall/date_picker/WheelChangeListenerImpl.java b/android/src/main/java/com/henninghall/date_picker/WheelChangeListenerImpl.java index a539083..4dc3734 100644 --- a/android/src/main/java/com/henninghall/date_picker/WheelChangeListenerImpl.java +++ b/android/src/main/java/com/henninghall/date_picker/WheelChangeListenerImpl.java @@ -30,8 +30,7 @@ public class WheelChangeListenerImpl implements WheelChangeListener { try { dateFormat.setTimeZone(timeZone); Calendar date = Calendar.getInstance(timeZone); - String toParse = this.pickerView.getDateString(); - date.setTime(dateFormat.parse(toParse)); + date.setTime(dateFormat.parse(this.pickerView.getDateString())); if (minDate != null && date.before(minDate)) pickerView.applyOnVisibleWheels( new AnimateToDate(minDate) diff --git a/android/src/main/java/com/henninghall/date_picker/wheels/AmPmWheel.java b/android/src/main/java/com/henninghall/date_picker/wheels/AmPmWheel.java index 48f5c6d..bdd6e4f 100644 --- a/android/src/main/java/com/henninghall/date_picker/wheels/AmPmWheel.java +++ b/android/src/main/java/com/henninghall/date_picker/wheels/AmPmWheel.java @@ -40,14 +40,9 @@ public class AmPmWheel extends Wheel { return Settings.usesAmPm() && pickerView.mode != Mode.date; } - @Override - public String getDisplayFormatTemplate() { - return Settings.usesAmPm() ? " a " : ""; - } - @Override public String getFormatTemplate() { - return " a "; + return Settings.usesAmPm() ? " a " : ""; } @Override diff --git a/android/src/main/java/com/henninghall/date_picker/wheels/DateWheel.java b/android/src/main/java/com/henninghall/date_picker/wheels/DateWheel.java index c48bf5c..435ad15 100644 --- a/android/src/main/java/com/henninghall/date_picker/wheels/DateWheel.java +++ b/android/src/main/java/com/henninghall/date_picker/wheels/DateWheel.java @@ -33,11 +33,6 @@ public class DateWheel extends Wheel return this.pickerView.mode == Mode.date; } - @Override - public String getDisplayFormatTemplate() { - return "d"; - } - @Override public String getFormatTemplate() { return "d"; diff --git a/android/src/main/java/com/henninghall/date_picker/wheels/DayWheel.java b/android/src/main/java/com/henninghall/date_picker/wheels/DayWheel.java index df6d7ad..d3fbc69 100644 --- a/android/src/main/java/com/henninghall/date_picker/wheels/DayWheel.java +++ b/android/src/main/java/com/henninghall/date_picker/wheels/DayWheel.java @@ -111,7 +111,7 @@ public class DayWheel extends Wheel { } @Override - public String getDisplayFormatTemplate() { + public String getFormatTemplate() { String locale = pickerView.locale.getLanguage(); if(locale.equals("ko")) return "yy MMM d일 (EEE)"; @@ -123,11 +123,6 @@ public class DayWheel extends Wheel { else return "yy EEE d MMM"; } - @Override - public String getFormatTemplate() { - return "yy EEE MMM d"; - } - @Override public Paint.Align getTextAlign() { return Paint.Align.RIGHT; diff --git a/android/src/main/java/com/henninghall/date_picker/wheels/HourWheel.java b/android/src/main/java/com/henninghall/date_picker/wheels/HourWheel.java index 3a1a8db..4e8e58c 100644 --- a/android/src/main/java/com/henninghall/date_picker/wheels/HourWheel.java +++ b/android/src/main/java/com/henninghall/date_picker/wheels/HourWheel.java @@ -20,7 +20,7 @@ public class HourWheel extends Wheel { for(int i=0; i values; @@ -45,7 +44,7 @@ public abstract class Wheel { } private void clearValues(){ - this.displayFormat = new SimpleDateFormat(getDisplayFormatTemplate(), pickerView.locale); + this.displayFormat = new SimpleDateFormat(getFormatTemplate(), pickerView.locale); this.format = new SimpleDateFormat(getFormatTemplate(), LocaleUtils.toLocale("en_US")); this.values = new ArrayList<>(); this.displayValues= new ArrayList<>(); diff --git a/android/src/main/java/com/henninghall/date_picker/wheels/YearWheel.java b/android/src/main/java/com/henninghall/date_picker/wheels/YearWheel.java index 7ae6963..ae1d9a3 100644 --- a/android/src/main/java/com/henninghall/date_picker/wheels/YearWheel.java +++ b/android/src/main/java/com/henninghall/date_picker/wheels/YearWheel.java @@ -59,16 +59,10 @@ public class YearWheel extends Wheel return Paint.Align.RIGHT; } - @Override - public String getDisplayFormatTemplate() { - return "y"; - } - @Override public String getFormatTemplate() { return "y"; } - } diff --git a/examples/advanced/package.json b/examples/advanced/package.json index fee47b6..a08439d 100644 --- a/examples/advanced/package.json +++ b/examples/advanced/package.json @@ -1,28 +1,28 @@ { - "name": "rn602", - "version": "0.0.1", - "private": true, - "scripts": { - "start": "react-native start", - "test": "jest", - "lint": "eslint ." - }, - "dependencies": { - "react": "16.8.6", - "react-native": "0.60.3", - "react-native-date-picker": "../../" - }, - "devDependencies": { - "@babel/core": "^7.5.4", - "@babel/runtime": "^7.5.4", - "@react-native-community/eslint-config": "^0.0.5", - "babel-jest": "^24.8.0", - "eslint": "^6.0.1", - "jest": "^24.8.0", - "metro-react-native-babel-preset": "^0.55.0", - "react-test-renderer": "16.8.6" - }, - "jest": { - "preset": "react-native" - } + "name": "rn602", + "version": "0.0.1", + "private": true, + "scripts": { + "start": "react-native start", + "test": "jest", + "lint": "eslint ." + }, + "dependencies": { + "react": "16.8.6", + "react-native": "0.60.3", + "react-native-date-picker": "^2.6.1" + }, + "devDependencies": { + "@babel/core": "^7.5.4", + "@babel/runtime": "^7.5.4", + "@react-native-community/eslint-config": "^0.0.5", + "babel-jest": "^24.8.0", + "eslint": "^6.0.1", + "jest": "^24.8.0", + "metro-react-native-babel-preset": "^0.55.0", + "react-test-renderer": "16.8.6" + }, + "jest": { + "preset": "react-native" + } } diff --git a/examples/advanced/yarn.lock b/examples/advanced/yarn.lock index 9d7071f..090630b 100644 --- a/examples/advanced/yarn.lock +++ b/examples/advanced/yarn.lock @@ -5132,8 +5132,10 @@ react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== -react-native-date-picker@../../: - version "2.7.3" +react-native-date-picker@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/react-native-date-picker/-/react-native-date-picker-2.6.1.tgz#ad322cc12a760ad7a2cabce18928652dd4f8b8f0" + integrity sha512-9FVOMulMs5mWfjWcoEuHotIh5LiJPHvrSUEsHfiYW48kME3GF/nE0DyNg4qDuJFRsZr8mIdiNyLQHQbnhGKZ/Q== dependencies: moment "^2.22.1"