Merge branch 'master' of https://github.com/Instabug/instabug-reactnative-private into feature/new_public_apis

# Conflicts:
#	android/build.gradle
#	index.js
#	ios/RNInstabug/InstabugReactBridge.m

Author: SalmaAli

android/build.gradle

@@ -24,5 +24,4 @@ dependencies {
     compile ('com.instabug.library:instabug:8.0.1'){
         exclude group: 'com.android.support:appcompat-v7'
     }
-
 }

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

@@ -41,6 +41,7 @@
 import com.instabug.library.invocation.util.InstabugVideoRecordingButtonPosition;
 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.model.Report;
 import com.instabug.library.user.UserEventParam;
@@ -125,6 +126,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";
@@ -1537,6 +1543,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.
@@ -1948,6 +2007,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

@@ -373,7 +373,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.
@@ -1108,6 +1107,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
@@ -1262,6 +1281,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/RNInstabug/InstabugReactBridge.m

@@ -528,6 +528,14 @@ - (dispatch_queue_t)methodQueue {
      [IBGFeatureRequests setEmailFieldRequired:isEmailFieldRequired forAction:actionTypes];
   }
 
+RCT_EXPORT_METHOD(showWelcomeMessageWithMode:(IBGWelcomeMessageMode)welcomeMessageMode) {
+    [Instabug showWelcomeMessageWithMode:welcomeMessageMode];
+}
+
+RCT_EXPORT_METHOD(setWelcomeMessageMode:(IBGWelcomeMessageMode)welcomeMessageMode) {
+    [Instabug setWelcomeMessageMode:welcomeMessageMode];
+}
+
 RCT_EXPORT_METHOD(setEmailFieldRequiredForFeatureRequests:(BOOL)isEmailFieldRequired
                   forAction:(NSArray *)actionTypesArray) {
     IBGAction actionTypes = 0;
@@ -629,6 +637,10 @@ - (NSDictionary *)constantsToExport
               @"enabledWithOptionalFields": @(IBGExtendedBugReportModeEnabledWithOptionalFields),
               @"disabled": @(IBGExtendedBugReportModeDisabled),
 
+              @"welcomeMessageModeLive": @(IBGWelcomeMessageModeLive),
+              @"welcomeMessageModeBeta": @(IBGWelcomeMessageModeBeta),
+              @"welcomeMessageModeDisabled": @(IBGWelcomeMessageModeDisabled),
+
               @"shakeHint": @(IBGStringShakeHint),
               @"swipeHint": @(IBGStringSwipeHint),
               @"edgeSwipeStartHint": @(IBGStringEdgeSwipeStartHint),

ios/RNInstabug/RCTConvert+InstabugEnums.m

@@ -105,6 +105,12 @@ @implementation RCTConvert (InstabugEnums)
                                     @"topLeft": @(IBGPositionTopLeft)
                                     }), IBGPositionBottomRight, integerValue);
 
+RCT_ENUM_CONVERTER(IBGWelcomeMessageMode, (@{
+                                    @"welcomeMessageModeLive": @(IBGWelcomeMessageModeLive),
+                                    @"welcomeMessageModeBeta": @(IBGWelcomeMessageModeBeta),
+                                    @"welcomeMessageModeDisabled": @(IBGWelcomeMessageModeDisabled)
+                                    }), IBGWelcomeMessageModeLive, integerValue);
+
 
 RCT_ENUM_CONVERTER(IBGAction, (@{
                                     @"allActions": @(IBGActionAllActions),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabug-reactnative",
-  "version": "2.11.2",
+  "version": "2.13.1",
   "description": "React Native plugin for integrating the Instabug SDK",
   "main": "index.js",
   "repository": {
@@ -30,4 +30,4 @@
       "packageInstance": "\t\tnew RNInstabugReactnativePackage.Builder(\"YOUR_ANDROID_APPLICATION_TOKEN\",MainApplication.this)\n\t\t\t\t\t\t\t.setInvocationEvent(\"shake\")\n\t\t\t\t\t\t\t.setPrimaryColor(\"#1D82DC\")\n\t\t\t\t\t\t\t.setFloatingEdge(\"left\")\n\t\t\t\t\t\t\t.setFloatingButtonOffsetFromTop(250)\n\t\t\t\t\t\t\t.build()"
     }
   }
-}
+}