diff --git a/.gitignore b/.gitignore index 0394861..9cdd002 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,8 @@ Example/node_modules node_modules -.vscode \ No newline at end of file +.vscode + +build +xcuserdata +.idea/ diff --git a/ios/RCTTwilioChat.xcodeproj/project.pbxproj b/ios/RCTTwilioChat.xcodeproj/project.pbxproj index 57e0629..f746bfc 100644 --- a/ios/RCTTwilioChat.xcodeproj/project.pbxproj +++ b/ios/RCTTwilioChat.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 1DAE2D391D086CFD00D3FE06 /* RCTTwilioChatClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DAE2D311D086CFD00D3FE06 /* RCTTwilioChatClient.m */; }; 1DAE2D3A1D086CFD00D3FE06 /* RCTTwilioChatMembers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DAE2D331D086CFD00D3FE06 /* RCTTwilioChatMembers.m */; }; 1DAE2D3B1D086CFD00D3FE06 /* RCTTwilioChatMessages.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DAE2D351D086CFD00D3FE06 /* RCTTwilioChatMessages.m */; }; - 7B8F444105179A6A245010D4 /* Pods_RCTTwilioChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6A2ED7ADADE24A2D925FE78 /* Pods_RCTTwilioChat.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -30,7 +29,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 169FD95B00BC05A6C7F956C8 /* Pods-RCTTwilioChat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RCTTwilioChat.release.xcconfig"; path = "Pods/Target Support Files/Pods-RCTTwilioChat/Pods-RCTTwilioChat.release.xcconfig"; sourceTree = ""; }; 1D6F099A1DF1EBE100611A19 /* RCTTwilioChatPaginator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTwilioChatPaginator.h; sourceTree = ""; }; 1D6F099B1DF1EBE200611A19 /* RCTTwilioChatPaginator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTwilioChatPaginator.m; sourceTree = ""; }; 1DAE2D1E1D086CD600D3FE06 /* libRCTTwilioChat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTTwilioChat.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -44,10 +42,8 @@ 1DAE2D311D086CFD00D3FE06 /* RCTTwilioChatClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTwilioChatClient.m; sourceTree = ""; }; 1DAE2D321D086CFD00D3FE06 /* RCTTwilioChatMembers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTwilioChatMembers.h; sourceTree = ""; }; 1DAE2D331D086CFD00D3FE06 /* RCTTwilioChatMembers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTwilioChatMembers.m; sourceTree = ""; }; - 1DAE2D341D086CFD00D3FE06 /* RCTTwilioIChatMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTwilioIChatMessages.h; sourceTree = ""; }; + 1DAE2D341D086CFD00D3FE06 /* RCTTwilioChatMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTwilioChatMessages.h; sourceTree = ""; }; 1DAE2D351D086CFD00D3FE06 /* RCTTwilioChatMessages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTwilioChatMessages.m; sourceTree = ""; }; - B1D72C1ECF91E477F227ED9D /* Pods-RCTTwilioChat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RCTTwilioChat.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RCTTwilioChat/Pods-RCTTwilioChat.debug.xcconfig"; sourceTree = ""; }; - B6A2ED7ADADE24A2D925FE78 /* Pods_RCTTwilioChat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RCTTwilioChat.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,7 +51,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7B8F444105179A6A245010D4 /* Pods_RCTTwilioChat.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,8 +62,6 @@ children = ( 1DAE2D201D086CD600D3FE06 /* RCTTwilioChat */, 1DAE2D1F1D086CD600D3FE06 /* Products */, - D904E9801B2CB6C6D66DE6F0 /* Pods */, - 9023DAF80145AA8BFFFD71CA /* Frameworks */, ); sourceTree = ""; }; @@ -95,28 +88,10 @@ 1DAE2D331D086CFD00D3FE06 /* RCTTwilioChatMembers.m */, 1D6F099A1DF1EBE100611A19 /* RCTTwilioChatPaginator.h */, 1D6F099B1DF1EBE200611A19 /* RCTTwilioChatPaginator.m */, - 1DAE2D341D086CFD00D3FE06 /* RCTTwilioIChatMessages.h */, + 1DAE2D341D086CFD00D3FE06 /* RCTTwilioChatMessages.h */, 1DAE2D351D086CFD00D3FE06 /* RCTTwilioChatMessages.m */, ); - name = RCTTwilioChat; - path = RCTTwilioIPMessaging; - sourceTree = ""; - }; - 9023DAF80145AA8BFFFD71CA /* Frameworks */ = { - isa = PBXGroup; - children = ( - B6A2ED7ADADE24A2D925FE78 /* Pods_RCTTwilioChat.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - D904E9801B2CB6C6D66DE6F0 /* Pods */ = { - isa = PBXGroup; - children = ( - B1D72C1ECF91E477F227ED9D /* Pods-RCTTwilioChat.debug.xcconfig */, - 169FD95B00BC05A6C7F956C8 /* Pods-RCTTwilioChat.release.xcconfig */, - ); - name = Pods; + path = RCTTwilioChat; sourceTree = ""; }; /* End PBXGroup section */ @@ -126,18 +101,16 @@ isa = PBXNativeTarget; buildConfigurationList = 1DAE2D271D086CD600D3FE06 /* Build configuration list for PBXNativeTarget "RCTTwilioChat" */; buildPhases = ( - C921C8431837A2603AF4EBBC /* 📦 Check Pods Manifest.lock */, 1DAE2D1A1D086CD600D3FE06 /* Sources */, 1DAE2D1B1D086CD600D3FE06 /* Frameworks */, 1DAE2D1C1D086CD600D3FE06 /* CopyFiles */, - 1D87D7CD9DDA45F1166AEC14 /* 📦 Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); name = RCTTwilioChat; - productName = RCTTwilioIPMessaging; + productName = RCTTwilioChat; productReference = 1DAE2D1E1D086CD600D3FE06 /* libRCTTwilioChat.a */; productType = "com.apple.product-type.library.static"; }; @@ -172,39 +145,6 @@ }; /* End PBXProject section */ -/* Begin PBXShellScriptBuildPhase section */ - 1D87D7CD9DDA45F1166AEC14 /* 📦 Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RCTTwilioChat/Pods-RCTTwilioChat-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - C921C8431837A2603AF4EBBC /* 📦 Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 1DAE2D1A1D086CD600D3FE06 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -305,49 +245,40 @@ }; name = Release; }; - 1DAE2D281D086CD600D3FE06 /* Debug */ = { + D2EA9F3D1EC1AEE30040EF5B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B1D72C1ECF91E477F227ED9D /* Pods-RCTTwilioChat.debug.xcconfig */; buildSettings = { + COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)/**", - "$(SRCROOT)/../../ios/Pods/**", + "$(inherited)", + "$(PROJECT_DIR)/../../../ios/**", ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( - "$(inherited)", "$(SRCROOT)/../../react-native/React/**", - "$(SRCROOT)/../../../ios/Pods/Headers/**", + "$(SRCROOT)/../../../ios/**", ); - OTHER_LDFLAGS = ( - "-ObjC", - "$(inherited)", - ); - PODS_ROOT = "${SRCROOT}/../../ios/Pods"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; + LIBRARY_SEARCH_PATHS = "$(inherited}"; + PRODUCT_NAME = RCTTwilioChat; }; name = Debug; }; - 1DAE2D291D086CD600D3FE06 /* Release */ = { + D2EA9F3E1EC1AEE30040EF5B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 169FD95B00BC05A6C7F956C8 /* Pods-RCTTwilioChat.release.xcconfig */; buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)/**", - "$(SRCROOT)/../../ios/Pods/**", + "$(inherited)", + "$(PROJECT_DIR)/../../../ios/**", ); HEADER_SEARCH_PATHS = ( - "$(inherited)", "$(SRCROOT)/../../react-native/React/**", - "$(SRCROOT)/../../../ios/Pods/Headers/**", - ); - OTHER_LDFLAGS = ( - "-ObjC", - "$(inherited)", + "$(SRCROOT)/../../../ios/**", ); - PODS_ROOT = "${SRCROOT}/../../ios/Pods"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; + LIBRARY_SEARCH_PATHS = "$(inherited}"; + PRODUCT_NAME = RCTTwilioChat; }; name = Release; }; @@ -366,8 +297,8 @@ 1DAE2D271D086CD600D3FE06 /* Build configuration list for PBXNativeTarget "RCTTwilioChat" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1DAE2D281D086CD600D3FE06 /* Debug */, - 1DAE2D291D086CD600D3FE06 /* Release */, + D2EA9F3D1EC1AEE30040EF5B /* Debug */, + D2EA9F3E1EC1AEE30040EF5B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/ios/RCTTwilioChat.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/RCTTwilioChat.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/ios/RCTTwilioChat.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/RCTTwilioChat.xcodeproj/xcuserdata/bbumbalough.xcuserdatad/xcschemes/RCTTwilioIPMessaging.xcscheme b/ios/RCTTwilioChat.xcodeproj/xcuserdata/bbumbalough.xcuserdatad/xcschemes/RCTTwilioIPMessaging.xcscheme deleted file mode 100644 index 8133215..0000000 --- a/ios/RCTTwilioChat.xcodeproj/xcuserdata/bbumbalough.xcuserdatad/xcschemes/RCTTwilioIPMessaging.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/RCTTwilioChat.xcodeproj/xcuserdata/bbumbalough.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/RCTTwilioChat.xcodeproj/xcuserdata/bbumbalough.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 0bd057b..0000000 --- a/ios/RCTTwilioChat.xcodeproj/xcuserdata/bbumbalough.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - RCTTwilioIPMessaging.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 1DAE2D1D1D086CD600D3FE06 - - primary - - - - - diff --git a/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.h b/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.h index ffa96ce..12092ec 100644 --- a/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.h +++ b/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.h @@ -8,7 +8,7 @@ #import #import #import -#import "RCTConvert.h" +#import @interface RCTConvert (TwilioChatClient) diff --git a/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.m b/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.m index b3e80ba..4f9e0ee 100644 --- a/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.m +++ b/ios/RCTTwilioChat/RCTConvert+TwilioChatClient.m @@ -7,7 +7,7 @@ // #import "RCTConvert+TwilioChatClient.h" -#import "RCTUtils.h" +#import @implementation RCTConvert (TwilioChatClient) diff --git a/ios/RCTTwilioChat/RCTTwilioAccessManager.h b/ios/RCTTwilioChat/RCTTwilioAccessManager.h index 4b2443f..421a2b1 100644 --- a/ios/RCTTwilioChat/RCTTwilioAccessManager.h +++ b/ios/RCTTwilioChat/RCTTwilioAccessManager.h @@ -6,7 +6,7 @@ // Copyright © 2016 Facebook. All rights reserved. // #import -#import "RCTBridgeModule.h" +#import @interface RCTTwilioAccessManager : NSObject { TwilioAccessManager *accessManager; diff --git a/ios/RCTTwilioChat/RCTTwilioAccessManager.m b/ios/RCTTwilioChat/RCTTwilioAccessManager.m index a5f61c1..e71ff46 100644 --- a/ios/RCTTwilioChat/RCTTwilioAccessManager.m +++ b/ios/RCTTwilioChat/RCTTwilioAccessManager.m @@ -7,11 +7,10 @@ // #import "RCTTwilioAccessManager.h" -#import "RCTBridge.h" #import "RCTConvert+TwilioChatClient.h" -#import "RCTUtils.h" +#import #import "RCTTwilioChatClient.h" -#import "RCTEventDispatcher.h" +#import @interface RCTTwilioAccessManager() @end diff --git a/ios/RCTTwilioChat/RCTTwilioChatChannels.h b/ios/RCTTwilioChat/RCTTwilioChatChannels.h index c3cfb61..37ad627 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatChannels.h +++ b/ios/RCTTwilioChat/RCTTwilioChatChannels.h @@ -8,7 +8,7 @@ #import #import -#import "RCTBridgeModule.h" +#import @interface RCTTwilioChatChannels : NSObject diff --git a/ios/RCTTwilioChat/RCTTwilioChatChannels.m b/ios/RCTTwilioChat/RCTTwilioChatChannels.m index 1f934a9..9792165 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatChannels.m +++ b/ios/RCTTwilioChat/RCTTwilioChatChannels.m @@ -10,7 +10,7 @@ #import "RCTTwilioChatClient.h" #import "RCTConvert+TwilioChatClient.h" #import "RCTTwilioChatPaginator.h" -#import "RCTUtils.h" +#import @implementation RCTTwilioChatChannels @@ -33,7 +33,7 @@ + (void)loadChannelFromSid:(NSString *)sid :(void (^)(TCHResult *result, TCHChan @"type": @"Channel", @"paginator": [RCTConvert TCHChannelPaginator:paginator] }); - + } else { reject(@"get-user-channels-error", @"Error occured while attempting to get the user channels.", result.error); @@ -51,7 +51,7 @@ + (void)loadChannelFromSid:(NSString *)sid :(void (^)(TCHResult *result, TCHChan @"type": @"ChannelDescriptor", @"paginator": [RCTConvert TCHChannelDescriptorPaginator:paginator] }); - + } else { reject(@"get-public-channels-error", @"Error occured while attempting to get the public channels.", result.error); diff --git a/ios/RCTTwilioChat/RCTTwilioChatClient.h b/ios/RCTTwilioChat/RCTTwilioChatClient.h index 2f0ed51..aca18c6 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatClient.h +++ b/ios/RCTTwilioChat/RCTTwilioChatClient.h @@ -7,7 +7,7 @@ // #import -#import "RCTBridgeModule.h" +#import @interface RCTTwilioChatClient : NSObject { TwilioChatClient *client; diff --git a/ios/RCTTwilioChat/RCTTwilioChatClient.m b/ios/RCTTwilioChat/RCTTwilioChatClient.m index 9701d67..837fb39 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatClient.m +++ b/ios/RCTTwilioChat/RCTTwilioChatClient.m @@ -8,10 +8,9 @@ #import "RCTTwilioChatClient.h" #import "RCTTwilioAccessManager.h" -#import "RCTBridge.h" -#import "RCTEventDispatcher.h" +#import #import "RCTConvert+TwilioChatClient.h" -#import "RCTUtils.h" +#import @interface RCTTwilioChatClient() @end @@ -113,7 +112,7 @@ + (id)sharedManager { } else { reject(@"set-attributes-error", @"Error occured while attempting to set attributes for the user.", result.error); - } + } }]; } diff --git a/ios/RCTTwilioChat/RCTTwilioChatMembers.h b/ios/RCTTwilioChat/RCTTwilioChatMembers.h index 30dac41..ce70d98 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatMembers.h +++ b/ios/RCTTwilioChat/RCTTwilioChatMembers.h @@ -8,7 +8,7 @@ #import #import -#import "RCTBridgeModule.h" +#import @interface RCTTwilioChatMembers : NSObject diff --git a/ios/RCTTwilioChat/RCTTwilioChatMembers.m b/ios/RCTTwilioChat/RCTTwilioChatMembers.m index ae4094d..edc959e 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatMembers.m +++ b/ios/RCTTwilioChat/RCTTwilioChatMembers.m @@ -11,7 +11,7 @@ #import "RCTTwilioChatClient.h" #import "RCTTwilioChatChannels.h" #import "RCTTwilioChatPaginator.h" -#import "RCTUtils.h" +#import @implementation RCTTwilioChatMembers diff --git a/ios/RCTTwilioChat/RCTTwilioChatMessages.h b/ios/RCTTwilioChat/RCTTwilioChatMessages.h index 248b908..878316d 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatMessages.h +++ b/ios/RCTTwilioChat/RCTTwilioChatMessages.h @@ -8,7 +8,7 @@ #import #import -#import "RCTBridgeModule.h" +#import @interface RCTTwilioChatMessages : NSObject diff --git a/ios/RCTTwilioChat/RCTTwilioChatMessages.m b/ios/RCTTwilioChat/RCTTwilioChatMessages.m index b320bdd..452a1f9 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatMessages.m +++ b/ios/RCTTwilioChat/RCTTwilioChatMessages.m @@ -10,7 +10,7 @@ #import "RCTTwilioChatChannels.h" #import "RCTTwilioChatClient.h" #import "RCTConvert+TwilioChatClient.h" -#import "RCTUtils.h" +#import @implementation RCTTwilioChatMessages diff --git a/ios/RCTTwilioChat/RCTTwilioChatPaginator.h b/ios/RCTTwilioChat/RCTTwilioChatPaginator.h index c5efae0..24ae890 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatPaginator.h +++ b/ios/RCTTwilioChat/RCTTwilioChatPaginator.h @@ -7,7 +7,7 @@ // #import -#import "RCTBridgeModule.h" +#import @interface RCTTwilioChatPaginator : NSObject { NSMutableDictionary *paginators; diff --git a/ios/RCTTwilioChat/RCTTwilioChatPaginator.m b/ios/RCTTwilioChat/RCTTwilioChatPaginator.m index e2bd433..66e2f61 100644 --- a/ios/RCTTwilioChat/RCTTwilioChatPaginator.m +++ b/ios/RCTTwilioChat/RCTTwilioChatPaginator.m @@ -8,7 +8,7 @@ #import "RCTTwilioChatPaginator.h" #import "RCTConvert+TwilioChatClient.h" -#import "RCTUtils.h" +#import @interface RCTTwilioChatPaginator() @end