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

packages/instabug_flutter/example/android/build.gradle

@@ -24,6 +24,12 @@ subprojects {
 }
 subprojects {
     project.evaluationDependsOn(':app')
+    tasks.withType(Test) {
+        // Prevent tests in moduleA from running
+        if (project.name == 'video_player_android') {
+            exclude '**/*'
+        }
+    }
 }
 
 tasks.register("clean", Delete) {

packages/instabug_flutter/example/assets/img.png

@@ -29,7 +29,7 @@ flutter_ios_podfile_setup
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
-
+  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/14.0.0/Instabug.podspec'
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 

packages/instabug_flutter/example/ios/Podfile

@@ -4,30 +4,46 @@ PODS:
   - instabug_flutter (14.0.0):
     - Flutter
     - Instabug (= 14.0.0)
+  - instabug_private_views (0.0.1):
+    - Flutter
+    - instabug_flutter
   - OCMock (3.6)
+  - video_player_avfoundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - Instabug (from `https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/14.0.0/Instabug.podspec`)
   - instabug_flutter (from `.symlinks/plugins/instabug_flutter/ios`)
+  - instabug_private_views (from `.symlinks/plugins/instabug_private_views/ios`)
   - OCMock (= 3.6)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
 SPEC REPOS:
   trunk:
-    - Instabug
     - OCMock
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  Instabug:
+    :podspec: https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/14.0.0/Instabug.podspec
   instabug_flutter:
     :path: ".symlinks/plugins/instabug_flutter/ios"
+  instabug_private_views:
+    :path: ".symlinks/plugins/instabug_private_views/ios"
+  video_player_avfoundation:
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  Instabug: a0beffc01658773e2fac549845782f8937707dc4
+  Instabug: 9d2b06afbadfbd4630bc0116dc27d84360ed70b0
   instabug_flutter: ff8ab5ff34a476b1d2d887478ec190cda962b973
+  instabug_private_views: df53ff3f1cc842cb686d43e077099d3b36426a7f
   OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
 
-PODFILE CHECKSUM: 8f7552fd115ace1988c3db54a69e4a123c448f84
+PODFILE CHECKSUM: 32bd1b5b0a93d31b74cc581a86b5fa93c1cc923f
 
 COCOAPODS: 1.14.3

packages/instabug_flutter/example/ios/Podfile.lock

@@ -5,9 +5,11 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:instabug_flutter/instabug_flutter.dart';
+import 'package:instabug_flutter_example/src/screens/private_view_page.dart';
 import 'package:instabug_http_client/instabug_http_client.dart';
 import 'package:instabug_flutter_example/src/app_routes.dart';
 import 'package:instabug_flutter_example/src/widget/nested_view.dart';
+import 'package:instabug_private_views/instabug_private_view.dart';
 
 import 'src/native/instabug_flutter_example_method_channel.dart';
 import 'src/widget/instabug_button.dart';
@@ -56,6 +58,8 @@ void main() {
         Zone.current.handleUncaughtError(details.exception, details.stack!);
       };
 
+      enableInstabugMaskingPrivateViews();
+
       runApp(const MyApp());
     },
     CrashReporting.reportCrash,

packages/instabug_flutter/example/lib/main.dart

@@ -35,6 +35,10 @@ class _MyHomePageState extends State<MyHomePage> {
     BugReporting.setInvocationEvents([InvocationEvent.floatingButton]);
   }
 
+  void disableInstabug() {
+    Instabug.setEnabled(false);
+  }
+
   void setOnDismissCallback() {
     BugReporting.setOnDismissCallback((dismissType, reportType) {
       showDialog(
@@ -161,6 +165,16 @@ class _MyHomePageState extends State<MyHomePage> {
     );
   }
 
+  void _navigateToPrivateViewPage() {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => const PrivateViewPage(),
+        settings: const RouteSettings(name: ComplexPage.screenName),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Page(
@@ -178,6 +192,10 @@ class _MyHomePageState extends State<MyHomePage> {
           onPressed: restartInstabug,
           text: 'Restart Instabug',
         ),
+        InstabugButton(
+          onPressed: disableInstabug,
+          text: 'Disable Instabug',
+        ),
         const SectionTitle('Primary Color'),
         InstabugTextField(
           controller: primaryColorController,
@@ -306,6 +324,10 @@ class _MyHomePageState extends State<MyHomePage> {
           onPressed: _navigateToComplex,
           text: 'Complex',
         ),
+        InstabugButton(
+          onPressed: _navigateToPrivateViewPage,
+          text: 'Private views',
+        ),
         const SectionTitle('Sessions Replay'),
         InstabugButton(
           onPressed: getCurrentSessionReplaylink,