Browse Source

Merge pull request #10 from henninghall/renaming

Rename project to new package name.
master
Henning Hall 7 years ago
committed by GitHub
parent
commit
a62f614005
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 84 additions and 66 deletions
  1. +2
    -13
      DatePickerAndroid.js
  2. +1
    -1
      DatePickerIOS.js
  3. +1
    -1
      example/android/app/build.gradle
  4. +2
    -2
      example/android/settings.gradle
  5. +32
    -16
      example/ios/DatePickerExample.xcodeproj/project.pbxproj
  6. +15
    -0
      example/ios/DatePickerExample/Images.xcassets/AppIcon.appiconset/Contents.json
  7. +1
    -1
      example/package.json
  8. +1
    -1
      example/src/examples/Advanced.js
  9. +1
    -3
      example/src/examples/DateMode.js
  10. +1
    -1
      example/src/examples/Minimal.js
  11. +1
    -1
      example/src/examples/TimeMode.js
  12. +3
    -3
      example/yarn.lock
  13. +19
    -19
      ios/RNDatePicker.xcodeproj/project.pbxproj
  14. +1
    -1
      ios/RNDatePicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  15. +0
    -0
      ios/RNDatePicker/DatePicker.h
  16. +0
    -0
      ios/RNDatePicker/DatePicker.m
  17. +1
    -1
      ios/RNDatePicker/RNDatePickerManager.h
  18. +2
    -2
      ios/RNDatePicker/RNDatePickerManager.m

+ 2
- 13
DatePickerAndroid.js View File

@ -1,16 +1,5 @@
import {
Platform,
NativeModules,
NativeAppEventEmitter,
Text,
requireNativeComponent,
ViewPropTypes,
StyleSheet,
DatePickerIOS,
} from 'react-native';
import React, { Component } from 'react'
import PropTypes from 'prop-types';
import { DatePicker } from 'react-native-date-picker-x';
import React from 'react';
import { DatePickerIOS, requireNativeComponent, StyleSheet } from 'react-native';
const NativeDatePicker = requireNativeComponent(`DatePickerManager`, DatePickerAndroid, { nativeOnly: { onChange: true } }); const NativeDatePicker = requireNativeComponent(`DatePickerManager`, DatePickerAndroid, { nativeOnly: { onChange: true } });

+ 1
- 1
DatePickerIOS.js View File

@ -19,7 +19,7 @@ const invariant = require('fbjs/lib/invariant');
import type {ViewProps} from 'ViewPropTypes'; import type {ViewProps} from 'ViewPropTypes';
const RCTDatePickerIOS = requireNativeComponent('DatePickerX');
const RCTDatePickerIOS = requireNativeComponent('RNDatePicker');
type Event = Object; type Event = Object;

+ 1
- 1
example/android/app/build.gradle View File

@ -137,7 +137,7 @@ android {
} }
dependencies { dependencies {
compile project(':react-native-date-picker-x')
compile project(':react-native-date-picker')
compile project(':react-native-device-info') compile project(':react-native-device-info')
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"

+ 2
- 2
example/android/settings.gradle View File

@ -1,6 +1,6 @@
rootProject.name = 'DatePickerExample' rootProject.name = 'DatePickerExample'
include ':react-native-date-picker-x'
project(':react-native-date-picker-x').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-date-picker-x/android')
include ':react-native-date-picker'
project(':react-native-date-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-date-picker/android')
include ':react-native-device-info' include ':react-native-device-info'
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android') project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')

+ 32
- 16
example/ios/DatePickerExample.xcodeproj/project.pbxproj View File

@ -22,8 +22,8 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
146834051AC3E58100842450 /* 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 */; }; 5B5A67062134936200599381 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BD54659212F465F005A1D38 /* libRNDeviceInfo.a */; };
5BCA8D4B214839F100C81469 /* libRNDatePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BCA8D48214839D500C81469 /* libRNDatePicker.a */; };
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@ -261,12 +261,12 @@
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4; remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
remoteInfo = "jschelpers-tvOS"; remoteInfo = "jschelpers-tvOS";
}; };
5B5A668A2130BD1300599381 /* PBXContainerItemProxy */ = {
5BCA8D47214839D500C81469 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = BEE75557964943A593A20B4C /* DatePickerX.xcodeproj */;
containerPortal = 8E735C153B6847FA8230A60F /* RNDatePicker.xcodeproj */;
proxyType = 2; proxyType = 2;
remoteGlobalIDString = DA5891D81BA9A9FC002B4DB2; remoteGlobalIDString = DA5891D81BA9A9FC002B4DB2;
remoteInfo = DatePickerX;
remoteInfo = RNDatePicker;
}; };
5BD54658212F465F005A1D38 /* PBXContainerItemProxy */ = { 5BD54658212F465F005A1D38 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
@ -357,6 +357,12 @@
21BDF87D12ED4E5BA97C6E9D /* libDatePickerX-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libDatePickerX-tvOS.a"; sourceTree = "<group>"; }; 21BDF87D12ED4E5BA97C6E9D /* libDatePickerX-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libDatePickerX-tvOS.a"; sourceTree = "<group>"; };
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
35AF2FBE48BB4F8C8793EC95 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; }; 35AF2FBE48BB4F8C8793EC95 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; };
5BCA8D00214833B700C81469 /* libDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
5BCA8D082148372200C81469 /* libRNDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
5BCA8D0A2148373700C81469 /* libRNDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
5BCA8D0C2148379700C81469 /* libRNDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
5BCA8D0E2148380500C81469 /* libRNDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
5BCA8D102148398900C81469 /* libRNDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
5BD54664212F58B6005A1D38 /* DatePicker.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DatePicker.xcodeproj; path = ../node_modules/iosPicker/DatePicker.xcodeproj; sourceTree = "<group>"; }; 5BD54664212F58B6005A1D38 /* DatePicker.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DatePicker.xcodeproj; path = ../node_modules/iosPicker/DatePicker.xcodeproj; sourceTree = "<group>"; };
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
62D581CB2FE141BD93E3BDEC /* datepickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = datepickerTests.xctest; sourceTree = "<group>"; }; 62D581CB2FE141BD93E3BDEC /* datepickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = datepickerTests.xctest; sourceTree = "<group>"; };
@ -365,11 +371,11 @@
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
82D6622A3FE241129BEFC1AB /* libDatePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libDatePicker.a; sourceTree = "<group>"; }; 82D6622A3FE241129BEFC1AB /* libDatePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libDatePicker.a; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
8E735C153B6847FA8230A60F /* RNDatePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDatePicker.xcodeproj; path = "../node_modules/react-native-date-picker/ios/RNDatePicker.xcodeproj"; sourceTree = "<group>"; };
96F289FB785A45A0AB87F2A6 /* libDatePicker-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libDatePicker-tvOS.a"; sourceTree = "<group>"; }; 96F289FB785A45A0AB87F2A6 /* libDatePicker-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libDatePicker-tvOS.a"; sourceTree = "<group>"; };
ACBEF59FB76B4DA396910134 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; }; ACBEF59FB76B4DA396910134 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
B5CC7D0F452041D19A995B59 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; }; B5CC7D0F452041D19A995B59 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; };
BEE75557964943A593A20B4C /* DatePickerX.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = DatePickerX.xcodeproj; path = "../node_modules/react-native-date-picker-x/ios/DatePickerX.xcodeproj"; sourceTree = "<group>"; };
BFBCDF28AC82400D8445D24D /* datepicker-tvOS.app */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "datepicker-tvOS.app"; sourceTree = "<group>"; }; BFBCDF28AC82400D8445D24D /* datepicker-tvOS.app */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "datepicker-tvOS.app"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -386,6 +392,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
5BCA8D4B214839F100C81469 /* libRNDatePicker.a in Frameworks */,
5B5A67062134936200599381 /* libRNDeviceInfo.a in Frameworks */, 5B5A67062134936200599381 /* libRNDeviceInfo.a in Frameworks */,
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
@ -400,7 +407,6 @@
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
19D8B17D0461408D86F34238 /* libDatePickerX.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -526,16 +532,22 @@
2D16E6871FA4F8E400B85C8A /* Frameworks */ = { 2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5BCA8D102148398900C81469 /* libRNDatePicker.a */,
5BCA8D0E2148380500C81469 /* libRNDatePicker.a */,
5BCA8D0C2148379700C81469 /* libRNDatePicker.a */,
5BCA8D0A2148373700C81469 /* libRNDatePicker.a */,
5BCA8D082148372200C81469 /* libRNDatePicker.a */,
5BCA8D00214833B700C81469 /* libDatePicker.a */,
5BD54664212F58B6005A1D38 /* DatePicker.xcodeproj */, 5BD54664212F58B6005A1D38 /* DatePicker.xcodeproj */,
2D16E6891FA4F8E400B85C8A /* libReact.a */, 2D16E6891FA4F8E400B85C8A /* libReact.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
5B5A66862130BD1300599381 /* Products */ = {
5BCA8D1F214839D500C81469 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5B5A668B2130BD1300599381 /* libDatePickerX.a */,
5BCA8D48214839D500C81469 /* libRNDatePicker.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@ -609,7 +621,7 @@
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
ACBEF59FB76B4DA396910134 /* RNDeviceInfo.xcodeproj */, ACBEF59FB76B4DA396910134 /* RNDeviceInfo.xcodeproj */,
BEE75557964943A593A20B4C /* DatePickerX.xcodeproj */,
8E735C153B6847FA8230A60F /* RNDatePicker.xcodeproj */,
); );
name = Libraries; name = Libraries;
sourceTree = "<group>"; sourceTree = "<group>";
@ -729,10 +741,6 @@
ProductGroup = 5BD54665212F58B6005A1D38 /* Products */; ProductGroup = 5BD54665212F58B6005A1D38 /* Products */;
ProjectRef = 5BD54664212F58B6005A1D38 /* DatePicker.xcodeproj */; ProjectRef = 5BD54664212F58B6005A1D38 /* DatePicker.xcodeproj */;
}, },
{
ProductGroup = 5B5A66862130BD1300599381 /* Products */;
ProjectRef = BEE75557964943A593A20B4C /* DatePickerX.xcodeproj */;
},
{ {
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@ -781,6 +789,10 @@
ProductGroup = 146834001AC3E56700842450 /* Products */; ProductGroup = 146834001AC3E56700842450 /* Products */;
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
}, },
{
ProductGroup = 5BCA8D1F214839D500C81469 /* Products */;
ProjectRef = 8E735C153B6847FA8230A60F /* RNDatePicker.xcodeproj */;
},
{ {
ProductGroup = 5BD54654212F465F005A1D38 /* Products */; ProductGroup = 5BD54654212F465F005A1D38 /* Products */;
ProjectRef = ACBEF59FB76B4DA396910134 /* RNDeviceInfo.xcodeproj */; ProjectRef = ACBEF59FB76B4DA396910134 /* RNDeviceInfo.xcodeproj */;
@ -1019,11 +1031,11 @@
remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */; remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
5B5A668B2130BD1300599381 /* libDatePickerX.a */ = {
5BCA8D48214839D500C81469 /* libRNDatePicker.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = libDatePickerX.a;
remoteRef = 5B5A668A2130BD1300599381 /* PBXContainerItemProxy */;
path = libRNDatePicker.a;
remoteRef = 5BCA8D47214839D500C81469 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
5BD54659212F465F005A1D38 /* libRNDeviceInfo.a */ = { 5BD54659212F465F005A1D38 /* libRNDeviceInfo.a */ = {
@ -1182,6 +1194,7 @@
"$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker", "$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker",
"$(SRCROOT)/../node_modules/date-picker/ios/DatePicker", "$(SRCROOT)/../node_modules/date-picker/ios/DatePicker",
"$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX", "$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX",
"$(SRCROOT)/../node_modules/react-native-date-picker/ios/DatePickerX",
); );
INFOPLIST_FILE = DatePickerExampleTests/Info.plist; INFOPLIST_FILE = DatePickerExampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@ -1219,6 +1232,7 @@
"$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker", "$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker",
"$(SRCROOT)/../node_modules/date-picker/ios/DatePicker", "$(SRCROOT)/../node_modules/date-picker/ios/DatePicker",
"$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX", "$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX",
"$(SRCROOT)/../node_modules/react-native-date-picker/ios/DatePickerX",
); );
INFOPLIST_FILE = DatePickerExampleTests/Info.plist; INFOPLIST_FILE = DatePickerExampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@ -1258,6 +1272,7 @@
"$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker", "$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker",
"$(SRCROOT)/../node_modules/date-picker/ios/DatePicker", "$(SRCROOT)/../node_modules/date-picker/ios/DatePicker",
"$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX", "$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX",
"$(SRCROOT)/../node_modules/react-native-date-picker/ios/DatePickerX",
); );
INFOPLIST_FILE = DatePickerExample/Info.plist; INFOPLIST_FILE = DatePickerExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@ -1283,6 +1298,7 @@
"$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker", "$(SRCROOT)/../node_modules/react-native-datepicker/ios/datepicker",
"$(SRCROOT)/../node_modules/date-picker/ios/DatePicker", "$(SRCROOT)/../node_modules/date-picker/ios/DatePicker",
"$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX", "$(SRCROOT)/../node_modules/react-native-date-picker-x/ios/DatePickerX",
"$(SRCROOT)/../node_modules/react-native-date-picker/ios/DatePickerX",
); );
INFOPLIST_FILE = DatePickerExample/Info.plist; INFOPLIST_FILE = DatePickerExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

+ 15
- 0
example/ios/DatePickerExample/Images.xcassets/AppIcon.appiconset/Contents.json View File

@ -1,5 +1,15 @@
{ {
"images" : [ "images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "29x29", "size" : "29x29",
@ -29,6 +39,11 @@
"idiom" : "iphone", "idiom" : "iphone",
"size" : "60x60", "size" : "60x60",
"scale" : "3x" "scale" : "3x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
} }
], ],
"info" : { "info" : {

+ 1
- 1
example/package.json View File

@ -10,7 +10,7 @@
"moment": "^2.22.1", "moment": "^2.22.1",
"react": "16.4.1", "react": "16.4.1",
"react-native": "0.56.0", "react-native": "0.56.0",
"react-native-date-picker-x": "^1.4.1",
"react-native-date-picker": "^2.0.0",
"react-native-device-info": "^0.22.5" "react-native-device-info": "^0.22.5"
}, },
"devDependencies": { "devDependencies": {

+ 1
- 1
example/src/examples/Advanced.js View File

@ -1,6 +1,6 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { StyleSheet, Text, View } from 'react-native'; import { StyleSheet, Text, View } from 'react-native';
import DatePicker from 'react-native-date-picker-x';
import DatePicker from 'react-native-date-picker';
import DeviceInfo from 'react-native-device-info'; import DeviceInfo from 'react-native-device-info';
import DateChange from '../propPickers/DateChange'; import DateChange from '../propPickers/DateChange';
import FadeToColor from '../propPickers/FadeToColor'; import FadeToColor from '../propPickers/FadeToColor';

+ 1
- 3
example/src/examples/DateMode.js View File

@ -1,5 +1,5 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import DatePicker from 'react-native-date-picker-x';
import DatePicker from 'react-native-date-picker';
export default class DateMode extends Component { export default class DateMode extends Component {
@ -10,8 +10,6 @@ export default class DateMode extends Component {
date={this.state.date} date={this.state.date}
onDateChange={date => this.setState({ date })} onDateChange={date => this.setState({ date })}
mode={'date'} mode={'date'}
style={{borderWidth: 1}}
locale={'sv-SE'}
/> />
} }

+ 1
- 1
example/src/examples/Minimal.js View File

@ -1,5 +1,5 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import DatePicker from 'react-native-date-picker-x';
import DatePicker from 'react-native-date-picker';
export default class MinimalExample extends Component { export default class MinimalExample extends Component {

+ 1
- 1
example/src/examples/TimeMode.js View File

@ -1,5 +1,5 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import DatePicker from 'react-native-date-picker-x';
import DatePicker from 'react-native-date-picker';
export default class TimeMode extends Component { export default class TimeMode extends Component {

+ 3
- 3
example/yarn.lock View File

@ -4271,9 +4271,9 @@ react-is@^16.3.1:
version "16.3.1" version "16.3.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.1.tgz#ee66e6d8283224a83b3030e110056798488359ba" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.1.tgz#ee66e6d8283224a83b3030e110056798488359ba"
react-native-date-picker-x@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/react-native-date-picker-x/-/react-native-date-picker-x-1.4.1.tgz#7484fc632767a606fcd239165b614cb3dbbf8b27"
react-native-date-picker@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/react-native-date-picker/-/react-native-date-picker-2.0.0.tgz#a2364e44ecf2bf7deef5da667444674d8b9ddbba"
react-native-device-info@^0.22.5: react-native-device-info@^0.22.5:
version "0.22.5" version "0.22.5"

ios/DatePickerX.xcodeproj/project.pbxproj → ios/RNDatePicker.xcodeproj/project.pbxproj View File

@ -7,7 +7,7 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
5B5A664D2130B82E00599381 /* DatePickerXManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B5A664B2130B82D00599381 /* DatePickerXManager.m */; };
5B5A664D2130B82E00599381 /* RNDatePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B5A664B2130B82D00599381 /* RNDatePickerManager.m */; };
DA5891DC1BA9A9FC002B4DB2 /* DatePicker.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA5891DB1BA9A9FC002B4DB2 /* DatePicker.h */; }; DA5891DC1BA9A9FC002B4DB2 /* DatePicker.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA5891DB1BA9A9FC002B4DB2 /* DatePicker.h */; };
DA5891DE1BA9A9FC002B4DB2 /* DatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5891DD1BA9A9FC002B4DB2 /* DatePicker.m */; }; DA5891DE1BA9A9FC002B4DB2 /* DatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5891DD1BA9A9FC002B4DB2 /* DatePicker.m */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -26,9 +26,9 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
5B5A664B2130B82D00599381 /* DatePickerXManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatePickerXManager.m; sourceTree = "<group>"; };
5B5A664C2130B82E00599381 /* DatePickerXManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePickerXManager.h; sourceTree = "<group>"; };
DA5891D81BA9A9FC002B4DB2 /* libDatePickerX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDatePickerX.a; sourceTree = BUILT_PRODUCTS_DIR; };
5B5A664B2130B82D00599381 /* RNDatePickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNDatePickerManager.m; sourceTree = "<group>"; };
5B5A664C2130B82E00599381 /* RNDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNDatePickerManager.h; sourceTree = "<group>"; };
DA5891D81BA9A9FC002B4DB2 /* libRNDatePicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNDatePicker.a; sourceTree = BUILT_PRODUCTS_DIR; };
DA5891DB1BA9A9FC002B4DB2 /* DatePicker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatePicker.h; sourceTree = "<group>"; }; DA5891DB1BA9A9FC002B4DB2 /* DatePicker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatePicker.h; sourceTree = "<group>"; };
DA5891DD1BA9A9FC002B4DB2 /* DatePicker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatePicker.m; sourceTree = "<group>"; }; DA5891DD1BA9A9FC002B4DB2 /* DatePicker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatePicker.m; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -47,7 +47,7 @@
DA5891CF1BA9A9FC002B4DB2 = { DA5891CF1BA9A9FC002B4DB2 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
DA5891DA1BA9A9FC002B4DB2 /* DatePickerX */,
DA5891DA1BA9A9FC002B4DB2 /* RNDatePicker */,
DA5891D91BA9A9FC002B4DB2 /* Products */, DA5891D91BA9A9FC002B4DB2 /* Products */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
@ -55,28 +55,28 @@
DA5891D91BA9A9FC002B4DB2 /* Products */ = { DA5891D91BA9A9FC002B4DB2 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
DA5891D81BA9A9FC002B4DB2 /* libDatePickerX.a */,
DA5891D81BA9A9FC002B4DB2 /* libRNDatePicker.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
DA5891DA1BA9A9FC002B4DB2 /* DatePickerX */ = {
DA5891DA1BA9A9FC002B4DB2 /* RNDatePicker */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5B5A664C2130B82E00599381 /* DatePickerXManager.h */,
5B5A664B2130B82D00599381 /* DatePickerXManager.m */,
5B5A664C2130B82E00599381 /* RNDatePickerManager.h */,
5B5A664B2130B82D00599381 /* RNDatePickerManager.m */,
DA5891DB1BA9A9FC002B4DB2 /* DatePicker.h */, DA5891DB1BA9A9FC002B4DB2 /* DatePicker.h */,
DA5891DD1BA9A9FC002B4DB2 /* DatePicker.m */, DA5891DD1BA9A9FC002B4DB2 /* DatePicker.m */,
); );
path = DatePickerX;
path = RNDatePicker;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
DA5891D71BA9A9FC002B4DB2 /* DatePickerX */ = {
DA5891D71BA9A9FC002B4DB2 /* RNDatePicker */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = DA5891E11BA9A9FC002B4DB2 /* Build configuration list for PBXNativeTarget "DatePickerX" */;
buildConfigurationList = DA5891E11BA9A9FC002B4DB2 /* Build configuration list for PBXNativeTarget "RNDatePicker" */;
buildPhases = ( buildPhases = (
DA5891D41BA9A9FC002B4DB2 /* Sources */, DA5891D41BA9A9FC002B4DB2 /* Sources */,
DA5891D51BA9A9FC002B4DB2 /* Frameworks */, DA5891D51BA9A9FC002B4DB2 /* Frameworks */,
@ -86,9 +86,9 @@
); );
dependencies = ( dependencies = (
); );
name = DatePickerX;
name = RNDatePicker;
productName = RNDeviceInfo; productName = RNDeviceInfo;
productReference = DA5891D81BA9A9FC002B4DB2 /* libDatePickerX.a */;
productReference = DA5891D81BA9A9FC002B4DB2 /* libRNDatePicker.a */;
productType = "com.apple.product-type.library.static"; productType = "com.apple.product-type.library.static";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@ -105,7 +105,7 @@
}; };
}; };
}; };
buildConfigurationList = DA5891D31BA9A9FC002B4DB2 /* Build configuration list for PBXProject "DatePickerX" */;
buildConfigurationList = DA5891D31BA9A9FC002B4DB2 /* Build configuration list for PBXProject "RNDatePicker" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
@ -117,7 +117,7 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
DA5891D71BA9A9FC002B4DB2 /* DatePickerX */,
DA5891D71BA9A9FC002B4DB2 /* RNDatePicker */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@ -128,7 +128,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
DA5891DE1BA9A9FC002B4DB2 /* DatePicker.m in Sources */, DA5891DE1BA9A9FC002B4DB2 /* DatePicker.m in Sources */,
5B5A664D2130B82E00599381 /* DatePickerXManager.m in Sources */,
5B5A664D2130B82E00599381 /* RNDatePickerManager.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -252,7 +252,7 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
DA5891D31BA9A9FC002B4DB2 /* Build configuration list for PBXProject "DatePickerX" */ = {
DA5891D31BA9A9FC002B4DB2 /* Build configuration list for PBXProject "RNDatePicker" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
DA5891DF1BA9A9FC002B4DB2 /* Debug */, DA5891DF1BA9A9FC002B4DB2 /* Debug */,
@ -261,7 +261,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
DA5891E11BA9A9FC002B4DB2 /* Build configuration list for PBXNativeTarget "DatePickerX" */ = {
DA5891E11BA9A9FC002B4DB2 /* Build configuration list for PBXNativeTarget "RNDatePicker" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
DA5891E21BA9A9FC002B4DB2 /* Debug */, DA5891E21BA9A9FC002B4DB2 /* Debug */,

ios/DatePickerX.xcodeproj/project.xcworkspace/contents.xcworkspacedata → ios/RNDatePicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File

@ -2,6 +2,6 @@
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef <FileRef
location = "self:/Users/henninghall/Projects/react-native-date-picker/example/node_modules/react-native-date-picker-x/ios/DatePickerX.xcodeproj">
location = "self:/Users/henninghall/Projects/react-native-date-picker/example/node_modules/react-native-date-picker-x/ios/DatePicker.xcodeproj">
</FileRef> </FileRef>
</Workspace> </Workspace>

ios/DatePickerX/DatePicker.h → ios/RNDatePicker/DatePicker.h View File


ios/DatePickerX/DatePicker.m → ios/RNDatePicker/DatePicker.m View File


ios/DatePickerX/DatePickerXManager.h → ios/RNDatePicker/RNDatePickerManager.h View File

@ -14,6 +14,6 @@
@end @end
@interface DatePickerXManager : RCTViewManager
@interface RNDatePickerManager : RCTViewManager
@end @end

ios/DatePickerX/DatePickerXManager.m → ios/RNDatePicker/RNDatePickerManager.m View File

@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
#import "DatePickerXManager.h"
#import "RNDatePickerManager.h"
#import "DatePicker.h" #import "DatePicker.h"
@ -22,7 +22,7 @@ RCT_ENUM_CONVERTER(UIDatePickerMode, (@{
@end @end
@implementation DatePickerXManager
@implementation RNDatePickerManager
RCT_EXPORT_MODULE() RCT_EXPORT_MODULE()

Loading…
Cancel
Save