Refactor: merge private-views package into mono-repo

.circleci/config.yml

@@ -131,10 +131,10 @@ commands:
                 steps:
                   - run:
                       name: Generate Pigeons
-                      command: melos pigeon
+                      command: melos pigeon --no-select
                   - run:
                       name: Build Pigeons
-                      command: melos generate
+                      command: melos generate --no-select
       - when:
           condition:
             equal:
@@ -188,7 +188,7 @@ jobs:
       - setup_flutter:
           version: <<parameters.version>>
           use_melos: true
-      - run: melos test-coverage
+      - run: melos test-coverage --no-select
       - persist_to_workspace:
           root: ~/project
           paths:
@@ -307,8 +307,17 @@ jobs:
       - setup_flutter
       - run:
           name: Check Package Score
-          command: melos score
-      - run: melos dryPublish
+          command: melos score --no-select
+      - run: melos dryPublish --no-select
+
+  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:
@@ -332,7 +341,7 @@ jobs:
       - run:
           name: Generate Pigeons
           working_directory: project
-          command: melos pigeon
+          command: melos pigeon --no-select
       - run:
           name: Clone Escape
           command: git clone [email protected]:Instabug/Escape.git
@@ -388,6 +397,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

packages/instabug_flutter/android/build.gradle

@@ -22,6 +22,10 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    if (project.android.hasProperty("namespace")) {
+        namespace = "com.instabug.flutter"
+    }
+
     compileSdkVersion 28
 
     compileOptions {
@@ -41,7 +45,7 @@ android {
 }
 
 dependencies {
-    api 'com.instabug.library:instabug:13.4.1'
+    api 'com.instabug.library:instabug:13.4.1.6295791-SNAPSHOT'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-inline:3.12.1"

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

@@ -6,13 +6,16 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+
 import com.instabug.flutter.generated.InstabugPigeon;
 import com.instabug.flutter.util.ArgsRegistry;
 import com.instabug.flutter.util.Reflection;
 import com.instabug.flutter.util.ThreadManager;
+import com.instabug.flutter.util.privateViews.ScreenshotCaptor;
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
 import com.instabug.library.InstabugColorTheme;
@@ -21,13 +24,17 @@
 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;
 import io.flutter.plugin.common.BinaryMessenger;
+
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
@@ -92,7 +99,9 @@ public Boolean isEnabled() {
 
     @NotNull
     @Override
-    public Boolean isBuilt() { return Instabug.isBuilt(); }
+    public Boolean isBuilt() {
+        return Instabug.isBuilt();
+    }
 
     @Override
     public void init(@NonNull String token, @NonNull List<String> invocationEvents, @NonNull String debugLogsLevel) {
@@ -441,4 +450,24 @@ public void networkLog(@NonNull Map<String, Object> data) {
     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

@@ -36,8 +36,10 @@
 import com.instabug.library.ReproConfigurations;
 import com.instabug.library.ReproMode;
 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 org.json.JSONObject;
@@ -59,6 +61,7 @@
 import java.util.concurrent.Callable;
 
 import io.flutter.plugin.common.BinaryMessenger;
+
 import org.mockito.verification.VerificationMode;
 
 public class InstabugApiTest {
@@ -349,11 +352,11 @@ public void testClearAllExperiments() {
 
     @Test
     public void testAddFeatureFlags() {
-       Map<String,String > featureFlags = new HashMap<>();
-        featureFlags.put("key1","variant1");
+        Map<String, String> featureFlags = new HashMap<>();
+        featureFlags.put("key1", "variant1");
         api.addFeatureFlags(featureFlags);
-        List<IBGFeatureFlag> flags=new ArrayList<IBGFeatureFlag>();
-        flags.add(new IBGFeatureFlag("key1","variant1"));
+        List<IBGFeatureFlag> flags = new ArrayList<IBGFeatureFlag>();
+        flags.add(new IBGFeatureFlag("key1", "variant1"));
         mInstabug.verify(() -> Instabug.addFeatureFlags(flags));
     }
 
@@ -598,4 +601,12 @@ public void testWillRedirectToStore() {
         api.willRedirectToStore();
         mInstabug.verify(Instabug::willRedirectToStore);
     }
+
+    @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 flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
+    namespace = "com.instabug.flutter.example"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

packages/instabug_flutter/example/ios/Podfile

@@ -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/13.4.2/Instabug.podspec'
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 

packages/instabug_flutter/example/ios/Podfile.lock

@@ -8,26 +8,28 @@ PODS:
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - Instabug (from `https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/13.4.2/Instabug.podspec`)
   - instabug_flutter (from `.symlinks/plugins/instabug_flutter/ios`)
   - OCMock (= 3.6)
 
 SPEC REPOS:
   trunk:
-    - Instabug
     - OCMock
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  Instabug:
+    :podspec: https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/13.4.2/Instabug.podspec
   instabug_flutter:
     :path: ".symlinks/plugins/instabug_flutter/ios"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  Instabug: 7a71890217b97b1e32dbca96661845396b66da2f
+  Instabug: 7aacd5099c11ce96bc49dda40eba0963c06acccc
   instabug_flutter: a2df87e3d4d9e410785e0b1ffef4bc64d1f4b787
   OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
 
-PODFILE CHECKSUM: 8f7552fd115ace1988c3db54a69e4a123c448f84
+PODFILE CHECKSUM: 02e3295e1482e04d2cbd38390c8ea91a5c0c2ff1
 
 COCOAPODS: 1.14.3

packages/instabug_flutter/example/lib/main.dart

@@ -55,7 +55,6 @@ void main() {
       FlutterError.onError = (FlutterErrorDetails details) {
         Zone.current.handleUncaughtError(details.exception, details.stack!);
       };
-
       runApp(const MyApp());
     },
     CrashReporting.reportCrash,

packages/instabug_flutter/ios/Classes/Modules/InstabugApi.h

@@ -6,5 +6,6 @@ extern void InitInstabugApi(id<FlutterBinaryMessenger> messenger);
 
 - (UIImage *)getImageForAsset:(NSString *)assetName;
 - (UIFont *)getFontForAsset:(NSString *)assetName  error:(FlutterError *_Nullable *_Nonnull)error;
++ (void)setScreenshotMaskingHandler:(nullable void (^)(UIImage *_Nonnull, void (^_Nonnull)(UIImage *_Nonnull)))maskingHandler;
 
 @end

packages/instabug_flutter/ios/Classes/Modules/InstabugApi.m

@@ -5,7 +5,7 @@
 #import "IBGNetworkLogger+CP.h"
 #import "InstabugApi.h"
 #import "ArgsRegistry.h"
-
+#import "../Util/Instabug+CP.h"
 #define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16)) / 255.0 green:((float)((rgbValue & 0xFF00) >> 8)) / 255.0 blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:((float)((rgbValue & 0xFF000000) >> 24)) / 255.0];
 
 extern void InitInstabugApi(id<FlutterBinaryMessenger> messenger) {
@@ -349,4 +349,8 @@ - (void)removeFeatureFlagsFeatureFlags:(nonnull NSArray<NSString *> *)featureFla
     }
 }
 
++ (void)setScreenshotMaskingHandler:(nullable void (^)(UIImage * _Nonnull __strong, void (^ _Nonnull __strong)(UIImage * _Nonnull __strong)))maskingHandler {
+    [Instabug setScreenshotMaskingHandler:maskingHandler];
+}
+
 @end

packages/instabug_flutter/ios/Classes/Util/Instabug+CP.h

@@ -0,0 +1,8 @@
+
+#import <Foundation/Foundation.h>
+
+@interface Instabug (CP)
+
++ (void)setScreenshotMaskingHandler:(nullable void (^)(UIImage *, void (^)(UIImage *)))maskingHandler;
+
+@end

packages/instabug_private_views/.metadata

@@ -0,0 +1,33 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "603104015dd692ea3403755b55d07813d5cf8965"
+  channel: "stable"
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+    - platform: android
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+    - platform: ios
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

packages/instabug_private_views/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## [UnReleased](https://github.com/Instabug/)
+
+### Added
+
+- Add support for masking private views during screen capturing ([#527](https://github.com/Instabug/Instabug-Flutter/pull/527)).

packages/instabug_private_views/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Instabug
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.