feat(Datepicker): support minuteInterval property in ios #46

xgfe · Oct 27, 2016 · 3ae69a4 · 3ae69a4
1 parent df91a40
commit 3ae69a4
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 1 deletion.
diff --git a/android/.gradle/2.4/taskArtifacts/cache.properties.lock b/android/.gradle/2.4/taskArtifacts/cache.properties.lock
diff --git a/android/.gradle/2.4/taskArtifacts/fileSnapshots.bin b/android/.gradle/2.4/taskArtifacts/fileSnapshots.bin
diff --git a/android/.gradle/2.4/taskArtifacts/taskArtifacts.bin b/android/.gradle/2.4/taskArtifacts/taskArtifacts.bin
diff --git a/index.android.js b/index.android.js
@@ -47,6 +47,7 @@ class datepicker extends Component {
           format="HH:mm"
           confirmBtnText="Confirm"
           cancelBtnText="Cancel"
+          minuteInterval={10}
           onDateChange={(time) => {this.setState({time: time});}}
         />
         <Text style={styles.instructions}>time: {this.state.time}</Text>
@@ -79,6 +80,7 @@ class datepicker extends Component {
               marginLeft: 36
             }
           }}
+          minuteInterval={10}
           onDateChange={(datetime) => {this.setState({datetime1: datetime});}}
         />
         <Text style={styles.instructions}>datetime: {this.state.datetime1}</Text>

diff --git a/index.js b/index.js
@@ -263,6 +263,8 @@ class DatePicker extends Component {
                     minimumDate={this.props.minDate && this.getDate(this.props.minDate)}
                     maximumDate={this.props.maxDate && this.getDate(this.props.maxDate)}
                     onDateChange={(date) => this.setState({date: date})}
+                    minuteInterval={this.props.minuteInterval}
+                    timeZoneOffsetInMinutes={this.props.timeZoneOffsetInMinutes}
                     style={[Style.datePicker, customStyles.datePicker]}
                   />
                   <TouchableHighlight

diff --git a/ios/datepicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/datepicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...codeproj/project.xcworkspace/xcuserdata/yuebin.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/yuebin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/datepicker.xcodeproj/xcuserdata/yuebin.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/datepicker.xcodeproj/xcuserdata/yuebin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>datepicker.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>00E356ED1AD99517003FC87E</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>13B07F861A680F5B00A75B9A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "react": "~15.3.1",
-    "react-native": "^0.33.0",
+    "react-native": "^0.36.0",
 
     "babel-core": "^6.5.2",
     "babel-preset-react-native": "^1.8.0",