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 5dfa47e..5ae203f 100644 --- a/android/src/main/java/com/henninghall/date_picker/PickerView.java +++ b/android/src/main/java/com/henninghall/date_picker/PickerView.java @@ -124,7 +124,7 @@ public class PickerView extends RelativeLayout { } public void setDate(Date date) { - applyOnVisibleWheels(new SetDate(date)); + applyOnAllWheels(new SetDate(date)); } public void setLocale(Locale locale) { diff --git a/android/src/main/java/com/henninghall/date_picker/wheels/Wheel.java b/android/src/main/java/com/henninghall/date_picker/wheels/Wheel.java index 4863813..43533c0 100644 --- a/android/src/main/java/com/henninghall/date_picker/wheels/Wheel.java +++ b/android/src/main/java/com/henninghall/date_picker/wheels/Wheel.java @@ -13,6 +13,8 @@ public abstract class Wheel { private final Wheel self; public PickerView pickerView; + private String userSetValue; + abstract void init(); public abstract boolean visible(); abstract String getFormatTemplate(); @@ -45,7 +47,7 @@ public abstract class Wheel { } public String getValue() { - if(!visible()) return ""; + if(!visible()) return userSetValue; return getValueAtIndex(getIndex()); } @@ -58,6 +60,7 @@ public abstract class Wheel { } public void setValue(Date date) { + this.userSetValue = format.format(date); int index = getIndexOfDate(date); if(index > -1) { diff --git a/example/ios/DatePickerExample.xcodeproj/project.pbxproj b/example/ios/DatePickerExample.xcodeproj/project.pbxproj index 382dfa5..dea8655 100644 --- a/example/ios/DatePickerExample.xcodeproj/project.pbxproj +++ b/example/ios/DatePickerExample.xcodeproj/project.pbxproj @@ -23,6 +23,7 @@ 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 19D8B17D0461408D86F34238 /* libDatePickerX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0297D8D33D204EB6939D06AC /* libDatePickerX.a */; }; + 5B5A67062134936200599381 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BD54659212F465F005A1D38 /* libRNDeviceInfo.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; @@ -385,6 +386,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5B5A67062134936200599381 /* libRNDeviceInfo.a in Frameworks */, ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, diff --git a/example/package.json b/example/package.json index a4036f4..948cfe3 100644 --- a/example/package.json +++ b/example/package.json @@ -10,10 +10,10 @@ "moment": "^2.22.1", "react": "16.3.1", "react-native": "0.55.2", - "react-native-date-picker-x": "^1.3.0", - "react-native-device-info": "^0.21.5", + "react-native-date-picker-x": "^1.4.1", + "react-native-device-info": "^0.22.5", "react-native-search-filter": "^0.1.3" - }, + }, "devDependencies": { "babel-jest": "22.4.3", "babel-preset-react-native": "4.0.0", diff --git a/example/src/PropSlider.js b/example/src/PropSlider.js index ea58347..2c3e2f8 100644 --- a/example/src/PropSlider.js +++ b/example/src/PropSlider.js @@ -1,9 +1,7 @@ import React, { Component } from 'react'; import { FlatList, Dimensions, Button, View, StyleSheet, ScrollView, Text, TouchableOpacity } from 'react-native'; import SearchInput, { createFilter } from 'react-native-search-filter'; -import DeviceInfo from 'react-native-device-info'; import DatePicker from 'react-native-date-picker-x'; -import Carousel from 'react-native-snap-carousel'; const { width, height } = Dimensions.get('screen') diff --git a/example/src/examples/Advanced.js b/example/src/examples/Advanced.js index 97dcb6f..6cc5bea 100644 --- a/example/src/examples/Advanced.js +++ b/example/src/examples/Advanced.js @@ -2,7 +2,6 @@ import React, { Component } from 'react'; import { Dimensions, Button, View, StyleSheet, ScrollView, Text, TouchableOpacity } from 'react-native'; import SearchInput, { createFilter } from 'react-native-search-filter'; import DatePicker from 'react-native-date-picker-x'; -import Carousel from 'react-native-snap-carousel'; import PropSlider from '../PropSlider'; import LocalePicker from '../propPickers/LocalePicker'; import ModePicker from '../propPickers/ModePicker'; @@ -79,7 +78,7 @@ export default class Advanced extends Component { }, { name: 'textColor', component: - this.setState({ textColor: randomColor() })} /> + this.setState({ textColor: randomColor() })} /> }, ] diff --git a/example/yarn.lock b/example/yarn.lock index 96ff578..e8e5514 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -4297,13 +4297,13 @@ react-is@^16.3.1: version "16.3.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.1.tgz#ee66e6d8283224a83b3030e110056798488359ba" -react-native-date-picker-x@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/react-native-date-picker-x/-/react-native-date-picker-x-1.3.0.tgz#b38e911c7b12e0808988711cd2396fefbe43cc4e" +react-native-date-picker-x@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/react-native-date-picker-x/-/react-native-date-picker-x-1.4.0.tgz#15c75bb4e7a2553f7dc7f11a42a5cd3b0d83e5cd" -react-native-device-info@^0.21.5: - version "0.21.5" - resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-0.21.5.tgz#99478a2d68182e012297f2d63f2bd1b788106dee" +react-native-device-info@^0.22.5: + version "0.22.5" + resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-0.22.5.tgz#9b1882cbb030f2926cff77336e7cd2e87edf52bf" react-native-search-filter@^0.1.1, react-native-search-filter@^0.1.3: version "0.1.3"