From 6165bf5d61d0b2556b6b5da05f745a8efbeb458b Mon Sep 17 00:00:00 2001 From: Manatsawin Hanmongkolchai Date: Fri, 6 May 2016 00:45:19 +0700 Subject: [PATCH] Fixed iOS compilation issues --- components/Layout/view.js | 22 +++---- components/Slide/view.js | 4 +- ios/Koan Deck | 1 + ios/koandeck.xcodeproj/project.pbxproj | 61 +++++++++++++------ .../xcshareddata/xcschemes/koandeck.xcscheme | 2 +- ios/koandeck/AppDelegate.m | 4 +- 6 files changed, 60 insertions(+), 34 deletions(-) create mode 120000 ios/Koan Deck diff --git a/components/Layout/view.js b/components/Layout/view.js index 8cde770..aa43c2b 100644 --- a/components/Layout/view.js +++ b/components/Layout/view.js @@ -18,7 +18,7 @@ var styles = StyleSheet.create({ item: { flex: 1, padding: 10, - height: 50, + justifyContent: 'center', }, }); @@ -26,26 +26,26 @@ export default class ImagePicker extends Component { render(){ let current = this.props.route.slide.layout; return ( - + Layout - Top left - Top center - Top right + Top left + Top center + Top right - Middle left - Middle center - Middle right + Middle left + Middle center + Middle right - Bottom left - Bottom center - Bottom right + Bottom left + Bottom center + Bottom right ) diff --git a/components/Slide/view.js b/components/Slide/view.js index 3f8ce23..09e64cd 100644 --- a/components/Slide/view.js +++ b/components/Slide/view.js @@ -102,12 +102,12 @@ export default class Slide extends Component { this.setState({text1: text})} />, this.setState({text2: text})} /> ]; }else{ diff --git a/ios/Koan Deck b/ios/Koan Deck new file mode 120000 index 0000000..9876583 --- /dev/null +++ b/ios/Koan Deck @@ -0,0 +1 @@ +koandeck \ No newline at end of file diff --git a/ios/koandeck.xcodeproj/project.pbxproj b/ios/koandeck.xcodeproj/project.pbxproj index dc71caa..e27069f 100644 --- a/ios/koandeck.xcodeproj/project.pbxproj +++ b/ios/koandeck.xcodeproj/project.pbxproj @@ -19,11 +19,11 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; + 32904D0CFE024B09A25077CC /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CCC9171028478882ACD222 /* libRealmReact.a */; }; + 44639F57D9634963BEB36B6A /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BDB100F5F46A4FC1ACD8E370 /* libc++.tbd */; }; + 7DC7FF86D2DA46A6842754F1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 98659FC36D8042E2964D4BF1 /* libz.tbd */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; BEBFD3F81CA9504500B2BAD7 /* Orientation.m in Sources */ = {isa = PBXBuildFile; fileRef = BEBFD3F71CA9504500B2BAD7 /* Orientation.m */; }; - 32904D0CFE024B09A25077CC /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CCC9171028478882ACD222 /* libRealmReact.a */; }; - 44639F57D9634963BEB36B6A /* libc++.tbd in Resources */ = {isa = PBXBuildFile; fileRef = BDB100F5F46A4FC1ACD8E370 /* libc++.tbd */; }; - 7DC7FF86D2DA46A6842754F1 /* libz.tbd in Resources */ = {isa = PBXBuildFile; fileRef = 98659FC36D8042E2964D4BF1 /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -97,6 +97,13 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; + BEED3EC01CDBB89000464277 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D1B66430C7024040B4FA45FA /* RealmReact.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F60690131CA2766F0003FB26; + remoteInfo = RealmReact; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -118,14 +125,14 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = koandeck/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = koandeck/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; + 25CCC9171028478882ACD222 /* libRealmReact.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmReact.a; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; + 98659FC36D8042E2964D4BF1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + BDB100F5F46A4FC1ACD8E370 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; BEBFD3F61CA9504500B2BAD7 /* Orientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Orientation.h; sourceTree = ""; }; BEBFD3F71CA9504500B2BAD7 /* Orientation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Orientation.m; sourceTree = ""; }; - D1B66430C7024040B4FA45FA /* RealmReact.xcodeproj */ = {isa = PBXFileReference; name = "RealmReact.xcodeproj"; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - 25CCC9171028478882ACD222 /* libRealmReact.a */ = {isa = PBXFileReference; name = "libRealmReact.a"; path = "libRealmReact.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; - BDB100F5F46A4FC1ACD8E370 /* libc++.tbd */ = {isa = PBXFileReference; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; - 98659FC36D8042E2964D4BF1 /* libz.tbd */ = {isa = PBXFileReference; name = "libz.tbd"; path = "usr/lib/libz.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; + D1B66430C7024040B4FA45FA /* RealmReact.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RealmReact.xcodeproj; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -144,8 +151,8 @@ 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, 32904D0CFE024B09A25077CC /* libRealmReact.a in Frameworks */, - 44639F57D9634963BEB36B6A /* libc++.tbd in Resources */, - 7DC7FF86D2DA46A6842754F1 /* libz.tbd in Resources */, + 44639F57D9634963BEB36B6A /* libc++.tbd in Frameworks */, + 7DC7FF86D2DA46A6842754F1 /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -312,6 +319,14 @@ path = RCTOrientation; sourceTree = ""; }; + BEED3EB31CDBB89000464277 /* Products */ = { + isa = PBXGroup; + children = ( + BEED3EC11CDBB89000464277 /* libRealmReact.a */, + ); + name = Products; + sourceTree = ""; + }; CB785603E47A489DA53253EE /* Frameworks */ = { isa = PBXGroup; children = ( @@ -319,7 +334,6 @@ 98659FC36D8042E2964D4BF1 /* libz.tbd */, ); name = Frameworks; - path = ""; sourceTree = ""; }; /* End PBXGroup section */ @@ -409,6 +423,10 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, + { + ProductGroup = BEED3EB31CDBB89000464277 /* Products */; + ProjectRef = D1B66430C7024040B4FA45FA /* RealmReact.xcodeproj */; + }, ); projectRoot = ""; targets = ( @@ -488,6 +506,13 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + BEED3EC11CDBB89000464277 /* libRealmReact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRealmReact.a; + remoteRef = BEED3EC01CDBB89000464277 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -559,14 +584,14 @@ ); INFOPLIST_FILE = koandeck/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = th.in.whs.koandeck; - PRODUCT_NAME = "Koan Deck"; - TARGETED_DEVICE_FAMILY = "1,2"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Koan Deck\"", ); + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = th.in.whs.koandeck; + PRODUCT_NAME = "Koan Deck"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -583,14 +608,14 @@ ); INFOPLIST_FILE = koandeck/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = th.in.whs.koandeck; - PRODUCT_NAME = "Koan Deck"; - TARGETED_DEVICE_FAMILY = "1,2"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Koan Deck\"", ); + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = th.in.whs.koandeck; + PRODUCT_NAME = "Koan Deck"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/ios/koandeck.xcodeproj/xcshareddata/xcschemes/koandeck.xcscheme b/ios/koandeck.xcodeproj/xcshareddata/xcschemes/koandeck.xcscheme index 0e356c0..fd531ea 100644 --- a/ios/koandeck.xcodeproj/xcshareddata/xcschemes/koandeck.xcscheme +++ b/ios/koandeck.xcodeproj/xcshareddata/xcschemes/koandeck.xcscheme @@ -66,7 +66,7 @@