🤝 Merge pull request #2 from Instabug/feature/2.7_new_apis

Feature/2.7 new apis

Author: salmatarzi

android/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile ('com.instabug.library:instabug:4.10.2'){
+    compile ('com.instabug.library:instabug:4.11.1'){
         exclude group: 'com.android.support'
     }
 

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

@@ -21,6 +21,7 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
+import com.instabug.library.extendedbugreport.ExtendedBugReport;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.invocation.InstabugInvocationMode;
@@ -87,6 +88,11 @@ public class RNInstabugReactnativeModule extends ReactContextBaseJavaModule {
     private final String BOTTOM_RIGHT = "bottomRight";
     private final String BOTTOM_LEFT = "bottomLeft";
 
+    //Instabug extended bug report modes
+    private final String EXTENDED_BUG_REPORT_REQUIRED_FIELDS = "enabledWithRequiredFields";
+    private final String EXTENDED_BUG_REPORT_OPTIONAL_FIELDS = "enabledWithOptionalFields";
+    private final String EXTENDED_BUG_REPORT_DISABLED = "disabled";
+
     //Theme colors
     private final String COLOR_THEME_LIGHT = "light";
     private final String COLOR_THEME_DARK = "dark";
@@ -205,6 +211,8 @@ public void invokeWithInvocationMode(String invocationMode) {
     }
 
 
+
+
     /**
      * Dismisses all visible Instabug views
      */
@@ -279,6 +287,33 @@ public void changeLocale(String instabugLocale) {
         }
     }
 
+    /**
+     * Sets whether the extended bug report mode should be disabled,
+     * enabled with required fields,  or enabled with optional fields.
+     *
+     * @param extendedBugReportMode
+     */
+    @ReactMethod
+    public void setExtendedBugReportMode(String extendedBugReportMode) {
+        try {
+          switch(extendedBugReportMode) {
+              case EXTENDED_BUG_REPORT_REQUIRED_FIELDS:
+                  Instabug.setExtendedBugReportState(ExtendedBugReport.State.ENABLED_WITH_REQUIRED_FIELDS);
+                  break;
+              case EXTENDED_BUG_REPORT_OPTIONAL_FIELDS:
+                  Instabug.setExtendedBugReportState(ExtendedBugReport.State.ENABLED_WITH_OPTIONAL_FIELDS);
+                  break;
+              case EXTENDED_BUG_REPORT_DISABLED:
+                  Instabug.setExtendedBugReportState(ExtendedBugReport.State.DISABLED);
+                  break;
+              default:
+                  Instabug.setExtendedBugReportState(ExtendedBugReport.State.DISABLED);
+          }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @ReactMethod
     public void setViewHierarchyEnabled(boolean enabled) {
         try {
@@ -1435,6 +1470,10 @@ public Map<String, Object> getConstants() {
         constants.put("bottomRight", BOTTOM_RIGHT);
         constants.put("bottomLeft", BOTTOM_LEFT);
 
+        constants.put("enabledWithRequiredFields", EXTENDED_BUG_REPORT_REQUIRED_FIELDS);
+        constants.put("enabledWithOptionalFields", EXTENDED_BUG_REPORT_OPTIONAL_FIELDS);
+        constants.put("disabled", EXTENDED_BUG_REPORT_DISABLED);
+
         constants.put("shakeHint", SHAKE_HINT);
         constants.put("swipeHint", SWIPE_HINT);
         constants.put("invalidEmailMessage", INVALID_EMAIL_MESSAGE);

index.js

@@ -515,6 +515,7 @@ module.exports = {
     },
 
     /**
+     * @deprecated since version 2.7.0, you can now add categories from the dashboard.
      * Sets an array of report categories to be shown for users to select from before reporting a
      * bug or sending feedback.
      * Use this method to give users a list of choices of categories their bug report or feedback
@@ -529,6 +530,17 @@ module.exports = {
         }
     },
 
+    /**
+     * ets whether the extended bug report mode should be disabled, enabled with
+     * required fields or enabled with optional fields.
+     * @param {extendedBugReportMode} extendedBugReportMode An enum to disable
+     *                                the extended bug report mode, enable it
+     *                                with required or with optional fields.
+     */
+    setExtendedBugReportMode: function (extendedBugReportMode) {
+        Instabug.setExtendedBugReportMode(extendedBugReportMode);
+    },
+
     /**
      * Logs a user event that happens through the lifecycle of the application.
      * Logged user events are going to be sent with each report, as well as at the end of a session.
@@ -935,6 +947,18 @@ module.exports = {
         chatsList: Instabug.invocationModeChatsList
     },
 
+    /**
+     *  The extended bug report mode
+     * @readonly
+     * @enum {number}
+     */
+    extendedBugReportMode: {
+        enabledWithRequiredFields: Instabug.enabledWithRequiredFields,
+        enabledWithOptionalFields: Instabug.enabledWithOptionalFields,
+        disabled: Instabug.disabled
+    },
+
+
     /**
      * The supported locales
      * @readonly

ios/Instabug.framework/Headers/Instabug.h

@@ -5,7 +5,7 @@
 
  Copyright:  (c) 2013-2018 by Instabug, Inc., all rights reserved.
 
- Version:    7.9.2
+ Version:    7.10
  */
 
 #import <Foundation/Foundation.h>
@@ -697,7 +697,7 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  @param names Array of names of icons to be shown along with titles. Use the same names you would use
  with `+ [UIImage imageNamed:]`.
  */
-+ (void)setReportCategoriesWithTitles:(NSArray<NSString *> *)titles iconNames:(nullable NSArray<NSString *> *)names;
++ (void)setReportCategoriesWithTitles:(NSArray<NSString *> *)titles iconNames:(nullable NSArray<NSString *> *)names DEPRECATED_MSG_ATTRIBUTE("Starting from v7.9, you can add categories from dashboard.");
 
 /**
  @brief Sets an array of report categories to be shown for users to select from before reporting a bug or sending
@@ -708,14 +708,26 @@ typedef void (^NetworkObfuscationCompletionBlock)(NSData *data, NSURLResponse *r
  @param title extra field key.
  @param required determine whether this field is required or not.
  */
-+ (void)addExtraReportFieldWithTitle:(NSString *)title required:(BOOL)required;
++ (void)addExtraReportFieldWithTitle:(NSString *)title required:(BOOL)required DEPRECATED_MSG_ATTRIBUTE("Starting from v7.9, use setExtendedBugReportMode: instead");;
 
 /**
  @brief Remove all extra fields.
  
  @discussion Use this method to remove all added extra fields.
  */
-+ (void)removeExtraReportFields;
++ (void)removeExtraReportFields DEPRECATED_MSG_ATTRIBUTE("Starting from v7.9, use setExtendedBugReportMode: instead");;
+
+/**
+ @brief Sets whether the extended bug report mode should be disabled, enabled with required fields or enabled with optional fields.
+ 
+ @discussion This feature is disabled by default. When enabled, it adds more fields for your reporters to fill in. You can set whether the extra fields are required or optional.
+ 1. Expected Results.
+ 2. Actual Results.
+ 3. Steps to Reproduce.
+ 
+ @param extendedBugReportMode An enum to disable the extended bug report mode, enable it with required or with optional fields.
+ */
++ (void)setExtendedBugReportMode:(IBGExtendedBugReportMode)extendedBugReportMode;
 
 /**
  @brief Set custom user attributes that are going to be sent with each feedback, bug or crash.

ios/Instabug.framework/Info.plist

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/Instabug.h</key>
 		<data>
-		4kxZEeE00REbmUfGg94C3NULVvw=
+		EW0LawU2ocbTJXyXab6eGuYBqIg=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		VKe9NgIDfUhBqsBVFqPK7wnZNKg=
+		uPr3dFdFtDxfIr/Z4Ak4dMZUtXU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -23,11 +23,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			4kxZEeE00REbmUfGg94C3NULVvw=
+			EW0LawU2ocbTJXyXab6eGuYBqIg=
 			</data>
 			<key>hash2</key>
 			<data>
-			jm2cECRm9S/pqpKmkItxvSLqsykctBM5sYtNF2GHj0o=
+			1QgezJN+NvpRWcOOsFWXKUZJT723WvQT5vRR6J+lA/Y=
 			</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.9.2
+ Version:    7.10
  */
 
 #import <UIKit/UIKit.h>
@@ -78,6 +78,10 @@ extern NSString * const kIBGSurveyThankYouTitleText;
 extern NSString * const kIBGSurveyThankYouDescriptionText;
 extern NSString * const kIBGSurveysNPSLeastLikelyStringName;
 extern NSString * const kIBGSurveysNPSMostLikelyStringName;
+extern NSString * const kIBGExpectedResultsStringName;
+extern NSString * const kIBGActualResultsStringName;
+extern NSString * const kIBGStepsToReproduceStringName;
+extern NSString * const kIBGReplyButtonTitleStringName;
 
 /// -----------
 /// @name Enums
@@ -262,7 +266,11 @@ typedef NS_ENUM(NSInteger, IBGString) {
     IBGStringSurveyIntroTakeSurveyButtonText,
     IBGStringSurveyIntroDismissButtonText,
     IBGStringSurveyThankYouTitleText,
-    IBGStringSurveyThankYouDescriptionText
+    IBGStringSurveyThankYouDescriptionText,
+    IBGExpectedResultsStringName,
+    IBGActualResultsStringName,
+    IBGStepsToReproduceStringName,
+    IBGReplyButtonTitleStringName
 };
 
 /**
@@ -315,6 +323,15 @@ typedef NS_OPTIONS(NSInteger, IBGAttachmentType) {
     IBGAttachmentTypeScreenRecording = 1 << 6,
 };
 
+/**
+ The extended bug report mode.
+ */
+typedef NS_ENUM(NSInteger, IBGExtendedBugReportMode) {
+    IBGExtendedBugReportModeEnabledWithRequiredFields,
+    IBGExtendedBugReportModeEnabledWithOptionalFields,
+    IBGExtendedBugReportModeDisabled
+};
+
 @interface UIView (Instabug)
 
 /**

ios/Instabug.framework/_CodeSignature/CodeResources

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