From c23f4ba1e5ff6c91e17817ea6449b1ce99ef8523 Mon Sep 17 00:00:00 2001 From: Ran Greenberg Date: Sun, 31 Dec 2017 17:53:03 +0200 Subject: [PATCH 1/2] fix images name --- example/src/screens/Actions.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/example/src/screens/Actions.js b/example/src/screens/Actions.js index 6e2406d73f8..b00f2b76128 100644 --- a/example/src/screens/Actions.js +++ b/example/src/screens/Actions.js @@ -124,19 +124,19 @@ class Actions extends React.Component { this.props.navigator.setButtons({ fab: { collapsedId: 'share', - collapsedIcon: require('../../img/edit@1x.png'), + collapsedIcon: require('../../img/edit.png'), expendedId: 'clear', - expendedIcon: require('../../img/edit@1x.png'), + expendedIcon: require('../../img/edit.png'), backgroundColor: '#ff505c', actions: [ { id: 'mail', - icon: require('../../img/edit@1x.png'), + icon: require('../../img/edit.png'), backgroundColor: '#03A9F4' }, { id: 'delete', - icon: require('../../img/delete@1x.png'), + icon: require('../../img/delete.png'), backgroundColor: '#4CAF50' } ] From 49cfd4751241c3615dd41d23ab5b80064ee90e82 Mon Sep 17 00:00:00 2001 From: Ran Greenberg Date: Sun, 31 Dec 2017 17:57:00 +0200 Subject: [PATCH 2/2] upgrade example project to rn51 - ios --- example/ios/example.xcodeproj/project.pbxproj | 122 +++++++++++++++++- example/package.json | 4 +- 2 files changed, 123 insertions(+), 3 deletions(-) diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj index 572f22133ae..02278f2b934 100644 --- a/example/ios/example.xcodeproj/project.pbxproj +++ b/example/ios/example.xcodeproj/project.pbxproj @@ -90,6 +90,62 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; + 26472F051FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DBE0D001F3B181A0099AA32; + remoteInfo = fishhook; + }; + 26472F071FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32; + remoteInfo = "fishhook-tvOS"; + }; + 26472F171FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7; + remoteInfo = "third-party"; + }; + 26472F191FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D383D3C1EBD27B6005632C8; + remoteInfo = "third-party-tvOS"; + }; + 26472F1B1FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 139D7E881E25C6D100323FB7; + remoteInfo = "double-conversion"; + }; + 26472F1D1FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D383D621EBD27B9005632C8; + remoteInfo = "double-conversion-tvOS"; + }; + 26472F1F1FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F3131F5F2E4B0010BF04; + remoteInfo = privatedata; + }; + 26472F211FF93DB800C4F2B0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04; + remoteInfo = "privatedata-tvOS"; + }; 2647D65D1DB175B300B23722 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */; @@ -347,6 +403,8 @@ children = ( 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, 7B9B397F1DEB4076004A6281 /* libRCTWebSocket-tvOS.a */, + 26472F061FF93DB800C4F2B0 /* libfishhook.a */, + 26472F081FF93DB800C4F2B0 /* libfishhook-tvOS.a */, ); name = Products; sourceTree = ""; @@ -376,6 +434,12 @@ 7BFF942D1E5F10F20054957C /* libcxxreact.a */, 7BFF942F1E5F10F20054957C /* libjschelpers.a */, 7BFF94311E5F10F20054957C /* libjschelpers.a */, + 26472F181FF93DB800C4F2B0 /* libthird-party.a */, + 26472F1A1FF93DB800C4F2B0 /* libthird-party.a */, + 26472F1C1FF93DB800C4F2B0 /* libdouble-conversion.a */, + 26472F1E1FF93DB800C4F2B0 /* libdouble-conversion.a */, + 26472F201FF93DB800C4F2B0 /* libprivatedata.a */, + 26472F221FF93DB800C4F2B0 /* libprivatedata-tvOS.a */, ); name = Products; sourceTree = ""; @@ -635,6 +699,62 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 26472F061FF93DB800C4F2B0 /* libfishhook.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libfishhook.a; + remoteRef = 26472F051FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F081FF93DB800C4F2B0 /* libfishhook-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libfishhook-tvOS.a"; + remoteRef = 26472F071FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F181FF93DB800C4F2B0 /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 26472F171FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F1A1FF93DB800C4F2B0 /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 26472F191FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F1C1FF93DB800C4F2B0 /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 26472F1B1FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F1E1FF93DB800C4F2B0 /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 26472F1D1FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F201FF93DB800C4F2B0 /* libprivatedata.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprivatedata.a; + remoteRef = 26472F1F1FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 26472F221FF93DB800C4F2B0 /* libprivatedata-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libprivatedata-tvOS.a"; + remoteRef = 26472F211FF93DB800C4F2B0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -795,7 +915,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh"; + shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/example/package.json b/example/package.json index 8ba4dc3dd98..eaa3a1c9f3d 100644 --- a/example/package.json +++ b/example/package.json @@ -11,8 +11,8 @@ "e2e-release": "detox test --configuration ios.sim.release" }, "dependencies": { - "react": "16.0.0-alpha.12", - "react-native": "0.45.1", + "react": "16.0.0", + "react-native": "0.51.0", "react-native-animatable": "^1.1.0", "react-native-navigation": "latest" },