Merge branch 'master' of https://github.com/Instabug/instabug-reactnative

Author: DevHossamHassan

README.md

@@ -1,24 +1,29 @@
 
-# instabug-reactnative (Beta)
+# instabug-reactnative
+
+## Dependencies
+
+`react-native` version `>0.26`
 
 ## Installation
 
+#### iOS
+
 `$ npm install https://github.com/Instabug/instabug-reactnative --save`
 
 `$ rnpm link instabug-reactnative`
 
-#### iOS
-
 1. Open your app `.xcodeproj` file
-2. Add `instabug.framework` and `instabug.bundle` from 'instabug-reactnative/ios' to the app project directory. 
-3. In XCode, in the project navigator, select your project. Add `instabug.framework` to your project's `Build Phases` ➜ `Link Binary With Libraries`
-4. In XCode, in the project navigator, select your project. Add `CoreTelephony.framework` to your project's `Build Phases` ➜ `Link Binary With Libraries`
-5. In XCode, in the project navigator, select your project. Add `CoreMotion.framework` to your project's `Build Phases` ➜ `Link Binary With Libraries`
-6. In XCode, in the project navigator, select your project. Add `instabug.bundle` to your project's `Build Phases` ➜ `Copy Bundle Resources`
-7. Run your project (`Cmd+R`)<
+2. Add the following line to your "Podfile": `pod 'Instabug', '~> 6.0.0'`
+3. run `pod install`
+4. Run your project (`Cmd+R`)<
 
 #### Android (Pending)
 
+`$ npm install https://github.com/Instabug/instabug-reactnative --save`
+
+`$ rnpm link instabug-reactnative`
+
 1. Open up `android/app/src/main/java/[...]/MainActivity.java`
   - Add `import com.instabug.reactlibrary.RNInstabugReactnativePackage;` to the imports at the top of the file
   - Add `new RNInstabugReactnativePackage()` to the list returned by the `getPackages()` method
@@ -44,6 +49,13 @@ class testApp extends Component {
   ...
 }
 ```
+
+### iOS
+
+If your app doesn't already access the microphone or photo library, you'll need to add the following 2 keys to your app's info.plist file:
+
+    NSMicrophoneUsageDescription
+    NSPhotoLibraryUsageDescription
 
 ## License
 

ios/RNInstabug.xcodeproj/project.pbxproj

@@ -256,6 +256,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../../../ios/Frameworks",
+					"$(PROJECT_DIR)/../../../ios/Pods/Instabug",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../node_modules/react-native/React/**",
@@ -277,6 +278,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../../../ios/Frameworks",
+					"$(PROJECT_DIR)/../../../ios/Pods/Instabug",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../node_modules/react-native/React/**",

ios/RNInstabug.xcodeproj/project.xcworkspace/xcuserdata/yousefhamza.xcuserdatad/UserInterfaceState.xcuserstate

@@ -268,29 +268,26 @@ - (NSDictionary *)constantsToExport
               @"emailFieldHint": @(IBGStringEmailFieldHint),
               @"commentFieldHintForBugReport": @(IBGStringCommentFieldHintForBugReport),
               @"commentFieldHintForFeedback": @(IBGStringCommentFieldHintForFeedback),
-              @"addVideoMessage": @(IBGStringAddVideoMessage),
+              @"addScreenRecordingMessage": @(IBGStringAddScreenRecordingMessage),
               @"addVoiceMessage": @(IBGStringAddVoiceMessage),
               @"addImageFromGallery": @(IBGStringAddImageFromGallery),
               @"addExtraScreenshot": @(IBGStringAddExtraScreenshot),
               @"audioRecordingPermissionDeniedTitle": @(IBGStringAudioRecordingPermissionDeniedTitle),
               @"audioRecordingPermissionDeniedMessage": @(IBGStringAudioRecordingPermissionDeniedMessage),
-              @"microphonePermissionAlertSettingsButtonText": @(IBGStringMicrophonePermissionAlertSettingsButtonTitle),
+              @"microphonePermissionAlertSettingsButtonTitle": @(IBGStringMicrophonePermissionAlertSettingsButtonTitle),
+              @"chatsHeaderTitle": @(IBGStringChatsHeaderTitle),
+              @"team": @(IBGStringTeam),
               @"recordingMessageToHoldText": @(IBGStringRecordingMessageToHoldText),
               @"recordingMessageToReleaseText": @(IBGStringRecordingMessageToReleaseText),
-              @"conversationsHeaderTitle": @(IBGStringChatsNoConversationsHeadlineText),
+              @"messagesNotification": @(IBGStringMessagesNotification),
+              @"messagesNotificationAndOthers": @(IBGStringMessagesNotificationAndOthers),
               @"screenshotHeaderTitle": @(IBGStringScreenshotHeaderTitle),
-              @"chatsNoConversationsHeadlineText": @(IBGStringChatsNoConversationsHeadlineText),
-              @"doneButtonText": @(IBGStringDoneButtonTitle),
-              @"okButtonText": @(IBGStringOkButtonTitle),
-              @"cancelButtonText": @(IBGStringCancelButtonTitle),
+              @"okButtonTitle": @(IBGStringOkButtonTitle),
+              @"cancelButtonTitle": @(IBGStringCancelButtonTitle),
               @"thankYouText": @(IBGStringThankYouText),
               @"audio": @(IBGStringAudio),
-              @"video": @(IBGStringVideo),
+              @"screenRecording": @(IBGStringScreenRecording),
               @"image": @(IBGStringImage),
-              @"chatsHeaderTitle": @(IBGStringChatsHeaderTitle),
-              @"team": @(IBGStringTeam),
-              @"messageNotification": @(IBGStringMessagesNotification),
-              @"messagesNotifiactionAndOthers": @(IBGStringMessagesNotificationAndOthers)
               };
 };
 

ios/RNInstabug/InstabugReactBridge.m

@@ -87,28 +87,25 @@ @implementation RCTConvert (InstabugEnums)
                                  @"emailFieldHint": @(IBGStringEmailFieldHint),
                                  @"commentFieldHintForBugReport": @(IBGStringCommentFieldHintForBugReport),
                                  @"commentFieldHintForFeedback": @(IBGStringCommentFieldHintForFeedback),
-                                 @"addVideoMessage": @(IBGStringAddVideoMessage),
+                                 @"addScreenRecordingMessage": @(IBGStringAddScreenRecordingMessage),
                                  @"addVoiceMessage": @(IBGStringAddVoiceMessage),
                                  @"addImageFromGallery": @(IBGStringAddImageFromGallery),
                                  @"addExtraScreenshot": @(IBGStringAddExtraScreenshot),
                                  @"audioRecordingPermissionDeniedTitle": @(IBGStringAudioRecordingPermissionDeniedTitle),
                                  @"audioRecordingPermissionDeniedMessage": @(IBGStringAudioRecordingPermissionDeniedMessage),
-                                 @"microphonePermissionAlertSettingsButtonText": @(IBGStringMicrophonePermissionAlertSettingsButtonTitle),
+                                 @"microphonePermissionAlertSettingsButtonTitle": @(IBGStringMicrophonePermissionAlertSettingsButtonTitle),
+                                 @"chatsHeaderTitle": @(IBGStringChatsHeaderTitle),
+                                 @"team": @(IBGStringTeam),
                                  @"recordingMessageToHoldText": @(IBGStringRecordingMessageToHoldText),
                                  @"recordingMessageToReleaseText": @(IBGStringRecordingMessageToReleaseText),
-                                 @"conversationsHeaderTitle": @(IBGStringChatsNoConversationsHeadlineText),
+                                 @"messagesNotification": @(IBGStringMessagesNotification),
+                                 @"messagesNotificationAndOthers": @(IBGStringMessagesNotificationAndOthers),
                                  @"screenshotHeaderTitle": @(IBGStringScreenshotHeaderTitle),
-                                 @"chatsNoConversationsHeadlineText": @(IBGStringChatsNoConversationsHeadlineText),
-                                 @"doneButtonText": @(IBGStringDoneButtonTitle),
-                                 @"okButtonText": @(IBGStringOkButtonTitle),
-                                 @"cancelButtonText": @(IBGStringCancelButtonTitle),
+                                 @"okButtonTitle": @(IBGStringOkButtonTitle),
+                                 @"cancelButtonTitle": @(IBGStringCancelButtonTitle),
                                  @"thankYouText": @(IBGStringThankYouText),
                                  @"audio": @(IBGStringAudio),
-                                 @"video": @(IBGStringVideo),
+                                 @"screenRecording": @(IBGStringScreenRecording),
                                  @"image": @(IBGStringImage),
-                                 @"chatsHeaderTitle": @(IBGStringChatsHeaderTitle),
-                                 @"team": @(IBGStringTeam),
-                                 @"messageNotification": @(IBGStringMessagesNotification),
-                                 @"messagesNotifiactionAndOthers": @(IBGStringMessagesNotificationAndOthers)
                                  }), IBGStringShakeHint, integerValue);
 @end