From f5118d822a2e274cd6a89861d8121cd094ba3c09 Mon Sep 17 00:00:00 2001 From: iDay <6155538@qq.com> Date: Tue, 7 Jun 2016 14:54:10 +0800 Subject: [PATCH 1/7] modified: DateTime.android.js modified: DateTime.ios.js modified: android/build.gradle modified: android/src/main/java/com/keyee/datetime/RCTDateTimePicker.java modified: android/src/main/java/com/keyee/datetime/RCTDateTimePickerPackage.java --- DateTime.android.js | 5 ++- DateTime.ios.js | 32 +++++++++---------- android/build.gradle | 2 +- .../com/keyee/datetime/RCTDateTimePicker.java | 12 +++---- .../datetime/RCTDateTimePickerPackage.java | 10 +++--- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/DateTime.android.js b/DateTime.android.js index 1420bc7..d1fadfa 100644 --- a/DateTime.android.js +++ b/DateTime.android.js @@ -28,6 +28,7 @@ export default class DateTimePicker extends Component { showDatePicker(date, callback) { date = date || new Date(); + callback ＝ callback || this.props.onDateChange; var options = { ...this.props, year:date.getFullYear(), @@ -44,6 +45,7 @@ export default class DateTimePicker extends Component { showTimePicker(date, callback) { date = date || new Date(); + callback ＝ callback || this.props.onDateChange; var options = { ...this.props, hour:date.getHours(), @@ -58,6 +60,7 @@ export default class DateTimePicker extends Component { showDateTimePicker(date, callback) { date = date || new Date(); + callback ＝ callback || this.props.onDateChange; var options = { ...this.props, year:date.getFullYear(), @@ -79,4 +82,4 @@ export default class DateTimePicker extends Component { render() { return null; } -} \ No newline at end of file +} diff --git a/DateTime.ios.js b/DateTime.ios.js index c0d581c..d11271c 100644 --- a/DateTime.ios.js +++ b/DateTime.ios.js @@ -36,7 +36,7 @@ export default class DateTimePicker extends Component { } showDatePicker(date, callback) { - this.callback = callback; + this.callback = callback || this.props.onDateChange; date = (date || new Date()); this.setState({ @@ -47,7 +47,7 @@ export default class DateTimePicker extends Component { } showTimePicker(date, callback) { - this.callback = callback; + this.callback = callback || this.props.onDateChange; date = (date || new Date()); this.setState({ @@ -58,7 +58,7 @@ export default class DateTimePicker extends Component { } showDateTimePicker(date, callback) { - this.callback = callback; + this.callback = callback || this.props.onDateChange; date = (date || new Date()); this.setState({ @@ -78,7 +78,7 @@ export default class DateTimePicker extends Component { this.setState({ visible: false }); - this.callback(this.state.date); + this.callback(this.props.date); } onDateChange(date) { @@ -94,22 +94,19 @@ export default class DateTimePicker extends Component { style={styles.touchableOpacity} activeOpacity={1} onPress={()=>this.onClose()} /> - this.onDateChange(date)} - style = {styles.datePicker} - /> - this.onComplete()} style={styles.button}> { this.props.okText } - this.onClose()} /> + + this.onDateChange(date)} + style = {styles.datePicker} + {...this.props} + /> ); @@ -138,10 +135,11 @@ const _styles = StyleSheet.create({ flex: 1, }, button: { + paddingHorizontal: 10, paddingVertical: 10, backgroundColor: 'white', - justifyContent: 'center', - alignItems: 'center' + justifyContent: 'flex-end', + alignItems: 'flex-end' }, separator: { height: 1, diff --git a/android/build.gradle b/android/build.gradle index 9a73961..096f1fb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,5 +21,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.facebook.react:react-native:0.25.+' + compile 'com.facebook.react:react-native:0.20.+' } diff --git a/android/src/main/java/com/keyee/datetime/RCTDateTimePicker.java b/android/src/main/java/com/keyee/datetime/RCTDateTimePicker.java index 044537b..106cae8 100644 --- a/android/src/main/java/com/keyee/datetime/RCTDateTimePicker.java +++ b/android/src/main/java/com/keyee/datetime/RCTDateTimePicker.java @@ -10,11 +10,9 @@ import com.facebook.react.bridge.ReadableMap; public class RCTDateTimePicker extends ReactContextBaseJavaModule { - private Activity activity; - public RCTDateTimePicker(ReactApplicationContext reactContext, Activity activity) { + public RCTDateTimePicker(ReactApplicationContext reactContext) { super(reactContext); - this.activity = activity; } @Override @@ -25,18 +23,18 @@ public String getName() { @ReactMethod public void showDatePicker(ReadableMap options, Callback callback) { DialogFragment datePicker = new DatePicker(options, callback); - datePicker.show(activity.getFragmentManager(), "datePicker"); + datePicker.show(getCurrentActivity().getFragmentManager(), "datePicker"); } @ReactMethod public void showTimePicker(ReadableMap options, Callback callback) { DialogFragment timePicker = new TimePicker(options, callback); - timePicker.show(activity.getFragmentManager(), "timePicker"); + timePicker.show(getCurrentActivity().getFragmentManager(), "timePicker"); } @ReactMethod public void showDateTimePicker(ReadableMap options, Callback callback) { DialogFragment datetimePicker = new DateTimePicker(options, callback); - datetimePicker.show(activity.getFragmentManager(), "datetimePicker"); + datetimePicker.show(getCurrentActivity().getFragmentManager(), "datetimePicker"); } -} \ No newline at end of file +} diff --git a/android/src/main/java/com/keyee/datetime/RCTDateTimePickerPackage.java b/android/src/main/java/com/keyee/datetime/RCTDateTimePickerPackage.java index 4953e97..13ed6bd 100644 --- a/android/src/main/java/com/keyee/datetime/RCTDateTimePickerPackage.java +++ b/android/src/main/java/com/keyee/datetime/RCTDateTimePickerPackage.java @@ -13,13 +13,11 @@ import android.app.Activity; public class RCTDateTimePickerPackage implements ReactPackage { - - private Activity activity; + private RCTDateTimePicker mModuleInstance; - public RCTDateTimePickerPackage(Activity activity) { + public RCTDateTimePickerPackage() { super(); - this.activity = activity; } @Override @@ -27,7 +25,7 @@ public List createNativeModules( ReactApplicationContext reactContext) { List modules = new ArrayList<>(); - modules.add(new RCTDateTimePicker(reactContext, activity)); + modules.add(new RCTDateTimePicker(reactContext)); return modules; } @@ -41,4 +39,4 @@ public List> createJSModules() { public List createViewManagers(ReactApplicationContext reactContext) { return Collections.emptyList(); } -} \ No newline at end of file +} From 8a866c014fecc93b8e3c527bffbfbc9500383880 Mon Sep 17 00:00:00 2001 From: iDay Date: Wed, 8 Jun 2016 14:32:56 +0800 Subject: [PATCH 2/7] publish to npm --- .gitignore | 1 + package.json | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6672061..108c654 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ local.properties node_modules/ npm-debug.log *.iml +/.project diff --git a/package.json b/package.json index e94cc6b..21bab0b 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "react-native-datetime", + "name": "react-native-yunpeng-datetime", "version": "0.1.2", "description": "A datetime-picker for react-native support for android and ios", "main": "index.js", "repository": { "type": "git", - "url": "git+https://github.com/cnjon/react-native-datetime.git" + "url": "git+https://github.com/yptech/react-native-datetime.git" }, "keywords": [ "react-component", @@ -17,11 +17,11 @@ "datetime" ], "author": { - "name": "cnjon", - "url": "https://github.com/cnjon" + "name": "iday", + "url": "https://github.com/iday" }, "license": "MIT", "bugs": { - "url": "https://github.com/cnjon/react-native-datetime/issues" + "url": "https://github.com/yptech/react-native-datetime/issues" } } From a2367d5ad29622bd51b9724b7d37ac94fc990ba2 Mon Sep 17 00:00:00 2001 From: iDay Date: Wed, 8 Jun 2016 15:13:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8react-native-yunpeng-date?= =?UTF-8?q?time?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a965c96..30f3d94 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A datetime-picker for react-native support for android and ios(base on @remobile ## Installation ```sh -npm install react-native-datetime --save +npm install react-native-yunpeng-datetime --save ``` ### Installation (iOS) From b12f16a8d087cfffdf89046a6723f81ac6b8ae6d Mon Sep 17 00:00:00 2001 From: iDay Date: Wed, 8 Jun 2016 15:18:13 +0800 Subject: [PATCH 4/7] update to 0.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 21bab0b..0c7bae9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-yunpeng-datetime", - "version": "0.1.2", + "version": "0.1.3", "description": "A datetime-picker for react-native support for android and ios", "main": "index.js", "repository": { From d1d35fd28677174eab701f02069e39a908ec12ff Mon Sep 17 00:00:00 2001 From: iDay Date: Wed, 8 Jun 2016 15:33:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9D=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DateTime.android.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DateTime.android.js b/DateTime.android.js index d1fadfa..d1af31e 100644 --- a/DateTime.android.js +++ b/DateTime.android.js @@ -28,7 +28,7 @@ export default class DateTimePicker extends Component { showDatePicker(date, callback) { date = date || new Date(); - callback ＝ callback || this.props.onDateChange; + callback = callback || this.props.onDateChange; var options = { ...this.props, year:date.getFullYear(), @@ -45,7 +45,7 @@ export default class DateTimePicker extends Component { showTimePicker(date, callback) { date = date || new Date(); - callback ＝ callback || this.props.onDateChange; + callback = callback || this.props.onDateChange; var options = { ...this.props, hour:date.getHours(), @@ -60,7 +60,7 @@ export default class DateTimePicker extends Component { showDateTimePicker(date, callback) { date = date || new Date(); - callback ＝ callback || this.props.onDateChange; + callback = callback || this.props.onDateChange; var options = { ...this.props, year:date.getFullYear(), From c9a09e56b70ed5713a5f892c354b2455d65e57cc Mon Sep 17 00:00:00 2001 From: iDay Date: Wed, 8 Jun 2016 15:42:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c7bae9..4e84473 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-yunpeng-datetime", - "version": "0.1.3", + "version": "0.1.4", "description": "A datetime-picker for react-native support for android and ios", "main": "index.js", "repository": { From d50e5983d277bb96afd2c6979148216558b9b662 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 6 Apr 2017 03:00:05 +0800 Subject: [PATCH 7/7] Update DateTime.ios.js --- DateTime.ios.js | 1 - 1 file changed, 1 deletion(-) diff --git a/DateTime.ios.js b/DateTime.ios.js index d11271c..33a2d4b 100644 --- a/DateTime.ios.js +++ b/DateTime.ios.js @@ -129,7 +129,6 @@ const _styles = StyleSheet.create({ }, datePicker: { backgroundColor: 'white', - alignItems: 'center', }, touchableOpacity: { flex: 1,