Merge pull request #176 from Instabug/release/9.1.9

[MOB-5225] Release/9.1.9

Author: ymabdallah

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2
 jobs:
    android_tests:
-    working_directory: ~/project/InstabugSample/android
+    working_directory: ~/project/example/android
     macos:
       xcode: "12.3.0"
     environment:
@@ -75,7 +75,7 @@ jobs:
    ios_tests:
     macos:
       xcode: "12.3.0"
-    working_directory: ~/project/InstabugSample
+    working_directory: ~/project/example
     environment:
       FL_OUTPUT_DIR: output
     steps:
@@ -118,6 +118,11 @@ jobs:
       xcode: "12.3.0"
     steps:
       - checkout
+      - run: git clone https://github.com/kylef/swiftenv.git ~/.swiftenv
+      - run: echo 'export SWIFTENV_ROOT="$HOME/.swiftenv"' >> $BASH_ENV
+      - run: echo 'export PATH="$SWIFTENV_ROOT/bin:$PATH"' >> $BASH_ENV
+      - run: echo 'eval "$(swiftenv init -)"' >> $BASH_ENV
+      - run: swiftenv install 5.0.3 && swiftenv global 5.0.3
       - run: git clone https://InstabugCI:[email protected]/Instabug/Escape.git
       - run: cd Escape; swift build -c release -Xswiftc -static-stdlib
       - run: cd Escape/.build/release; cp -f Escape /usr/local/bin/escape
@@ -140,17 +145,18 @@ workflows:
           filters:
             branches:
               only: master
-      - publish:
+      - release:
           context: cross-platform
           requires:
             - hold
           filters:
             branches:
               only: master
-      - release:
+      - publish:
           context: cross-platform
           requires:
             - hold
+            - release
           filters:
             branches:
               only: master

CHANGELOG.md

@@ -34,6 +34,6 @@ android {
     }
 }
 dependencies {
-    implementation 'com.instabug.library:instabug:9.1.8.1'
+    implementation 'com.instabug.library:instabug:9.1.8.2'
     testImplementation 'junit:junit:4.12'
 }

LICENSE.md renamed to LICENSE

@@ -189,6 +189,9 @@ static void registerCustomTextPlaceHolderKeysArgs(Map<String, Object> args) {
         args.put("CustomTextPlaceHolderKey.betaWelcomeMessageFinishStepContent", InstabugCustomTextPlaceHolder.Key.BETA_WELCOME_MESSAGE_FINISH_STEP_CONTENT);
         args.put("CustomTextPlaceHolderKey.liveWelcomeMessageTitle", InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_TITLE);
         args.put("CustomTextPlaceHolderKey.liveWelcomeMessageContent", InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_CONTENT);
+        args.put("CustomTextPlaceHolderKey.repliesNotificationTeamName", InstabugCustomTextPlaceHolder.Key.CHATS_TEAM_STRING_NAME);
+        args.put("CustomTextPlaceHolderKey.repliesNotificationReplyButton", InstabugCustomTextPlaceHolder.Key.REPLIES_NOTIFICATION_REPLY_BUTTON);
+        args.put("CustomTextPlaceHolderKey.repliesNotificationDismissButton", InstabugCustomTextPlaceHolder.Key.REPLIES_NOTIFICATION_DISMISS_BUTTON);
     }
 
     static void registerInstabugReportTypesArgs(Map<String, Object> args) {

android/build.gradle

@@ -283,6 +283,9 @@ private List<InstabugCustomTextPlaceHolder.Key> getCurrentlySupportedKeysBySDK()
         keys.add(InstabugCustomTextPlaceHolder.Key.BETA_WELCOME_MESSAGE_FINISH_STEP_CONTENT);
         keys.add(InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_TITLE);
         keys.add(InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_CONTENT);
+        keys.add(InstabugCustomTextPlaceHolder.Key.CHATS_TEAM_STRING_NAME);
+        keys.add(InstabugCustomTextPlaceHolder.Key.REPLIES_NOTIFICATION_REPLY_BUTTON);
+        keys.add(InstabugCustomTextPlaceHolder.Key.REPLIES_NOTIFICATION_DISMISS_BUTTON);
         return keys;
     }
 
@@ -329,6 +332,9 @@ private List<InstabugCustomTextPlaceHolder.Key> getAllCustomTextPlaceHolderKeys(
         keys.add(InstabugCustomTextPlaceHolder.Key.SURVEYS_WELCOME_SCREEN_SUBTITLE);
         keys.add(InstabugCustomTextPlaceHolder.Key.SURVEYS_WELCOME_SCREEN_BUTTON);
         keys.add(InstabugCustomTextPlaceHolder.Key.REQUEST_FEATURE);
+        keys.add(InstabugCustomTextPlaceHolder.Key.CHATS_TEAM_STRING_NAME);
+        keys.add(InstabugCustomTextPlaceHolder.Key.REPLIES_NOTIFICATION_REPLY_BUTTON);
+        keys.add(InstabugCustomTextPlaceHolder.Key.REPLIES_NOTIFICATION_DISMISS_BUTTON);
         return keys;
     }
 }

android/src/main/java/com/instabug/instabugflutter/ArgsRegistry.java

@@ -900,6 +900,10 @@ + (NSDictionary *)constants {
       @"CustomTextPlaceHolderKey.liveWelcomeMessageTitle": kIBGLiveWelcomeMessageTitle,
       @"CustomTextPlaceHolderKey.liveWelcomeMessageContent": kIBGLiveWelcomeMessageContent,
 
+      @"CustomTextPlaceHolderKey.repliesNotificationTeamName": kIBGTeamStringName,
+      @"CustomTextPlaceHolderKey.repliesNotificationReplyButton": kIBGReplyButtonTitleStringName,
+      @"CustomTextPlaceHolderKey.repliesNotificationDismissButton": kIBGDismissButtonTitleStringName,
+
       @"ReportType.bug": @(IBGBugReportingReportTypeBug),
       @"ReportType.feedback": @(IBGBugReportingReportTypeFeedback),
       @"ReportType.question": @(IBGBugReportingReportTypeQuestion),

android/src/test/java/com/instabug/instabugflutter/ArgsRegistryTest.java

@@ -76,7 +76,10 @@ enum CustomTextPlaceHolderKey {
   betaWelcomeMessageFinishStepTitle,
   betaWelcomeMessageFinishStepContent,
   liveWelcomeMessageTitle,
-  liveWelcomeMessageContent
+  liveWelcomeMessageContent,
+  repliesNotificationTeamName,
+  repliesNotificationReplyButton,
+  repliesNotificationDismissButton
 }
 
 enum ReproStepsMode { enabled, disabled, enabledWithNoScreenshots }

InstabugSample/.gitignore renamed to example/.gitignore

@@ -1,13 +1,12 @@
 name: instabug_flutter
-version: 9.1.8
+version: 9.1.9
 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 
   send in-app feedback and the SDK will capture an environment snapshot of 
   your user's device including all console logs, server-side network requests 
   and bug reproduction steps compiling all these details in one organised dashboard
   to help you debug and fix bugs faster.
-author: Instabug <[email protected]>
 homepage: https://github.com/Instabug/Instabug-Flutter#readme
 documentation: https://github.com/Instabug/Instabug-Flutter#readme