🤝 Merge pull request #10 from Instabug/feature/2.13_release

Feature/2.13 release

Author: salmatarzi

android/build.gradle

@@ -21,8 +21,7 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile ('com.instabug.library:instabug:4.13.5'){
+    compile ('com.instabug.library:instabug:4.15.1'){
         exclude group: 'com.android.support:appcompat-v7'
     }
-
 }

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -30,6 +30,7 @@
 import com.instabug.library.invocation.util.InstabugVideoRecordingButtonCorner;
 import com.instabug.library.logging.InstabugLog;
 import com.instabug.library.bugreporting.model.ReportCategory;
+import com.instabug.library.ui.onboarding.WelcomeMessage;
 import com.instabug.library.InstabugCustomTextPlaceHolder;
 import com.instabug.library.user.UserEventParam;
 import com.instabug.library.OnSdkDismissedCallback;
@@ -106,6 +107,11 @@ public class RNInstabugReactnativeModule extends ReactContextBaseJavaModule {
     private final String ENABLED = "enabled";
     private final String DISABLED = "disabled";
 
+    //Instabug welcome message modes
+    private final String WELCOME_MESSAGE_MODE_LIVE = "welcomeMessageModeLive";
+    private final String WELCOME_MESSAGE_MODE_BETA = "welcomeMessageModeBeta";
+    private final String WELCOME_MESSAGE_MODE_DISABLED = "welcomeMessageModeDisabled";
+
     //Theme colors
     private final String COLOR_THEME_LIGHT = "light";
     private final String COLOR_THEME_DARK = "dark";
@@ -1360,6 +1366,59 @@ public void setReproStepsMode(String reproStepsMode) {
         }
     }
 
+    /**
+     * Shows the welcome message in a specific mode.
+     *
+     * @param welcomeMessageMode An enum to set the welcome message mode to
+      *                          live, or beta.
+     */
+    @ReactMethod
+    public void showWelcomeMessageWithMode(String welcomeMessageMode) {
+        try {
+            switch (welcomeMessageMode) {
+                case WELCOME_MESSAGE_MODE_LIVE:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.LIVE);
+                    break;
+                case WELCOME_MESSAGE_MODE_BETA:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.BETA);
+                    break;
+                default:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.LIVE);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Sets the welcome message mode to live, beta or disabled.
+     *
+     * @param welcomeMessageMode An enum to set the welcome message mode to
+      *                          live, beta or disabled.
+     */
+    @ReactMethod
+    public void setWelcomeMessageMode(String welcomeMessageMode) {
+        try {
+            switch (welcomeMessageMode) {
+                case WELCOME_MESSAGE_MODE_LIVE:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.LIVE);
+                    break;
+                case WELCOME_MESSAGE_MODE_BETA:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.BETA);
+                    break;
+                case WELCOME_MESSAGE_MODE_DISABLED:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.DISABLED);
+                    break;
+                default:
+                    Instabug.showWelcomeMessage(WelcomeMessage.State.LIVE);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * Sets the threshold value of the shake gesture for android devices.
      * Default for android is an integer value equals 350.
@@ -1719,6 +1778,10 @@ public Map<String, Object> getConstants() {
         constants.put("reproStepsEnabled", ENABLED);
         constants.put("reproStepsDisabled", DISABLED);
 
+        constants.put("welcomeMessageModeLive", WELCOME_MESSAGE_MODE_LIVE);
+        constants.put("welcomeMessageModeBeta", WELCOME_MESSAGE_MODE_BETA);
+        constants.put("welcomeMessageModeDisabled", WELCOME_MESSAGE_MODE_DISABLED);
+
         constants.put("allActions", ACTION_TYPE_ALL_ACTIONS);
         constants.put("reportBugAction", ACTION_TYPE_REPORT_BUG);
         constants.put("requestNewFeature", ACTION_TYPE_REQUEST_NEW_FEATURE);

index.js

@@ -215,6 +215,7 @@ module.exports = {
     },
 
     /**
+     * @deprecated Use {@link showWelcomeMessage} instead.
      * Present a view that educates the user on how to invoke the SDK with the
      * currently set invocation event.
      */
@@ -286,6 +287,7 @@ module.exports = {
     },
 
     /**
+     * @deprecated Use {@link setEmailFieldRequiredForActions} instead.
      * Sets whether users are required to enter an email address or not when
      * sending reports.
      * Defaults to YES.
@@ -297,7 +299,6 @@ module.exports = {
     },
 
     /**
-     * @deprecated since version 2.3.0. Use {@link setEnabledAttachmentTypes} instead.
      * Sets whether users are required to enter an email address or not when
      * sending reports.
      * Defaults to YES.
@@ -993,6 +994,26 @@ module.exports = {
          Instabug.setShouldShowSurveysWelcomeScreen(shouldShowWelcomeScreen);
      },
 
+     /**
+      * Shows the welcome message in a specific mode.
+      * @param welcomeMessageMode An enum to set the welcome message mode to
+      *                           live, or beta.
+      *
+      */
+     showWelcomeMessage: function(welcomeMessageMode) {
+        Instabug.showWelcomeMessageWithMode(welcomeMessageMode);
+    },
+
+    /**
+      * Sets the welcome message mode to live, beta or disabled.
+      * @param welcomeMessageMode An enum to set the welcome message mode to
+      *                           live, beta or disabled.
+      *
+      */
+     setWelcomeMessageMode: function(welcomeMessageMode) {
+        Instabug.setWelcomeMessageMode(welcomeMessageMode);
+    },
+
     /**
      * The event used to invoke the feedback form
      * @readonly
@@ -1120,6 +1141,17 @@ module.exports = {
         topLeft: Instabug.topLeft
     },
 
+    /**
+     * The welcome message mode.
+     * @readonly
+     * @enum {number}
+     */
+    welcomeMessageMode: {
+        live: Instabug.welcomeMessageModeLive,
+        beta: Instabug.welcomeMessageModeBeta,
+        disabled: Instabug.welcomeMessageModeDisabled
+    },
+
     /**
      * Instabug action types.
      * @readonly

ios/Instabug.framework/Headers/Instabug.h

@@ -5,7 +5,7 @@
 
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
 
- Version:    7.12.7
+ Version:    7.14.2
  */
 
 #import <Foundation/Foundation.h>
@@ -330,7 +330,27 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  
  @discussion Does nothing if invocation event is set to anything other than IBGInvocationEventShake or IBGInvocationEventScreenshot.
  */
-+ (void)showIntroMessage;
++ (void)showIntroMessage DEPRECATED_MSG_ATTRIBUTE("Use showWelcomeMessageWithMode: instead.");
+
+/**
+ @brief Shows the welcome message in a specific mode.
+
+ @discussion By default, the welcome message live mode is enabled. It appears automatically after 10 seconds from the user's first session. You can show it manually in a specific mode through this API.
+ The live mode consists of one step to inform the users how to report a bug or feedback. The beta mode consists of three steps to welcome your testers on board, inform them how to report a bug or feedback and to motivate them to always be on the latest app version. Please note, the into message appears only if the invocation event isn't set to none.
+ 
+ @param welcomeMessageMode An enum to set the welcome message mode to live, beta or disabled.
+ */
++ (void)showWelcomeMessageWithMode:(IBGWelcomeMessageMode)welcomeMessageMode;
+
+/**
+ @brief Sets the welcome message mode to live, beta or disabled.
+
+ @discussion By default, the welcome message live mode is enabled. It appears automatically after 10 seconds from the user's first session. You can change it to the beta mode or disable it.
+ The live mode consists of one step to inform the users how to report a bug or feedback. The beta mode consists of three steps to welcome your testers on board, inform them how to report a bug or feedback and to motivate them to always be on the latest app version. Please note, the into message appears only if the invocation event isn't set to none.
+ 
+ @param welcomeMessageMode An enum to set the welcome message mode to live, beta or disabled.
+ */
++ (void)setWelcomeMessageMode:(IBGWelcomeMessageMode)welcomeMessageMode;
 
 /**
  @brief Enables/disables the attachment of an initial screenshot when reporting a bug/improvement.
@@ -386,15 +406,15 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
 
 /**
  @brief Enables/disables screenshot view when reporting a bug/improvement.
- 
+
  @deprecated Starting from v6.0, use `setWillSkipScreenshotAnnotation:` instead.
- 
+
  @discussion By default, screenshot view is shown when reporting a bug, but not when sending feedback.
- 
+
  @param willShowScreenshotView A boolean to set whether screenshot view is shown or not. Passing YES will show
  screenshot view for both feedback and bug reporting, while passing NO will disable it for both.
  */
-+ (void)setWillShowScreenshotView:(BOOL)willShowScreenshotView DEPRECATED_MSG_ATTRIBUTE("Starting from v6.0, use setWillSkipScreenshotAnnotation: instead.");
++ (void)setWillShowScreenshotView:(BOOL)willShowScreenshotView DEPRECATED_MSG_ATTRIBUTE("This API has no effect now and will be removed soon");
 
 /**
  @brief Enables/disables screenshot view when reporting a bug/improvement.
@@ -404,7 +424,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  @param willSkipScreenShot A boolean to set whether screenshot view is shown or not. Passing YES will show
  screenshot view for both feedback and bug reporting, while passing NO will disable it for both.
  */
-+ (void)setWillSkipScreenshotAnnotation:(BOOL)willSkipScreenShot;
++ (void)setWillSkipScreenshotAnnotation:(BOOL)willSkipScreenShot DEPRECATED_MSG_ATTRIBUTE("This API has no effect now and will be removed soon");
 
 /**
  @brief Returns the number of unread messages the user currently has.
@@ -477,7 +497,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  
  @param isCommentFieldRequired A boolean to indicate whether comment field is required or not.
  */
-+ (void)setCommentFieldRequired:(BOOL)isCommentFieldRequired;
++ (void)setCommentFieldRequired:(BOOL)isCommentFieldRequired DEPRECATED_MSG_ATTRIBUTE("Use setEmailFieldRequired:forAction: instead");
 
 /**
  @brief Sets the threshold value of the shake gesture for iPhone/iPod Touch and iPad.
@@ -530,7 +550,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  
  @param isIntroMessageEnabled A boolean to indicate whether the intro message is enabled or not.
  */
-+ (void)setIntroMessageEnabled:(BOOL)isIntroMessageEnabled;
++ (void)setIntroMessageEnabled:(BOOL)isIntroMessageEnabled DEPRECATED_MSG_ATTRIBUTE("Use setWelcomeMessageMode: instead.");
 
 /**
  @brief Sets whether to show a "Thank You" dialog after a bug report is sent or not.

ios/Instabug.framework/Info.plist

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Instabug.h</key>
 		<data>
-		SGNYZhDFT2EX7GCTETfClZTQXJY=
+		0VzQNGUhwwUakHtSZk/sVjnclBI=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		/nPkkrY39eMx9p9uHRbBsHajFMw=
+		wvwESL9sbWgpOnPmqR1ukQ1GKX0=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -23,11 +23,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			SGNYZhDFT2EX7GCTETfClZTQXJY=
+			0VzQNGUhwwUakHtSZk/sVjnclBI=
 			</data>
 			<key>hash2</key>
 			<data>
-			WKOlkyFQLVjgThj0Q+rMJ+iJKaRVVs+lV56Ly76ap58=
+			HEd4105lVuHD52iHHDs6y5hpz7RKXt8ADlKZLSomPd4=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

ios/Instabug.framework/Instabug

@@ -5,7 +5,7 @@
  
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
  
- Version:    7.12.7
+ Version:    7.14.2
  */
 
 #import <UIKit/UIKit.h>
@@ -21,6 +21,16 @@ extern NSString * const kIBGShakeStartAlertTextStringName;
 extern NSString * const kIBGTwoFingerSwipeStartAlertTextStringName;
 extern NSString * const kIBGEdgeSwipeStartAlertTextStringName;
 extern NSString * const kIBGScreenshotStartAlertTextStringName;
+extern NSString * const kIBGFloatingButtonStartAlertTextStringName;
+extern NSString * const kIBGBetaWelcomeMessageWelcomeStepTitle;
+extern NSString * const kIBGBetaWelcomeMessageWelcomeStepContent;
+extern NSString * const kIBGBetaWelcomeMessageHowToReportStepTitle;
+extern NSString * const kIBGBetaWelcomeMessageHowToReportStepContent;
+extern NSString * const kIBGBetaWelcomeMessageFinishStepTitle;
+extern NSString * const kIBGBetaWelcomeMessageFinishStepContent;
+extern NSString * const kIBGBetaWelcomeDoneButtonTitle;
+extern NSString * const kIBGLiveWelcomeMessageTitle;
+extern NSString * const kIBGLiveWelcomeMessageContent;
 extern NSString * const kIBGInvalidEmailMessageStringName;
 extern NSString * const kIBGInvalidEmailTitleStringName;
 extern NSString * const kIBGInvalidCommentMessageStringName;
@@ -130,6 +140,11 @@ extern NSString * const kIBGExpectedResultsStringName;
 extern NSString * const kIBGActualResultsStringName;
 extern NSString * const kIBGStepsToReproduceStringName;
 extern NSString * const kIBGReplyButtonTitleStringName;
+extern NSString * const kIBGAddAttachmentButtonTitleStringName;
+extern NSString * const kIBGDiscardAlertTitle;
+extern NSString * const kIBGDiscardAlertMessage;
+extern NSString * const kIBGDiscardAlertAction;
+extern NSString * const kIBGDiscardAlertCancel;
 
 /// -----------
 /// @name Enums
@@ -267,7 +282,18 @@ typedef NS_ENUM(NSInteger, IBGString) {
     IBGStringShakeHint,
     IBGStringSwipeHint,
     IBGStringEdgeSwipeStartHint,
+    IBGStringScreenshotHint,
+    IBGStringFloatingButtonHint,
     IBGStringStartAlertText,
+    IBGBetaWelcomeMessageWelcomeStepTitle,
+    IBGBetaWelcomeMessageWelcomeStepContent,
+    IBGBetaWelcomeMessageHowToReportStepTitle,
+    IBGBetaWelcomeMessageHowToReportStepMessage,
+    IBGBetaWelcomeMessageFinishStepTitle,
+    IBGBetaWelcomeMessageFinishStepContent,
+    IBGBetaWelcomeDoneButtonTitle,
+    IBGLiveWelcomeMessageTitle,
+    IBGLiveWelcomeMessageMessage,
     IBGStringInvalidEmailMessage,
     IBGStringInvalidEmailTitle,
     IBGStringInvalidCommentMessage,
@@ -362,7 +388,12 @@ typedef NS_ENUM(NSInteger, IBGString) {
     IBGExpectedResultsStringName,
     IBGActualResultsStringName,
     IBGStepsToReproduceStringName,
-    IBGReplyButtonTitleStringName
+    IBGReplyButtonTitleStringName,
+    IBGAddAttachmentButtonTitleStringName,
+    IBGDiscardAlertTitleStringName,
+    IBGDiscardAlertMessageStringName,
+    IBGDiscardAlertActionStringName,
+    IBGDiscardAlertCancelStringName
 };
 
 /**
@@ -424,6 +455,15 @@ typedef NS_ENUM(NSInteger, IBGExtendedBugReportMode) {
     IBGExtendedBugReportModeDisabled
 };
 
+/**
+ The welcome message mode.
+ */
+typedef NS_ENUM(NSInteger, IBGWelcomeMessageMode) {
+    IBGWelcomeMessageModeLive,
+    IBGWelcomeMessageModeBeta,
+    IBGWelcomeMessageModeDisabled
+};
+
 typedef enum : NSUInteger {
     IBGActionAllActions = 1 << 0,
     IBGActionReportBug = 1 << 1,

ios/Instabug.framework/_CodeSignature/CodeResources

@@ -5,7 +5,7 @@
  
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
  
- Version:    7.12.7
+ Version:    7.14.2
  */
 
 #import <Foundation/Foundation.h>