From 5aa61b1de41ec236718a7da5ad3437528f766200 Mon Sep 17 00:00:00 2001 From: Jarrad Date: Thu, 19 May 2016 18:32:38 +0200 Subject: [PATCH] Syng to Status Former-commit-id: 134c040c3e28667f01d4e218a9a8a4ab0b4c57cf --- .re-natal | 2 +- .../main/java/com/statusim/MainActivity.java | 2 +- android/app/src/main/res/values/strings.xml | 2 +- android/settings.gradle | 2 +- ios/SyngIm.xcodeproj/project.pbxproj | 90 +++++++++---------- .../xcshareddata/xcschemes/SyngIm.xcscheme | 36 ++++---- ios/SyngIm/AppDelegate.m | 2 +- ios/SyngIm/Base.lproj/LaunchScreen.xib | 2 +- ios/SyngImTests/SyngImTests.m | 4 +- package.json | 2 +- src/status_im/android/core.cljs | 2 +- src/status_im/chat/sign_up.cljs | 4 +- src/status_im/ios/core.cljs | 2 +- 13 files changed, 76 insertions(+), 76 deletions(-) diff --git a/.re-natal b/.re-natal index 54a57bc450..1a80495307 100644 --- a/.re-natal +++ b/.re-natal @@ -1,5 +1,5 @@ { - "name": "SyngIm", + "name": "StatusIm", "interface": "reagent", "androidHost": "10.0.3.2", "modules": [ diff --git a/android/app/src/main/java/com/statusim/MainActivity.java b/android/app/src/main/java/com/statusim/MainActivity.java index 492bd5d8e9..dd040b4921 100644 --- a/android/app/src/main/java/com/statusim/MainActivity.java +++ b/android/app/src/main/java/com/statusim/MainActivity.java @@ -54,7 +54,7 @@ public class MainActivity extends ReactActivity { */ @Override protected String getMainComponentName() { - return "SyngIm"; + return "StatusIm"; } /** diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 7b66980444..fb87cafc71 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - SyngIm + StatusIm diff --git a/android/settings.gradle b/android/settings.gradle index 784925e19a..b767740db4 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'SyngIm' +rootProject.name = 'StatusIm' include ':app' diff --git a/ios/SyngIm.xcodeproj/project.pbxproj b/ios/SyngIm.xcodeproj/project.pbxproj index 2507b89bfe..d933ac7b4f 100644 --- a/ios/SyngIm.xcodeproj/project.pbxproj +++ b/ios/SyngIm.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 /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.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 */; }; @@ -65,7 +65,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = SyngIm; + remoteInfo = StatusIm; }; 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -111,18 +111,18 @@ 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; }; + 00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.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 = ""; }; + 00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.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 = ""; }; + 13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/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 = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/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 = ""; }; @@ -196,13 +196,13 @@ name = Products; sourceTree = ""; }; - 00E356EF1AD99517003FC87E /* SyngImTests */ = { + 00E356EF1AD99517003FC87E /* StatusImTests */ = { isa = PBXGroup; children = ( - 00E356F21AD99517003FC87E /* SyngImTests.m */, + 00E356F21AD99517003FC87E /* StatusImTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, ); - path = SyngImTests; + path = StatusImTests; sourceTree = ""; }; 00E356F01AD99517003FC87E /* Supporting Files */ = { @@ -229,7 +229,7 @@ name = Products; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* SyngIm */ = { + 13B07FAE1A68108700A75B9A /* StatusIm */ = { isa = PBXGroup; children = ( 008F07F21AC5B25A0029DE68 /* main.jsbundle */, @@ -240,7 +240,7 @@ 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = SyngIm; + name = StatusIm; sourceTree = ""; }; 146834001AC3E56700842450 /* Products */ = { @@ -287,9 +287,9 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* SyngIm */, + 13B07FAE1A68108700A75B9A /* StatusIm */, 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* SyngImTests */, + 00E356EF1AD99517003FC87E /* StatusImTests */, 83CBBA001A601CBA00E9B192 /* Products */, ); indentWidth = 2; @@ -299,8 +299,8 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* SyngIm.app */, - 00E356EE1AD99517003FC87E /* SyngImTests.xctest */, + 13B07F961A680F5B00A75B9A /* StatusIm.app */, + 00E356EE1AD99517003FC87E /* StatusImTests.xctest */, ); name = Products; sourceTree = ""; @@ -308,9 +308,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* SyngImTests */ = { + 00E356ED1AD99517003FC87E /* StatusImTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SyngImTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */; buildPhases = ( 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, @@ -321,14 +321,14 @@ dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = SyngImTests; - productName = SyngImTests; - productReference = 00E356EE1AD99517003FC87E /* SyngImTests.xctest */; + name = StatusImTests; + productName = StatusImTests; + productReference = 00E356EE1AD99517003FC87E /* StatusImTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* SyngIm */ = { + 13B07F861A680F5B00A75B9A /* StatusIm */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SyngIm" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -339,9 +339,9 @@ ); dependencies = ( ); - name = SyngIm; + name = StatusIm; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* SyngIm.app */; + productReference = 13B07F961A680F5B00A75B9A /* StatusIm.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -359,7 +359,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SyngIm" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "StatusIm" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -414,8 +414,8 @@ ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* SyngIm */, - 00E356ED1AD99517003FC87E /* SyngImTests */, + 13B07F861A680F5B00A75B9A /* StatusIm */, + 00E356ED1AD99517003FC87E /* StatusImTests */, ); }; /* End PBXProject section */ @@ -535,7 +535,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00E356F31AD99517003FC87E /* SyngImTests.m in Sources */, + 00E356F31AD99517003FC87E /* StatusImTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -553,7 +553,7 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* SyngIm */; + target = 13B07F861A680F5B00A75B9A /* StatusIm */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -565,7 +565,7 @@ 13B07FB21A68108700A75B9A /* Base */, ); name = LaunchScreen.xib; - path = SyngIm; + path = StatusIm; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -583,11 +583,11 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = SyngImTests/Info.plist; + INFOPLIST_FILE = StatusImTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SyngIm.app/SyngIm"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm"; }; name = Debug; }; @@ -600,11 +600,11 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = SyngImTests/Info.plist; + INFOPLIST_FILE = StatusImTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SyngIm.app/SyngIm"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm"; }; name = Release; }; @@ -618,10 +618,10 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "SyngIm/Info.plist"; + INFOPLIST_FILE = "StatusIm/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = SyngIm; + PRODUCT_NAME = StatusIm; }; name = Debug; }; @@ -634,10 +634,10 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "SyngIm/Info.plist"; + INFOPLIST_FILE = "StatusIm/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = SyngIm; + PRODUCT_NAME = StatusIm; }; name = Release; }; @@ -730,7 +730,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SyngImTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -739,7 +739,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SyngIm" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -748,7 +748,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SyngIm" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "StatusIm" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme b/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme index 2222337849..3afad3bbfb 100644 --- a/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme +++ b/ios/SyngIm.xcodeproj/xcshareddata/xcschemes/SyngIm.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> + BuildableName = "StatusImTests.xctest" + BlueprintName = "StatusImTests" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "StatusImTests.xctest" + BlueprintName = "StatusImTests" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -57,9 +57,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -77,9 +77,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> @@ -96,9 +96,9 @@ + BuildableName = "StatusIm.app" + BlueprintName = "StatusIm" + ReferencedContainer = "container:StatusIm.xcodeproj"> diff --git a/ios/SyngIm/AppDelegate.m b/ios/SyngIm/AppDelegate.m index 26b6070974..8d0df9f4bc 100644 --- a/ios/SyngIm/AppDelegate.m +++ b/ios/SyngIm/AppDelegate.m @@ -44,7 +44,7 @@ // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation - moduleName:@"SyngIm" + moduleName:@"StatusIm" initialProperties:nil launchOptions:launchOptions]; diff --git a/ios/SyngIm/Base.lproj/LaunchScreen.xib b/ios/SyngIm/Base.lproj/LaunchScreen.xib index 55e9a29a81..99ee1ebed3 100644 --- a/ios/SyngIm/Base.lproj/LaunchScreen.xib +++ b/ios/SyngIm/Base.lproj/LaunchScreen.xib @@ -18,7 +18,7 @@ -