💎 Bump to version 8.6.1

alyezz · web-flow · commit 5a628d2b0589 · 2019-08-26T15:28:36.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Version 8.6.1 (2019-08-26)
+
+* Bumps version to 8.6 to be in sync with other platforms.
+* Updates native SDK dependencies to 8.6.1.
+
 ## Version 1.0.0 (2019-07-29)
 
 **⚠️ Package on pub has been renamed to `instabug_flutter` the old package `instabug` is deprecated**
@@ -72,4 +77,4 @@
 Adds the following APIs:
 
 * start(String token, List<InvocationEvent> invocationEvents)
-* showWelcomeMessageWithMode(WelcomeMessageMode welcomeMessageMode)
+* showWelcomeMessageWithMode(WelcomeMessageMode welcomeMessageMode)
diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@
 
 A Flutter plugin for [Instabug](https://instabug.com/).
 
-⚠️ While this plugin is currently in beta, it's safe to start using it and ship apps with it to production. If you'd like to give us [feedback](https://github.com/Instabug/Instabug-Flutter/issues) or create a [pull request](https://github.com/Instabug/Instabug-Flutter/pulls), we would highly appreciate it!
-
 ## Available Features
 
 |      Feature                                              | Status  |
diff --git a/android/build.gradle b/android/build.gradle
@@ -34,6 +34,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.instabug.library:instabug:8.5.0.1'
+    implementation 'com.instabug.library:instabug:8.6.1.0'
     testImplementation 'junit:junit:4.12'
 }
diff --git a/android/src/main/java/com/instabug/instabugflutter/ArgsRegistry.java b/android/src/main/java/com/instabug/instabugflutter/ArgsRegistry.java
@@ -52,7 +52,6 @@ final class ArgsRegistry {
         registerWelcomeMessageArgs(ARGS);
         registerColorThemeArgs(ARGS);
         registerLocaleArgs(ARGS);
-        registerInvocationModeArgs(ARGS);
         registerInvocationOptionsArgs(ARGS);
         registerCustomTextPlaceHolderKeysArgs(ARGS);
         registerInstabugReportTypesArgs(ARGS);
@@ -119,11 +118,6 @@ static void registerColorThemeArgs(Map<String, Object> args) {
         args.put("ColorTheme.dark", InstabugColorTheme.InstabugColorThemeDark);
     }
 
-    static void registerInvocationModeArgs(Map<String, Object> args) {
-        args.put("InvocationMode.bug", BugReporting.ReportType.BUG);
-        args.put("InvocationMode.feedback", BugReporting.ReportType.FEEDBACK);
-    }
-
     static void registerInvocationOptionsArgs(Map<String, Object> args) {
         args.put("InvocationOption.commentFieldRequired", Option.COMMENT_FIELD_REQUIRED);
         args.put("InvocationOption.disablePostSendingDialog", Option.DISABLE_POST_SENDING_DIALOG);
@@ -168,6 +162,7 @@ static void registerCustomTextPlaceHolderKeysArgs(Map<String, Object> args) {
         args.put("CustomTextPlaceHolderKey.emailFieldHint", InstabugCustomTextPlaceHolder.Key.EMAIL_FIELD_HINT);
         args.put("CustomTextPlaceHolderKey.commentFieldHintForBugReport", InstabugCustomTextPlaceHolder.Key.COMMENT_FIELD_HINT_FOR_BUG_REPORT);
         args.put("CustomTextPlaceHolderKey.commentFieldHintForFeedback", InstabugCustomTextPlaceHolder.Key.COMMENT_FIELD_HINT_FOR_FEEDBACK);
+        args.put("CustomTextPlaceHolderKey.commentFieldHintForQuestion", InstabugCustomTextPlaceHolder.Key.COMMENT_FIELD_HINT_FOR_QUESTION);
         args.put("CustomTextPlaceHolderKey.addVoiceMessage", InstabugCustomTextPlaceHolder.Key.ADD_VOICE_MESSAGE);
         args.put("CustomTextPlaceHolderKey.addImageFromGallery", InstabugCustomTextPlaceHolder.Key.ADD_IMAGE_FROM_GALLERY);
         args.put("CustomTextPlaceHolderKey.addExtraScreenshot", InstabugCustomTextPlaceHolder.Key.ADD_EXTRA_SCREENSHOT);
@@ -194,6 +189,7 @@ static void registerCustomTextPlaceHolderKeysArgs(Map<String, Object> args) {
     static void registerInstabugReportTypesArgs(Map<String, Object> args) {
         args.put("ReportType.bug", BugReporting.ReportType.BUG);
         args.put("ReportType.feedback", BugReporting.ReportType.FEEDBACK);
+        args.put("ReportType.question", BugReporting.ReportType.QUESTION);
     }
 
     static void registerInstabugExtendedBugReportModeArgs(Map<String, Object> args) {
diff --git a/android/src/main/java/com/instabug/instabugflutter/InstabugFlutterPlugin.java b/android/src/main/java/com/instabug/instabugflutter/InstabugFlutterPlugin.java
@@ -315,27 +315,6 @@ public void run() {
         });
     }
 
-     /**
-     * invoke sdk manually with desire invocation mode
-     *
-     * @param invocationMode the invocation mode
-     * @param invocationOptions the array of invocation options
-     */
-     public void invokeWithMode(String invocationMode, List<String> invocationOptions) {
-        switch (invocationMode) {
-            case "InvocationMode.chats" : Chats.show();
-                return;
-            case "InvocationMode.replies" : Replies.show();
-                return;
-        }
-        int[] options = new int[invocationOptions.size()];
-        for (int i = 0; i < invocationOptions.size(); i++) {
-           options[i] = ArgsRegistry.getDeserializedValue(invocationOptions.get(i), Integer.class);
-        }
-        int invMode = ArgsRegistry.getDeserializedValue(invocationMode, Integer.class);
-        BugReporting.show(invMode, options);
-     }
-
     /**
      * 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.
diff --git a/example/android/app/src/androidTest/java/com/instabug/instabugflutterexample/InvokeInstabugUITest.java b/example/android/app/src/androidTest/java/com/instabug/instabugflutterexample/InvokeInstabugUITest.java
@@ -28,7 +28,7 @@ public void ensureInstabugInvocati1on() throws InterruptedException {
         disableScreenShotByMediaProjection();
         onView(withResourceName("instabug_floating_button")).perform(click());
         Thread.sleep(5000);
-        onView(withText("Report a problem")).perform(click());
+        onView(withText("Report a bug")).perform(click());
         Thread.sleep(5000);
         onView(withResourceName("instabug_edit_text_email")).perform(replaceText("inst@bug.com"));
         onView(withResourceName("instabug_bugreporting_send")).perform(click());
diff --git a/example/android/app/src/main/java/com/instabug/instabugflutterexample/OnMethodCallTests.java b/example/android/app/src/main/java/com/instabug/instabugflutterexample/OnMethodCallTests.java
@@ -77,17 +77,17 @@ public void testAppendTags() {
         verify(instabugMock).appendTags(tags);
     }
 
-    public void testInvokeWithMode() {
-        String methodName = "invokeWithMode";
+    public void testShowBugReportingWithReportTypeAndOptions() {
+        String methodName = "showBugReportingWithReportTypeAndOptions";
         ArrayList<Object> argsList = new ArrayList<>();
         ArrayList<String> options = new ArrayList<>();
         options.add("commentFieldRequired");
         options.add("disablePostSendingDialog");
         argsList.add("bug");
         argsList.add(options);
-        Mockito.doNothing().when(instabugMock).invokeWithMode(any(String.class),any(ArrayList.class));
+        Mockito.doNothing().when(instabugMock).showBugReportingWithReportTypeAndOptions(any(String.class),any(ArrayList.class));
         testMethodCall(methodName,argsList);
-        verify(instabugMock).invokeWithMode("bug", options);
+        verify(instabugMock).showBugReportingWithReportTypeAndOptions("bug", options);
     }
 
     public void testSetSessionProfilerEnabled() {
diff --git a/example/android/app/src/test/java/com/instabug/instabugflutterexample/InstabugFlutterPluginTest.java b/example/android/app/src/test/java/com/instabug/instabugflutterexample/InstabugFlutterPluginTest.java
@@ -46,8 +46,8 @@ public void testAppendTags() {
      * (String, ArrayList<String>)
      */
     @Test
-    public void testInvokeWithMode() {
-        new OnMethodCallTests().testInvokeWithMode();
+    public void testShowBugReportingWithReportTypeAndOptions() {
+        new OnMethodCallTests().testShowBugReportingWithReportTypeAndOptions();
     }
 
     /**
diff --git a/example/ios/instabug_flutter_exampleTests/instabug_flutter_exampleTests.m b/example/ios/instabug_flutter_exampleTests/instabug_flutter_exampleTests.m
@@ -64,17 +64,17 @@ - (void)testAppendTags {
     [[[mock verify] classMethod] appendTags:tags];
 }
 
-- (void)testInvokeWithMode {
+- (void)testShowBugReportingWithReportTypeAndOptions {
     id mock = OCMClassMock([InstabugFlutterPlugin class]);
     InstabugFlutterPlugin *instabug = [[InstabugFlutterPlugin alloc] init];
     id result;
     
     NSArray *options = [NSArray arrayWithObjects:@"commentFieldRequired", @"disablePostSendingDialog", nil];
     NSArray *arguments = [NSArray arrayWithObjects:@"bug", options, nil];
-    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"invokeWithMode:options:" arguments:arguments];
-    [[[mock stub] classMethod] invokeWithMode:@"bug"options:options];
+    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"showBugReportingWithReportTypeAndOptions:options:" arguments:arguments];
+    [[[mock stub] classMethod] showBugReportingWithReportTypeAndOptions:@"bug"options:options];
     [instabug  handleMethodCall:call result:result];
-    [[[mock verify] classMethod] invokeWithMode:@"bug"options:options];
+    [[[mock verify] classMethod] showBugReportingWithReportTypeAndOptions:@"bug"options:options];
 }
 
 - (void)testSetSessionProfilerEnabled {
diff --git a/example/ios/instabug_flutter_exampleUITests/instabug_flutter_exampleUITests.m b/example/ios/instabug_flutter_exampleUITests/instabug_flutter_exampleUITests.m
@@ -24,7 +24,7 @@ - (void)testInstabugSendBugReport {
     XCUIApplication *app = [[XCUIApplication alloc] init];
     XCUIElement *ibgfloatingbuttonaccessibilityidentifierElement = app/*@START_MENU_TOKEN@*/.otherElements[@"IBGFloatingButtonAccessibilityIdentifier"]/*[[".otherElements[@\"Floating Button\"]",".otherElements[@\"IBGFloatingButtonAccessibilityIdentifier\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/;
     [ibgfloatingbuttonaccessibilityidentifierElement tap];
-    [app.tables/*@START_MENU_TOKEN@*/.staticTexts[@"Report a problem"]/*[[".cells[@\"Report a problem\"].staticTexts[@\"Report a problem\"]",".cells[@\"IBGReportBugPromptOptionAccessibilityIdentifier\"].staticTexts[@\"Report a problem\"]",".staticTexts[@\"Report a problem\"]"],[[[-1,2],[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/ tap];
+    [app.tables.staticTexts[@"Report a bug"] tap];
 
     XCUIElement *textField = app.scrollViews.otherElements.textFields[@"IBGBugInputViewEmailFieldAccessibilityIdentifier"];
     [textField tap];
@@ -33,7 +33,7 @@ - (void)testInstabugSendBugReport {
         [app.menuItems[@"Select All"] tap];
     }
     [textField typeText:@"inst@bug.com"];
-    [app.navigationBars[@"Report a problem"]/*@START_MENU_TOKEN@*/.buttons[@"IBGBugVCNextButtonAccessibilityIdentifier"]/*[[".buttons[@\"Send\"]",".buttons[@\"IBGBugVCNextButtonAccessibilityIdentifier\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/ tap];
+    [app.navigationBars[@"Report a bug"]/*@START_MENU_TOKEN@*/.buttons[@"IBGBugVCNextButtonAccessibilityIdentifier"]/*[[".buttons[@\"Send\"]",".buttons[@\"IBGBugVCNextButtonAccessibilityIdentifier\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/ tap];
 
     XCUIElement *element = app.staticTexts[@"Thank you"];
     [self waitForElementToAppear:element withTimeout:5];
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -31,6 +31,7 @@ class _MyAppState extends State<MyApp> {
     try {
       if (Platform.isIOS) {
         Instabug.start('efa41f402620b5654f2af2b86e387029', <InvocationEvent>[InvocationEvent.floatingButton]);
+        BugReporting.setReportTypes([ReportType.bug, ReportType.feedback]);
       }
     } on PlatformException {
       platformVersion = 'Failed to get platform version.';
@@ -50,15 +51,15 @@ class _MyAppState extends State<MyApp> {
   }
 
   void sendBugReport() {
-    BugReporting.invoke(InvocationMode.bug, [InvocationOption.emailFieldOptional]);
+    BugReporting.show(ReportType.bug, [InvocationOption.emailFieldOptional]);
   }
 
   void sendFeedback() {
-    BugReporting.invoke(InvocationMode.feedback, [InvocationOption.emailFieldOptional]);
+    BugReporting.show(ReportType.feedback, [InvocationOption.emailFieldOptional]);
   }
 
-  void startNewConversation () {
-    Chats.show();
+  void askQuestion() {
+    BugReporting.show(ReportType.question, [InvocationOption.emailFieldOptional]);
   }
 
   void showNpsSurvey() {
@@ -136,9 +137,9 @@ class _MyAppState extends State<MyApp> {
               margin: const EdgeInsets.only(left: 20.0, right: 20.0),
               // height: double.infinity,
               child:  RaisedButton(
-                onPressed: startNewConversation,
+                onPressed: askQuestion,
                 textColor: Colors.white,
-                child: Text('Start a New Conversation'),
+                child: Text('Ask a Question'),
                 color: Colors.lightBlue),
             ),
             Container(
diff --git a/ios/Classes/InstabugFlutterPlugin.m b/ios/Classes/InstabugFlutterPlugin.m
@@ -246,30 +246,6 @@ + (void) show {
     [Instabug show];
 }
 
-/**
-  * invoke sdk manually with desire invocation mode
-  *
-  * @param invocationMode the invocation mode
-  * @param invocationOptions the array of invocation options
-  */
-+ (void) invokeWithMode:(NSString *)invocationMode options:(NSArray*)invocationOptionsArray {
-    if ([invocationMode isEqualToString:@"InvocationMode.chats"]) {
-         [IBGChats show];
-         return;
-    }
-     if ([invocationMode isEqualToString:@"InvocationMode.replies"]) {
-        [IBGReplies show];
-        return;
-    }
-    NSDictionary *constants = [self constants];
-    NSInteger invocationOptions = 0;
-    for (NSString * invocationOption in invocationOptionsArray) {
-        invocationOptions |= ((NSNumber *) constants[invocationOption]).integerValue;
-    }
-    NSInteger invocation = ((NSNumber *) constants[invocationMode]).integerValue;
-    [IBGBugReporting showWithReportType:invocation options:invocationOptions];
-}
-
  /**
   * 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.
@@ -493,7 +469,7 @@ + (void)setInvocationOptions:(NSArray *)invocationOptionsArray {
     for (NSString * invocationOption in invocationOptionsArray) {
         invocationOptions |= ((NSNumber *) constants[invocationOption]).integerValue;
     }
-    IBGBugReporting.invocationOptions = invocationOptions;
+    IBGBugReporting.bugReportingOptions = invocationOptions;
 }
 
 /**
@@ -771,9 +747,6 @@ + (NSDictionary *)constants {
       @"ColorTheme.dark": @(IBGColorThemeDark),
       @"ColorTheme.light": @(IBGColorThemeLight),
 
-      @"InvocationMode.bug": @(IBGBugReportingReportTypeBug),
-      @"InvocationMode.feedback": @(IBGBugReportingReportTypeFeedback),
-
       @"InvocationOption.commentFieldRequired": @(IBGBugReportingOptionCommentFieldRequired),
       @"InvocationOption.disablePostSendingDialog": @(IBGBugReportingOptionDisablePostSendingDialog),
       @"InvocationOption.emailFieldHidden": @(IBGBugReportingOptionEmailFieldHidden),
@@ -809,6 +782,7 @@ + (NSDictionary *)constants {
       @"CustomTextPlaceHolderKey.emailFieldHint": kIBGEmailFieldPlaceholderStringName,
       @"CustomTextPlaceHolderKey.commentFieldHintForBugReport": kIBGCommentFieldPlaceholderForBugReportStringName,
       @"CustomTextPlaceHolderKey.commentFieldHintForFeedback": kIBGCommentFieldPlaceholderForFeedbackStringName,
+      @"CustomTextPlaceHolderKey.commentFieldHintForQuestion": kIBGCommentFieldPlaceholderForQuestionStringName,
       @"CustomTextPlaceHolderKey.addVoiceMessage": kIBGAddVoiceMessageStringName,
       @"CustomTextPlaceHolderKey.addImageFromGallery": kIBGAddImageFromGalleryStringName,
       @"CustomTextPlaceHolderKey.addExtraScreenshot": kIBGAddExtraScreenshotStringName,
@@ -833,6 +807,7 @@ + (NSDictionary *)constants {
 
       @"ReportType.bug": @(IBGBugReportingReportTypeBug),
       @"ReportType.feedback": @(IBGBugReportingReportTypeFeedback),
+      @"ReportType.question": @(IBGBugReportingReportTypeQuestion),
 
       @"ExtendedBugReportMode.enabledWithRequiredFields": @(IBGExtendedBugReportModeEnabledWithRequiredFields),
       @"ExtendedBugReportMode.enabledWithOptionalFields": @(IBGExtendedBugReportModeEnabledWithOptionalFields),
diff --git a/ios/instabug_flutter.podspec b/ios/instabug_flutter.podspec
@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Instabug', '8.5.2'
+  s.dependency 'Instabug', '8.6.1'
 
   s.ios.deployment_target = '10.0'
   s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-framework "Flutter" -framework "Instabug"'}
diff --git a/lib/BugReporting.dart b/lib/BugReporting.dart
@@ -11,7 +11,7 @@ enum InvocationOption {
 
 enum DismissType { cancel, submit, addAttachment }
 
-enum ReportType { bug, feedback, other }
+enum ReportType { bug, feedback, question, other }
 
 enum ExtendedBugReportMode {
   enabledWithRequiredFields,
@@ -71,24 +71,6 @@ class BugReporting {
     }
   }
 
-  /// invoke sdk manually with desire invocation mode
-  /// [invocationMode] the invocation mode
-  /// [invocationOptions] the array of invocation options
-  static void invoke(InvocationMode invocationMode,
-      [List<InvocationOption> invocationOptions]) async {
-    final List<String> invocationOptionsStrings = <String>[];
-    if (invocationOptions != null) {
-      invocationOptions.forEach((e) {
-        invocationOptionsStrings.add(e.toString());
-      });
-    }
-    final List<dynamic> params = <dynamic>[
-      invocationMode.toString(),
-      invocationOptionsStrings
-    ];
-    await _channel.invokeMethod<Object>('invokeWithMode:options:', params);
-  }
-
   ///Enables and disables manual invocation and prompt options for bug and feedback.
   /// [boolean] isEnabled
   static void setEnabled(bool isEnabled) async {
diff --git a/lib/Chats.dart b/lib/Chats.dart
@@ -8,12 +8,16 @@ class Chats {
     final String version = await _channel.invokeMethod('getPlatformVersion');
     return version;
   }
-
+  
+  @deprecated
+  ///Use {@link BugReporting.show} instead.
   ///Manual invocation for chats view.
   static void show() async {
     await _channel.invokeMethod<Object>('showChats');
   }
 
+  @deprecated
+  ///Use {@link BugReporting.setReportTypes} instead.
   /// Enables and disables everything related to creating new chats.
   /// [boolean] isEnabled
   static void setEnabled(bool isEnabled) async {
diff --git a/lib/Instabug.dart b/lib/Instabug.dart
@@ -39,8 +39,6 @@ enum IBGLocale {
   norwegian
 }
 
-enum InvocationMode { bug, feedback, chats, replies }
-
 enum ColorTheme { dark, light }
 
 enum CustomTextPlaceHolderKey {
@@ -55,6 +53,7 @@ enum CustomTextPlaceHolderKey {
   emailFieldHint,
   commentFieldHintForBugReport,
   commentFieldHintForFeedback,
+  commentFieldHintForQuestion,
   addVoiceMessage,
   addImageFromGallery,
   addExtraScreenshot,
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: instabug_flutter
-version: 1.0.0
+version: 8.6.1
 description: >-
   Instabug is an in-app feedback and bug reporting tool for mobile apps. 
   With just a simple shake, your users or beta testers can report bugs or 
diff --git a/test/instabug_flutter_test.dart b/test/instabug_flutter_test.dart
@@ -256,17 +256,6 @@ test('startWithToken:invocationEvents: Test', () async {
     ]);
   });
 
-  
-  test('invokeWithMode:options: Test', () async {
-    BugReporting.invoke(InvocationMode.bug, [InvocationOption.commentFieldRequired]);
-    final List<dynamic> args = <dynamic>[InvocationMode.bug.toString(), <String>[InvocationOption.commentFieldRequired.toString()]];
-    expect(log, <Matcher>[
-      isMethodCall('invokeWithMode:options:',
-        arguments: args,
-      )
-    ]);
-  });
-
   test('logUserEventWithName: Test', () async {
     Instabug.logUserEvent(name);
     final List<dynamic> args = <dynamic>[name];

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ android {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`dependencies {`
`37`		`- implementation 'com.instabug.library:instabug:8.5.0.1'`
	`37`	`+ implementation 'com.instabug.library:instabug:8.6.1.0'`
`38`	`38`	`testImplementation 'junit:junit:4.12'`
`39`	`39`	`}`