Merge pull request #527 from Instabug/refactor/monorepo-private-view-package

Refactor: merge private-views package into mono-repo

Author: ahmedAlaaInstabug

.circleci/config.yml

@@ -334,6 +334,15 @@ jobs:
       - run: chmod +x packages/instabug_flutter_modular/release.sh
       - run: ./packages/instabug_flutter_modular/release.sh
 
+  release_instabug_private_views_plugin:
+    executor: flutter-executor
+    steps:
+      - advanced-checkout/shallow-checkout
+      - setup_flutter
+      - run: chmod +x packages/instabug_private_views/release.sh
+      - run: ./packages/instabug_private_views/release.sh
+
+
   release_instabug_flutter:
     macos:
       xcode: 15.2.0
@@ -454,6 +463,20 @@ workflows:
           filters:
             branches:
               only: master
+      - hold_release_instabug_private_views_plugin:
+          type: approval
+          requires:
+            - test_flutter-stable
+          filters:
+            branches:
+              only: master
+      - release_instabug_private_views_plugin:
+          requires:
+            - hold_release_instabug_private_views_plugin
+            - verify_pub
+          filters:
+            branches:
+              only: master
       - release_instabug_flutter:
           requires:
             - hold_release_instabug_flutter

.gitignore

@@ -63,6 +63,8 @@ android/gradlew.bat
 **/ios/**/DerivedData/
 **/ios/**/Icon?
 **/ios/**/Pods/
+**/ios/**/Pods/
+
 **/ios/**/.symlinks/
 **/ios/**/profile
 **/ios/**/xcuserdata

analysis_options.yaml

@@ -4,6 +4,7 @@ analyzer:
   exclude:
     - "packages/**/*.g.dart"
     - "packages/**/example/**"
+    - "packages/instabug_private_views/example-hybrid-ios-app/**/**"
 
 
 linter:

packages/instabug_dio_interceptor/lib/instabug_dio_interceptor.dart

@@ -76,7 +76,8 @@ class InstabugDioInterceptor extends Interceptor {
 
     var responseBodySize = 0;
     if (responseHeaders.containsKey('content-length')) {
-      responseBodySize = int.parse(responseHeaders['content-length'][0] ?? '0');
+      // ignore: avoid_dynamic_calls
+      responseBodySize = int.parse((responseHeaders['content-length'][0]) ?? '0');
     } else if (response.data != null) {
       responseBodySize = response.data.toString().length;
     }

packages/instabug_flutter/android/build.gradle

@@ -44,7 +44,8 @@ android {
 }
 
 dependencies {
-    api 'com.instabug.library:instabug:14.0.0'
+    api 'com.instabug.library:instabug:13.4.1.6295791-SNAPSHOT'
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-inline:3.12.1"
     testImplementation "io.mockk:mockk:1.13.13"

packages/instabug_flutter/android/src/main/java/com/instabug/flutter/InstabugFlutterPlugin.java

@@ -19,6 +19,7 @@
 import com.instabug.flutter.modules.RepliesApi;
 import com.instabug.flutter.modules.SessionReplayApi;
 import com.instabug.flutter.modules.SurveysApi;
+import com.instabug.library.internal.crossplatform.InternalCore;
 
 import java.util.concurrent.Callable;
 
@@ -35,6 +36,7 @@ public class InstabugFlutterPlugin implements FlutterPlugin, ActivityAware {
     @SuppressLint("StaticFieldLeak")
     private static Activity activity;
 
+
     /**
      * Embedding v1
      */

packages/instabug_flutter/android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

@@ -17,6 +17,7 @@
 import com.instabug.library.internal.crossplatform.CoreFeaturesState;
 import com.instabug.library.internal.crossplatform.FeaturesStateListener;
 import com.instabug.library.internal.crossplatform.InternalCore;
+import com.instabug.flutter.util.privateViews.ScreenshotCaptor;
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
 import com.instabug.library.InstabugColorTheme;
@@ -25,9 +26,11 @@
 import com.instabug.library.Platform;
 import com.instabug.library.ReproConfigurations;
 import com.instabug.library.featuresflags.model.IBGFeatureFlag;
+import com.instabug.library.internal.crossplatform.InternalCore;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.model.NetworkLog;
+import com.instabug.library.screenshot.instacapture.ScreenshotRequest;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
 import io.flutter.FlutterInjector;
 import io.flutter.embedding.engine.loader.FlutterLoader;
@@ -492,4 +495,24 @@ public Map<String, Boolean> isW3CFeatureFlagsEnabled() {
     public void willRedirectToStore() {
         Instabug.willRedirectToStore();
     }
+
+    public static void setScreenshotCaptor(ScreenshotCaptor screenshotCaptor,InternalCore internalCore) {
+        internalCore._setScreenshotCaptor(new com.instabug.library.screenshot.ScreenshotCaptor() {
+            @Override
+            public void capture(@NonNull ScreenshotRequest screenshotRequest) {
+                screenshotCaptor.capture(new ScreenshotCaptor.CapturingCallback() {
+                    @Override
+                    public void onCapturingFailure(Throwable throwable) {
+                        screenshotRequest.getListener().onCapturingFailure(throwable);
+                    }
+
+                    @Override
+                    public void onCapturingSuccess(Bitmap bitmap) {
+                        screenshotRequest.getListener().onCapturingSuccess(bitmap);
+                    }
+                });
+            }
+        });
+    }
+
 }

packages/instabug_flutter/android/src/main/java/com/instabug/flutter/util/privateViews/ScreenshotCaptor.java

@@ -0,0 +1,13 @@
+package com.instabug.flutter.util.privateViews;
+
+import android.graphics.Bitmap;
+
+public interface ScreenshotCaptor {
+    public  void capture(CapturingCallback listener);
+
+    public interface CapturingCallback {
+        public  void onCapturingFailure(Throwable throwable);
+
+        public  void onCapturingSuccess(Bitmap bitmap);
+    }
+}

packages/instabug_flutter/android/src/test/java/com/instabug/flutter/InstabugApiTest.java

@@ -46,8 +46,10 @@
 import com.instabug.library.internal.crossplatform.FeaturesStateListener;
 import com.instabug.library.internal.crossplatform.InternalCore;
 import com.instabug.library.featuresflags.model.IBGFeatureFlag;
+import com.instabug.library.internal.crossplatform.InternalCore;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.model.NetworkLog;
+import com.instabug.library.screenshot.ScreenshotCaptor;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
 import com.instabug.survey.Surveys;
 import com.instabug.survey.callbacks.OnShowCallback;
@@ -72,6 +74,7 @@
 import java.util.concurrent.Callable;
 
 import io.flutter.plugin.common.BinaryMessenger;
+
 import kotlin.jvm.functions.Function1;
 
 import org.mockito.Mockito;
@@ -643,4 +646,12 @@ public void isW3CFeatureFlagsEnabled() {
         assertEquals(isW3cCaughtHeaderEnabled, flags.get("isW3cCaughtHeaderEnabled"));
 
     }
+
+    @Test
+    public void testSetScreenshotCaptor() {
+        InternalCore internalCore = spy(InternalCore.INSTANCE);
+
+        InstabugApi.setScreenshotCaptor(any(), internalCore);
+        verify(internalCore)._setScreenshotCaptor(any(ScreenshotCaptor.class));
+    }
 }

packages/instabug_flutter/example/android/app/build.gradle

@@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 android {
     compileSdkVersion 34
     ndkVersion flutter.ndkVersion
+    namespace = "com.instabug.flutter.example"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8