From 2c54a06399673f3833032c0451baf5c3e9ccac46 Mon Sep 17 00:00:00 2001 From: michaelr Date: Wed, 23 Mar 2016 17:26:54 +0200 Subject: [PATCH] copied ios folder Former-commit-id: 70235400211f1dc584a5d8d158de2eca39b9a01b --- .../project.pbxproj | 215 +++++++++++++----- .../xcschemes/Messenger.xcscheme} | 49 ++-- .../ios/{SyngIm => Messenger}/AppDelegate.h | 0 .../ios/{SyngIm => Messenger}/AppDelegate.m | 2 +- .../Base.lproj/LaunchScreen.xib | 2 +- .../AppIcon.appiconset/Contents.json | 0 syng-im/ios/{SyngIm => Messenger}/Info.plist | 17 +- syng-im/ios/{SyngIm => Messenger}/main.m | 0 .../Info.plist | 2 +- .../MessengerTests.m} | 4 +- 10 files changed, 196 insertions(+), 95 deletions(-) rename syng-im/ios/{SyngIm.xcodeproj => Messenger.xcodeproj}/project.pbxproj (75%) rename syng-im/ios/{SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme => Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme} (73%) rename syng-im/ios/{SyngIm => Messenger}/AppDelegate.h (100%) rename syng-im/ios/{SyngIm => Messenger}/AppDelegate.m (99%) rename syng-im/ios/{SyngIm => Messenger}/Base.lproj/LaunchScreen.xib (93%) rename syng-im/ios/{SyngIm => Messenger}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename syng-im/ios/{SyngIm => Messenger}/Info.plist (81%) rename syng-im/ios/{SyngIm => Messenger}/main.m (100%) rename syng-im/ios/{SyngImTests => MessengerTests}/Info.plist (89%) rename syng-im/ios/{SyngImTests/SyngImTests.m => MessengerTests/MessengerTests.m} (96%) diff --git a/syng-im/ios/SyngIm.xcodeproj/project.pbxproj b/syng-im/ios/Messenger.xcodeproj/project.pbxproj similarity index 75% rename from syng-im/ios/SyngIm.xcodeproj/project.pbxproj rename to syng-im/ios/Messenger.xcodeproj/project.pbxproj index 2507b89bfe..664e54be92 100644 --- a/syng-im/ios/SyngIm.xcodeproj/project.pbxproj +++ b/syng-im/ios/Messenger.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; - 00E356F31AD99517003FC87E /* SyngImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* SyngImTests.m */; }; + 00E356F31AD99517003FC87E /* MessengerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* MessengerTests.m */; }; 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; @@ -22,6 +22,9 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + E343FE8E1C96F54100C01DB5 /* libRNI18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */; }; + E343FE8F1C96F54A00C01DB5 /* libRCTContacts.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */; }; + E343FE911C971D4200C01DB5 /* Geth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE901C971D4200C01DB5 /* Geth.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -65,7 +68,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = SyngIm; + remoteInfo = Messenger; }; 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -102,30 +105,54 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; + E343FE831C96F4DA00C01DB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1441618E1BD0A79300FA4F59; + remoteInfo = RCTContacts; + }; + E343FE8A1C96F4E200C01DB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = CDD7BF781B2D5125006FDA75; + remoteInfo = RNI18n; + }; + E343FE8C1C96F4E200C01DB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = CDD7BF831B2D5126006FDA75; + remoteInfo = RNI18nTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = main.jsbundle; sourceTree = ""; }; - 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = ""; }; - 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = ""; }; - 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj; sourceTree = ""; }; - 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj; sourceTree = ""; }; - 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = ""; }; - 00E356EE1AD99517003FC87E /* SyngImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyngImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; + 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = ""; }; + 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = ""; }; + 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; + 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; + 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; + 00E356EE1AD99517003FC87E /* MessengerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessengerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* SyngImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SyngImTests.m; sourceTree = ""; }; - 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj; sourceTree = ""; }; - 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* SyngIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SyngIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = SyngIm/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = SyngIm/AppDelegate.m; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* MessengerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessengerTests.m; sourceTree = ""; }; + 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; + 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* Messenger.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Messenger.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Messenger/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Messenger/AppDelegate.m; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SyngIm/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SyngIm/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = SyngIm/main.m; sourceTree = ""; }; - 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; 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 = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Messenger/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Messenger/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Messenger/main.m; sourceTree = ""; }; + 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; 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 = ""; }; + E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTContacts.xcodeproj; path = "../node_modules/react-native-contacts/ios/RCTContacts.xcodeproj"; sourceTree = ""; }; + E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNI18n.xcodeproj; path = "../node_modules/react-native-i18n/RNI18n.xcodeproj"; sourceTree = ""; }; + E343FE901C971D4200C01DB5 /* Geth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Geth.framework; path = target/Frameworks/Geth.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -140,8 +167,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E343FE911C971D4200C01DB5 /* Geth.framework in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, + E343FE8F1C96F54A00C01DB5 /* libRCTContacts.a in Frameworks */, + E343FE8E1C96F54100C01DB5 /* libRNI18n.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, @@ -196,13 +226,13 @@ name = Products; sourceTree = ""; }; - 00E356EF1AD99517003FC87E /* SyngImTests */ = { + 00E356EF1AD99517003FC87E /* MessengerTests */ = { isa = PBXGroup; children = ( - 00E356F21AD99517003FC87E /* SyngImTests.m */, + 00E356F21AD99517003FC87E /* MessengerTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, ); - path = SyngImTests; + path = MessengerTests; sourceTree = ""; }; 00E356F01AD99517003FC87E /* Supporting Files */ = { @@ -229,7 +259,7 @@ name = Products; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* SyngIm */ = { + 13B07FAE1A68108700A75B9A /* Messenger */ = { isa = PBXGroup; children = ( 008F07F21AC5B25A0029DE68 /* main.jsbundle */, @@ -240,7 +270,7 @@ 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = SyngIm; + name = Messenger; sourceTree = ""; }; 146834001AC3E56700842450 /* Products */ = { @@ -262,6 +292,8 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( + E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */, + E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -287,9 +319,10 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* SyngIm */, + E343FE921C971D5400C01DB5 /* Frameworks */, + 13B07FAE1A68108700A75B9A /* Messenger */, 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* SyngImTests */, + 00E356EF1AD99517003FC87E /* MessengerTests */, 83CBBA001A601CBA00E9B192 /* Products */, ); indentWidth = 2; @@ -299,18 +332,43 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* SyngIm.app */, - 00E356EE1AD99517003FC87E /* SyngImTests.xctest */, + 13B07F961A680F5B00A75B9A /* Messenger.app */, + 00E356EE1AD99517003FC87E /* MessengerTests.xctest */, ); name = Products; sourceTree = ""; }; + E343FE801C96F4DA00C01DB5 /* Products */ = { + isa = PBXGroup; + children = ( + E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */, + ); + name = Products; + sourceTree = ""; + }; + E343FE861C96F4E200C01DB5 /* Products */ = { + isa = PBXGroup; + children = ( + E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */, + E343FE8D1C96F4E200C01DB5 /* RNI18nTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + E343FE921C971D5400C01DB5 /* Frameworks */ = { + isa = PBXGroup; + children = ( + E343FE901C971D4200C01DB5 /* Geth.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* SyngImTests */ = { + 00E356ED1AD99517003FC87E /* MessengerTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SyngImTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "MessengerTests" */; buildPhases = ( 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, @@ -321,14 +379,14 @@ dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = SyngImTests; - productName = SyngImTests; - productReference = 00E356EE1AD99517003FC87E /* SyngImTests.xctest */; + name = MessengerTests; + productName = MessengerTests; + productReference = 00E356EE1AD99517003FC87E /* MessengerTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* SyngIm */ = { + 13B07F861A680F5B00A75B9A /* Messenger */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SyngIm" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Messenger" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -339,9 +397,9 @@ ); dependencies = ( ); - name = SyngIm; + name = Messenger; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* SyngIm.app */; + productReference = 13B07F961A680F5B00A75B9A /* Messenger.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -350,7 +408,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = Facebook; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -359,7 +417,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SyngIm" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Messenger" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -375,6 +433,10 @@ ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; }, + { + ProductGroup = E343FE801C96F4DA00C01DB5 /* Products */; + ProjectRef = E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */; + }, { ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; @@ -411,11 +473,15 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, + { + ProductGroup = E343FE861C96F4E200C01DB5 /* Products */; + ProjectRef = E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */; + }, ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* SyngIm */, - 00E356ED1AD99517003FC87E /* SyngImTests */, + 13B07F861A680F5B00A75B9A /* Messenger */, + 00E356ED1AD99517003FC87E /* MessengerTests */, ); }; /* End PBXProject section */ @@ -491,6 +557,27 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTContacts.a; + remoteRef = E343FE831C96F4DA00C01DB5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNI18n.a; + remoteRef = E343FE8A1C96F4E200C01DB5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + E343FE8D1C96F4E200C01DB5 /* RNI18nTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = RNI18nTests.xctest; + remoteRef = E343FE8C1C96F4E200C01DB5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -526,7 +613,6 @@ runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh"; - showEnvVarsInLog = 1; }; /* End PBXShellScriptBuildPhase section */ @@ -535,7 +621,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00E356F31AD99517003FC87E /* SyngImTests.m in Sources */, + 00E356F31AD99517003FC87E /* MessengerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -553,7 +639,7 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* SyngIm */; + target = 13B07F861A680F5B00A75B9A /* Messenger */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -565,7 +651,7 @@ 13B07FB21A68108700A75B9A /* Base */, ); name = LaunchScreen.xib; - path = SyngIm; + path = Messenger; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -583,11 +669,12 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = SyngImTests/Info.plist; + INFOPLIST_FILE = MessengerTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SyngIm.app/SyngIm"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Messenger.app/Messenger"; }; name = Debug; }; @@ -600,11 +687,12 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = SyngImTests/Info.plist; + INFOPLIST_FILE = MessengerTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SyngIm.app/SyngIm"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Messenger.app/Messenger"; }; name = Release; }; @@ -613,15 +701,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEAD_CODE_STRIPPING = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/target/Frameworks", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "SyngIm/Info.plist"; + INFOPLIST_FILE = Messenger/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = SyngIm; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = Messenger; }; name = Debug; }; @@ -629,15 +722,20 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/target/Frameworks", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "SyngIm/Info.plist"; + INFOPLIST_FILE = Messenger/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = SyngIm; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = Messenger; }; name = Release; }; @@ -661,6 +759,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -730,7 +829,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SyngImTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "MessengerTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -739,7 +838,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SyngIm" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Messenger" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -748,7 +847,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SyngIm" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Messenger" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/syng-im/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme b/syng-im/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme similarity index 73% rename from syng-im/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme rename to syng-im/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme index 2222337849..0a73b677db 100644 --- a/syng-im/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme +++ b/syng-im/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme @@ -1,6 +1,6 @@ + BuildableName = "Messenger.app" + BlueprintName = "Messenger" + ReferencedContainer = "container:Messenger.xcodeproj"> + BuildableName = "MessengerTests.xctest" + BlueprintName = "MessengerTests" + ReferencedContainer = "container:Messenger.xcodeproj"> + shouldUseLaunchSchemeArgsEnv = "YES"> + BuildableName = "MessengerTests.xctest" + BlueprintName = "MessengerTests" + ReferencedContainer = "container:Messenger.xcodeproj"> @@ -57,48 +57,51 @@ + BuildableName = "Messenger.app" + BlueprintName = "Messenger" + ReferencedContainer = "container:Messenger.xcodeproj"> + + + BuildableName = "Messenger.app" + BlueprintName = "Messenger" + ReferencedContainer = "container:Messenger.xcodeproj"> + BuildableName = "Messenger.app" + BlueprintName = "Messenger" + ReferencedContainer = "container:Messenger.xcodeproj"> diff --git a/syng-im/ios/SyngIm/AppDelegate.h b/syng-im/ios/Messenger/AppDelegate.h similarity index 100% rename from syng-im/ios/SyngIm/AppDelegate.h rename to syng-im/ios/Messenger/AppDelegate.h diff --git a/syng-im/ios/SyngIm/AppDelegate.m b/syng-im/ios/Messenger/AppDelegate.m similarity index 99% rename from syng-im/ios/SyngIm/AppDelegate.m rename to syng-im/ios/Messenger/AppDelegate.m index f3a7ea6d78..e270ac3689 100644 --- a/syng-im/ios/SyngIm/AppDelegate.m +++ b/syng-im/ios/Messenger/AppDelegate.m @@ -42,7 +42,7 @@ // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation - moduleName:@"SyngIm" + moduleName:@"Messenger" initialProperties:nil launchOptions:launchOptions]; diff --git a/syng-im/ios/SyngIm/Base.lproj/LaunchScreen.xib b/syng-im/ios/Messenger/Base.lproj/LaunchScreen.xib similarity index 93% rename from syng-im/ios/SyngIm/Base.lproj/LaunchScreen.xib rename to syng-im/ios/Messenger/Base.lproj/LaunchScreen.xib index 55e9a29a81..3841771591 100644 --- a/syng-im/ios/SyngIm/Base.lproj/LaunchScreen.xib +++ b/syng-im/ios/Messenger/Base.lproj/LaunchScreen.xib @@ -18,7 +18,7 @@ -