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

android/build.gradle

@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile 'com.instabug.library:instabug:4.3.3'
+    compile 'com.instabug.library:instabug:4.5.0'
 
 }

index.js

@@ -801,6 +801,19 @@ module.exports = {
         }
     },
 
+    /**
+     * Sets the default position at which the Instabug screen recording button will be shown. Different orientations are already handled.
+     *
+     * (Default for `position` is `bottomRight`)
+     *
+     * @param position is of type IBGPosition `topLeft` to show on the top left of screen , or `bottomRight` to show on the bottom right of scrren.
+     */
+     setVideoRecordingFloatingButtonPosition: function(position) {
+       if(Platform.OS === 'ios') {
+         Instabug.setVideoRecordingFloatingButtonPosition(position);
+       }
+     },
+
     /**
      * The event used to invoke the feedback form
      * @readonly
@@ -892,6 +905,18 @@ module.exports = {
         right: Instabug.rectMaxXEdge,
     },
 
+    /**
+     * Instabug floating buttons positions.
+     * @readonly
+     * @enum {number}
+     */
+    IBGPosition: {
+        bottomRight: Instabug.bottomRight,
+        topRight: Instabug.topRight,
+        bottomLeft: Instabug.bottomLeft,
+        topLeft: Instabug.topLeft
+    },
+
     /**
      * Instabug strings
      * @readonly

ios/Instabug.framework/Headers/Instabug.h

@@ -10,7 +10,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "IBGTypes.h"
+#import <InstabugCore/IBGTypes.h>
 
 /**
  This is the API for using Instabug's SDK. For more details about the SDK integration,
@@ -118,6 +118,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  */
 + (void)addFileAttachmentWithURL:(NSURL *)fileURL;
 
+
 /**
  @brief Add a set of data as a file attachment to be sent with each report.
  
@@ -129,7 +130,6 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  */
 +(void)addFileAttachmentWithData:(NSData *)data;
 
-
 /**
  @brief Clear list of files to be attached with each report.
 
@@ -451,6 +451,15 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  */
 + (void)setFloatingButtonEdge:(CGRectEdge)floatingButtonEdge withTopOffset:(double)floatingButtonOffsetFromTop;
 
+/**
+ @brief Sets the default position at which the Instabug screen recording button will be shown. Different orientations are already handled.
+ 
+ @discussion Default for `position` is `bottomRight`.
+ 
+ @param position `topLeft` to show on the top left of screen , or `bottomRight` to show on the bottom right of scrren.
+ */
++ (void)setVideoRecordingFloatingButtonPosition:(IBGPosition)position;
+
 /**
  @brief Sets the SDK's locale.
  
@@ -630,7 +639,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  
  @discussion When only a single option is enabled, it become the default invocation mode. 
  If all options are disabled, bug reporting becomes the default invocation mode.
- 
+
  By default, all three options are enabled.
  
  @param bugReportEnabled A boolean to indicate whether bug reports are enabled or disabled.
@@ -667,7 +676,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  @brief Remove all extra fields.
  
  @discussion Use this method to remove all added extra fields.
-  */
+ */
 + (void)removeExtraReportFields;
 
 /**
@@ -865,7 +874,7 @@ OBJC_EXTERN void IBGLogError(NSString *format, ...) NS_FORMAT_FUNCTION(1, 2);
 /**
  @brief Used to reroute all your NSLogs to Instabug to be able to automatically include them with reports.
  
- @discussion For details on how to reroute your NSLogs to Instabug, see https://docs.instabug.com/docs/ios-logging
+ @discussion For details on how to reroute your NSLogs to Instabug, see http://docs.instabug.com/docs/logging
  
  @param format Format string.
  @param args Arguments list.
@@ -1095,7 +1104,7 @@ OBJC_EXTERN void IBGNSLogWithLevel(NSString *format, va_list args, IBGLogLevel l
  
  To manually display any available surveys, call `+ [Instabug showSurveyIfAvailable]`.
  
- Defaults to NO.
+ Defaults to YES.
  
  @param autoShowingSurveysEnabled A boolean to indicate whether the surveys auto showing are enabled or not.
  */
@@ -1148,10 +1157,14 @@ OBJC_EXTERN void IBGNSLogWithLevel(NSString *format, va_list args, IBGLogLevel l
 
 /**
  @brief Sets the verbosity level of logs used to debug the Instabug SDK itself.
+ 
+ @discussion This API sets the verbosity level of logs used to debug The SDK. The defualt value in debug mode is IBGSDKDebugLogsLevelVerbose and in production is IBGSDKDebugLogsLevelError.
 
  @param level Logs verbosity level.
  */
 + (void)setSDKDebugLogsLevel:(IBGSDKDebugLogsLevel)level;
 
 @end
+
+
 NS_ASSUME_NONNULL_END

ios/Instabug.framework/Instabug.bundle/Inject_DSYM_Project-Archive.sh

@@ -1,15 +0,0 @@
-echo "Instabug: Started inject dSYM and bcsymbolmap inside project archive."
-
-Instabug_DSYM_PATH=($(find "${PROJECT_DIR}" -name 'Instabug.framework.dSYM'))
-if [ ! "${Instabug_DSYM_PATH}" ]; then
-echo "Instabug: can not find Instabug.framework.dSYM in project directory."
-else
-cp -r "${Instabug_DSYM_PATH}" "${ARCHIVE_DSYMS_PATH}"
-echo "Instabug: Instabug.framework.dSYM successfully copied in project directory."
-fi
-
-find "${PROJECT_DIR}" -name "*.bcsymbolmap" | (while read -r file
-do
-cp -r "${file}" "${ARCHIVE_DSYMS_PATH}/../BCSymbolMaps"
-done)
-echo "Instabug: Injecting dSYM and bcsymbolmap inside project archive complete."

ios/Instabug.framework/Instabug.bundle/archived-expanded-entitlements.xcent

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>application-identifier</key>
-	<string>56S6Q9SA8U.com.Instabug</string>
-	<key>keychain-access-groups</key>
-	<array>
-		<string>56S6Q9SA8U.com.Instabug</string>
-	</array>
-</dict>
-</plist>

ios/InstabugCore.framework/Headers/IBGTypes.h

@@ -5,7 +5,7 @@
 //  Copyright:  (c) 2013-2016 by Instabug, Inc., all rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 /// ------------------------------
 /// @name User-facing Strings Keys
@@ -47,6 +47,7 @@ extern NSString * const kIBGMessagesNotificationTitleSingleMessageStringName;
 extern NSString * const kIBGMessagesNotificationTitleMultipleMessagesStringName;
 extern NSString * const kIBGScreenshotTitleStringName;
 extern NSString * const kIBGOkButtonTitleStringName;
+extern NSString * const kIBGSendButtonTitleStringName;
 extern NSString * const kIBGCancelButtonTitleStringName;
 extern NSString * const kIBGThankYouAlertTitleStringName;
 extern NSString * const kIBGThankYouAlertMessageStringName;
@@ -55,14 +56,16 @@ extern NSString * const kIBGScreenRecordingStringName;
 extern NSString * const kIBGImageStringName;
 extern NSString * const kIBGReachedMaximimNumberOfAttachmentsTitleStringName;
 extern NSString * const kIBGReachedMaximimNumberOfAttachmentsMessageStringName;
+extern NSString * const kIBGVideoRecordingFailureMessageStringName;
 extern NSString * const kIBGSurveyEnterYourAnswerTextPlaceholder;
 extern NSString * const kIBGSurveyNoAnswerTitle;
 extern NSString * const kIBGSurveyNoAnswerMessage;
 extern NSString * const kIBGSurveySubmitTitle;
 extern NSString * const kIBGVideoPressRecordTitle;
+extern NSString * const kIBGCollectingDataText;
 extern NSString * const kIBGLowDiskStorageTitle;
 extern NSString * const kIBGLowDiskStorageMessage;
-extern NSString * const kIBGCollectingDataText;
+extern NSString * const kIBGInboundByLineMessage;
 extern NSString * const kIBGExtraFieldIsRequiredText;
 extern NSString * const kIBGExtraFieldMissingDataText;
 
@@ -242,9 +245,9 @@ typedef NS_ENUM(NSInteger, IBGString) {
     IBGStringSurveyNoAnswerMessage,
     IBGStringSurveySubmitTitle,
     IBGStringVideoPressRecordTitle,
+    IBGStringCollectingDataText,
     IBGStringLowDiskStorageTitle,
     IBGStringLowDiskStorageMessage,
-    IBGStringCollectingDataText,
     IBGStringExtraFieldIsRequiredText,
     IBGStringExtraFieldMissingDataText
 };
@@ -258,6 +261,16 @@ typedef NS_ENUM(NSInteger, IBGPromptOption) {
     IBGPromptOptionFeedback
 };
 
+/**
+ Instabug floating buttons positions.
+ */
+typedef NS_ENUM(NSInteger, IBGPosition) {
+    IBGPositionBottomRight,
+    IBGPositionTopRight,
+    IBGPositionBottomLeft,
+    IBGPositionTopLeft
+};
+
 /**
  The Conosle Log Level.
  */
@@ -270,3 +283,12 @@ typedef NS_ENUM(NSInteger, IBGLogLevel) {
     IBGLogLevelFatal
 };
 
+@interface UIView (Instabug)
+
+/**
+ @brief Set this to true on any UIView to mark it as private.
+ Doing this will exclude it from all screenshots, view hierarchy captures and screen recordings.
+ */
+@property (nonatomic, assign) BOOL instabug_privateView;
+
+@end

ios/InstabugCore.framework/Inject_DSYM_Project-Archive.sh

@@ -0,0 +1,23 @@
+echo "Instabug: Started inject dSYM and bcsymbolmap inside project archive."
+
+Instabug_DSYM_PATH=($(find "${PROJECT_DIR}" -name 'Instabug.framework.dSYM'))
+if [ ! "${Instabug_DSYM_PATH}" ]; then
+    echo "Instabug: can not find Instabug.framework.dSYM in project directory."
+else 
+    cp -r "${Instabug_DSYM_PATH}" "${ARCHIVE_DSYMS_PATH}"
+    echo "Instabug: Instabug.framework.dSYM successfully copied in project directory."
+fi
+
+InstabugCore_DSYM_PATH=($(find "${PROJECT_DIR}" -name 'InstabugCore.framework.dSYM'))
+if [ ! "${InstabugCore_DSYM_PATH}" ]; then
+echo "Instabug: can not find InstabugCore.framework.dSYM in project directory."
+else
+cp -r "${InstabugCore_DSYM_PATH}" "${ARCHIVE_DSYMS_PATH}"
+echo "Instabug: InstabugCore.framework.dSYM successfully copied in project directory."
+fi
+
+find "${PROJECT_DIR}" -name "*.bcsymbolmap" | (while read -r file
+do
+    cp -r "${file}" "${ARCHIVE_DSYMS_PATH}/../BCSymbolMaps"
+done
+echo "Instabug: Injecting dSYM and bcsymbolmap inside project archive complete."

ios/InstabugCore.framework/Instabug_dsym_upload.sh

@@ -30,19 +30,18 @@ fi
 # Check to make sure the app token exists
 # Objective-C
 if [ ! "${APP_TOKEN}" ]; then
-  APP_TOKEN=$(grep -r 'Instabug startWithToken:@\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
+    APP_TOKEN=$(grep -r 'Instabug startWithToken:@\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
 fi
 
 # Swift
 if [ ! "${APP_TOKEN}" ]; then
-  APP_TOKEN=$(grep -r 'Instabug.startWithToken(\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
+    APP_TOKEN=$(grep -r 'Instabug.startWithToken(\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
 fi
 
 if [ ! "${APP_TOKEN}" ]; then
     APP_TOKEN=$(grep -r 'Instabug.start(withToken:\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
 fi
 
-
 if [ ! "${APP_TOKEN}" ] || [ -z "${APP_TOKEN}" ];then
   echo "Instabug: err: APP_TOKEN not found. Make sure you've added the SDK initialization line [Instabug startWithToken: invocationEvent:]"
   exit 1

ios/InstabugCore.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module InstabugCore {
+    umbrella header "IBGTypes.h"
+    
+    export *
+    module * { export * }
+}