From 6d22bde307550297011b7fb3a9f88aa4207ea0b1 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Tue, 28 Nov 2017 16:34:52 -0500 Subject: [PATCH 1/8] Changing dependency to use the PocketSVG pod --- ios/RCTARKit.xcodeproj/project.pbxproj | 18 ++---------------- package.json | 4 +++- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/ios/RCTARKit.xcodeproj/project.pbxproj b/ios/RCTARKit.xcodeproj/project.pbxproj index 83870aa..962b123 100644 --- a/ios/RCTARKit.xcodeproj/project.pbxproj +++ b/ios/RCTARKit.xcodeproj/project.pbxproj @@ -61,8 +61,6 @@ 10FEF6121F774C9000EC21AE /* RCTARKitNodes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTARKitNodes.m; sourceTree = ""; }; 10FEF6131F774C9000EC21AE /* RCTARKitDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTARKitDelegate.h; sourceTree = ""; }; 134814201AA4EA6300B7C361 /* libRCTARKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTARKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; - B14C36631F960C500047CB67 /* PocketSVG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PocketSVG.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - B14C36651F960C6E0047CB67 /* PocketSVG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PocketSVG.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B3E7B5881CC2AC0600A0062D /* RCTARKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTARKit.h; sourceTree = ""; }; B3E7B5891CC2AC0600A0062D /* RCTARKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTARKit.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -119,19 +117,9 @@ 105F124C1F7C0718006D4BA3 /* RCTConvert+ARKit.h */, 105F124D1F7C0718006D4BA3 /* RCTConvert+ARKit.m */, 134814211AA4EA7D00B7C361 /* Products */, - B13FF7601F94F72400A6C92B /* Frameworks */, ); sourceTree = ""; }; - B13FF7601F94F72400A6C92B /* Frameworks */ = { - isa = PBXGroup; - children = ( - B14C36651F960C6E0047CB67 /* PocketSVG.framework */, - B14C36631F960C500047CB67 /* PocketSVG.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -291,8 +279,7 @@ "$(SRCROOT)/../../react-native-arcl/ios", ../../../ios/Pods/Headers/Public/, ../../../ios/Pods/Headers/Public/React, - "$(SRCROOT)/../../_PocketSVG/**", - "../node_modules/_PocketSVG/**", + "$(SRCROOT)/../../../ios/Pods/PocketSVG/**", ); IPHONEOS_DEPLOYMENT_TARGET = 11.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -314,8 +301,7 @@ "$(SRCROOT)/../../react-native-arcl/ios", ../../../ios/Pods/Headers/Public/, ../../../ios/Pods/Headers/Public/React, - "$(SRCROOT)/../../_PocketSVG/**", - "../node_modules/_PocketSVG/**", + "$(SRCROOT)/../../../ios/Pods/PocketSVG/**", ); IPHONEOS_DEPLOYMENT_TARGET = 11.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; diff --git a/package.json b/package.json index 5276627..64f014e 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ }, "dependencies": { "@panter/react-animation-frame": "^0.3.7", - "_PocketSVG": "https://github.com/pocketsvg/PocketSVG", "fast-deep-equal": "^1.0.0", "lodash": "^4.17.4", "prop-types": "^15.5.7" @@ -40,5 +39,8 @@ "prettier": "^1.3.1", "react": "16.0.0-alpha.12", "prop-types": "^15.5.8" + }, + "pods": { + "PocketSVG": "*" } } From 908925e5b8aa837090246f600f6bc0052b80124d Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Tue, 28 Nov 2017 16:59:33 -0500 Subject: [PATCH 2/8] Adding react-native-pod peer dependency --- package.json | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 64f014e..687f79f 100644 --- a/package.json +++ b/package.json @@ -9,15 +9,22 @@ "author": "Zehao Li ", "license": "MIT", "homepage": "https://github.com/HippoAR/react-native-arkit", - "keywords": ["react-native", "react", "native", "ARKit", "AR"], + "keywords": [ + "react-native", + "react", + "native", + "ARKit", + "AR" + ], "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, "peerDependencies": { - "react-native": ">=0.46.0", + "prop-types": "*", "react": "*", - "prop-types": "*" + "react-native": ">=0.46.0", + "react-native-pod": "^1.1.0" }, "dependencies": { "@panter/react-animation-frame": "^0.3.7", @@ -37,9 +44,9 @@ "eslint-plugin-prettier": "^2.1.1", "eslint-plugin-react": "^7.0.1", "prettier": "^1.3.1", - "react": "16.0.0-alpha.12", - "prop-types": "^15.5.8" - }, + "prop-types": "^15.5.8", + "react": "16.0.0-alpha.12" + }, "pods": { "PocketSVG": "*" } From 699e26acfd2c08708f116ca0a478096536e35f9f Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Wed, 6 Dec 2017 17:30:48 -0500 Subject: [PATCH 3/8] Adding sample app code --- appsample/App.js | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 appsample/App.js diff --git a/appsample/App.js b/appsample/App.js new file mode 100644 index 0000000..3abb538 --- /dev/null +++ b/appsample/App.js @@ -0,0 +1,124 @@ +import React, { Component } from 'react'; +import { AppRegistry, View , NativeModules} from 'react-native'; +import { ARKit } from 'react-native-arkit'; +export default class App extends Component { + constructor() { + super(); + this.state = { + text: "beginning text" + } + setTimeout(()=>{ + this.setState(()=>{ + return {text:"He's OK"} + }); + }, 5000) + } + componentDidMount() { + this.setState(()=> { + return {text: "Wilkimg is the best!"} + }) + + } + render() { + return ( + + console.log(e.nativeEvent)} + onPlaneDetected={console.log} // event listener for plane detection + onPlaneUpdate={console.log} // event listener for plane update + > + + + + + + + + + + + + + + + + `, + pathFlatness: 0.1, + // it's also possible to specify a chamfer profile: + chamferRadius: 5, + chamferProfilePathSvg: ` + + `, + extrusion: 10, + }} + /> + + + ); + } +} From 582a9a41214b03f0cc3cb88f1f93218b0c203dc9 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Thu, 7 Dec 2017 16:11:22 -0500 Subject: [PATCH 4/8] Adding sample app for make-demo --- sampleapp/App.js | 124 +++++++++++++++++++++++++++++++++++++++++ sampleapp/package.json | 29 ++++++++++ 2 files changed, 153 insertions(+) create mode 100644 sampleapp/App.js create mode 100644 sampleapp/package.json diff --git a/sampleapp/App.js b/sampleapp/App.js new file mode 100644 index 0000000..3abb538 --- /dev/null +++ b/sampleapp/App.js @@ -0,0 +1,124 @@ +import React, { Component } from 'react'; +import { AppRegistry, View , NativeModules} from 'react-native'; +import { ARKit } from 'react-native-arkit'; +export default class App extends Component { + constructor() { + super(); + this.state = { + text: "beginning text" + } + setTimeout(()=>{ + this.setState(()=>{ + return {text:"He's OK"} + }); + }, 5000) + } + componentDidMount() { + this.setState(()=> { + return {text: "Wilkimg is the best!"} + }) + + } + render() { + return ( + + console.log(e.nativeEvent)} + onPlaneDetected={console.log} // event listener for plane detection + onPlaneUpdate={console.log} // event listener for plane update + > + + + + + + + + + + + + + + + + `, + pathFlatness: 0.1, + // it's also possible to specify a chamfer profile: + chamferRadius: 5, + chamferProfilePathSvg: ` + + `, + extrusion: 10, + }} + /> + + + ); + } +} diff --git a/sampleapp/package.json b/sampleapp/package.json new file mode 100644 index 0000000..d3a0af1 --- /dev/null +++ b/sampleapp/package.json @@ -0,0 +1,29 @@ +{ + "name": "testapp2", + "version": "0.0.1", + "private": true, + "scripts": { + "start": "node node_modules/react-native/local-cli/cli.js start", + "test": "jest" + }, + "dependencies": { + "react": "16.0.0", + "react-native": "0.51.0", + "react-native-arkit": "../Github/react-native-arkit", + "react-native-bundlebase": "^1.0.0", + "react-native-camera-ios-enable": "^1.0.0", + "react-native-fix-ios-version": "^1.0.0", + "react-native-make-demo-app": "../GitHub/react-native-make-demo-app/", + "react-native-pod": "^1.2.0", + "react-native-runios-withdevteam": "^1.2.0" + }, + "devDependencies": { + "babel-jest": "21.2.0", + "babel-preset-react-native": "4.0.0", + "jest": "21.2.1", + "react-test-renderer": "16.0.0" + }, + "jest": { + "preset": "react-native" + } +} From fd87a5323d6824c0e2185aa55311d996c441dc27 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Fri, 8 Dec 2017 16:04:24 -0500 Subject: [PATCH 5/8] Fixing sample package.json to remove reference to the make-demo-app --- sampleapp/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/sampleapp/package.json b/sampleapp/package.json index d3a0af1..0932ae8 100644 --- a/sampleapp/package.json +++ b/sampleapp/package.json @@ -9,11 +9,9 @@ "dependencies": { "react": "16.0.0", "react-native": "0.51.0", - "react-native-arkit": "../Github/react-native-arkit", "react-native-bundlebase": "^1.0.0", "react-native-camera-ios-enable": "^1.0.0", "react-native-fix-ios-version": "^1.0.0", - "react-native-make-demo-app": "../GitHub/react-native-make-demo-app/", "react-native-pod": "^1.2.0", "react-native-runios-withdevteam": "^1.2.0" }, From fafdbd2d6ab595c8d384962ab7b1bd571d4c290d Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Sat, 9 Dec 2017 12:15:32 -0500 Subject: [PATCH 6/8] Removing sample app files - adding sample app pointer --- package.json | 1 + sampleapp/App.js | 124 ----------------------------------------- sampleapp/package.json | 27 --------- 3 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 sampleapp/App.js delete mode 100644 sampleapp/package.json diff --git a/package.json b/package.json index 687f79f..f4f5c87 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "type": "git", "url": "https://github.com/HippoAR/react-native-arkit.git" }, + "sampleApp": {"module":"rhdeck/react-native-arkit-sample"} "version": "0.5.5", "description": "React Native binding for iOS ARKit", "author": "Zehao Li ", diff --git a/sampleapp/App.js b/sampleapp/App.js deleted file mode 100644 index 3abb538..0000000 --- a/sampleapp/App.js +++ /dev/null @@ -1,124 +0,0 @@ -import React, { Component } from 'react'; -import { AppRegistry, View , NativeModules} from 'react-native'; -import { ARKit } from 'react-native-arkit'; -export default class App extends Component { - constructor() { - super(); - this.state = { - text: "beginning text" - } - setTimeout(()=>{ - this.setState(()=>{ - return {text:"He's OK"} - }); - }, 5000) - } - componentDidMount() { - this.setState(()=> { - return {text: "Wilkimg is the best!"} - }) - - } - render() { - return ( - - console.log(e.nativeEvent)} - onPlaneDetected={console.log} // event listener for plane detection - onPlaneUpdate={console.log} // event listener for plane update - > - - - - - - - - - - - - - - - - `, - pathFlatness: 0.1, - // it's also possible to specify a chamfer profile: - chamferRadius: 5, - chamferProfilePathSvg: ` - - `, - extrusion: 10, - }} - /> - - - ); - } -} diff --git a/sampleapp/package.json b/sampleapp/package.json deleted file mode 100644 index 0932ae8..0000000 --- a/sampleapp/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "testapp2", - "version": "0.0.1", - "private": true, - "scripts": { - "start": "node node_modules/react-native/local-cli/cli.js start", - "test": "jest" - }, - "dependencies": { - "react": "16.0.0", - "react-native": "0.51.0", - "react-native-bundlebase": "^1.0.0", - "react-native-camera-ios-enable": "^1.0.0", - "react-native-fix-ios-version": "^1.0.0", - "react-native-pod": "^1.2.0", - "react-native-runios-withdevteam": "^1.2.0" - }, - "devDependencies": { - "babel-jest": "21.2.0", - "babel-preset-react-native": "4.0.0", - "jest": "21.2.1", - "react-test-renderer": "16.0.0" - }, - "jest": { - "preset": "react-native" - } -} From 70f9338175bf5722de331ccb04170817222cc3a7 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Sat, 9 Dec 2017 12:23:31 -0500 Subject: [PATCH 7/8] Fixing package.json typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4f5c87..25592bc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "type": "git", "url": "https://github.com/HippoAR/react-native-arkit.git" }, - "sampleApp": {"module":"rhdeck/react-native-arkit-sample"} + "sampleApp": {"module":"rhdeck/react-native-arkit-sample"}, "version": "0.5.5", "description": "React Native binding for iOS ARKit", "author": "Zehao Li ", From 66a6eeaab286ee5548b39592ad573555b90d1d26 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Fri, 2 Feb 2018 11:16:08 -0500 Subject: [PATCH 8/8] Adding peer dependency of react-native-fix-ios-version because this requires IOS 11 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 8c9624d..0acce93 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "prop-types": "*", "react": "*", "react-native": ">=0.46.0", + "react-native-fix-ios-version": "^1.4.0", "react-native-pod": "^1.1.0" }, "dependencies": {