@intuiface/capacitor-plugin-screenshot 1.0.2 → 2.0.0

package/README.md

@@ -71,7 +71,7 @@ Function to take a screenshot
 
 ## iOS
 
-iOS version 11+ is supported.
+iOS version 13+ is supported.
 
 Nothing more to do, it should work by calling the `getScreenshot` function.
 
@@ -85,6 +85,11 @@ To be able to take screenshot on Android, you have to declare a foreground servi
 ```xml
 <service android:enabled="true" android:foregroundServiceType="mediaProjection" android:name="com.intuiface.plugins.screenshot.ScreenCaptureService" />
 ```
+And also add permissions : 
+```xml
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
+```
 
 The foreground service will ask you to cast your screen and this is mandatory to take screenshot with the `MediaProjection` API.
 

package/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
     }
 }
 
@@ -19,10 +19,10 @@ apply plugin: 'com.android.library'
 
 android {
     namespace "com.intuiface.plugins.screenshot"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
 </manifest>

package/android/src/main/java/com/intuiface/plugins/screenshot/CapacitorScreenshotPlugin.java

@@ -41,9 +41,15 @@ public class CapacitorScreenshotPlugin extends Plugin {
     private ActivityResultLauncher<Intent> mediaProjectionActivityLauncher;
 
     private PluginCall savedCall;
+    private VirtualDisplay virtualDisplay;
+    private Handler handler;
 
     @Override
     public void load() {
+        HandlerThread handlerThread = new HandlerThread("ScreenshotThread");
+        handlerThread.start();
+        handler = new Handler(handlerThread.getLooper());
+
         mediaProjectionActivityLauncher =
             getActivity()
                 .registerForActivityResult(
@@ -63,9 +69,30 @@ public class CapacitorScreenshotPlugin extends Plugin {
 
     @PluginMethod
     public void getScreenshot(PluginCall call) {
-        if (mediaProjection != null) {
+        if (mediaProjection != null && virtualDisplay != null) {
             savedCall = call;
-            startScreenshotCapture(mediaProjection);
+
+            final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
+            int screenWidth = metrics.widthPixels;
+            int screenHeight = metrics.heightPixels;
+            // Create an ImageReader to capture the screen content
+            ImageReader imageReader = ImageReader.newInstance(screenWidth, screenHeight, PixelFormat.RGBA_8888, 1);
+            // Handle the captured images from the ImageReader
+            imageReader.setOnImageAvailableListener(
+                reader -> {
+                    Image image = imageReader.acquireLatestImage();
+                    if (image != null) {
+                        // Process the captured image
+                        processScreenshot(image);
+                        // Release the image resources
+                        image.close();
+                    }
+                },
+                handler
+            );
+
+            // set the new surface to get the capture
+            virtualDisplay.setSurface(imageReader.getSurface());
         } else {
             ScreenCaptureManager screenCaptureManager = new ScreenCaptureManager(getContext());
             screenCaptureManager.startForeground();
@@ -94,47 +121,27 @@ public class CapacitorScreenshotPlugin extends Plugin {
     }
 
     private void startScreenshotCapture(MediaProjection mediaProjection) {
-        HandlerThread handlerThread = new HandlerThread("ScreenshotThread");
-        handlerThread.start();
-
         final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
         int screenWidth = metrics.widthPixels;
         int screenHeight = metrics.heightPixels;
-
-        Handler handler = new Handler(handlerThread.getLooper());
-
         int screenDensity = metrics.densityDpi;
 
         // Create an ImageReader to capture the screen content
-        @SuppressLint("WrongConstant")
         ImageReader imageReader = ImageReader.newInstance(screenWidth, screenHeight, PixelFormat.RGBA_8888, 1);
+
+        mediaProjection.registerCallback(new MediaProjection.Callback() {}, null);
         // Create a VirtualDisplay using the mediaProjection and imageReader
-        final VirtualDisplay virtualDisplay = mediaProjection.createVirtualDisplay(
-            "ScreenCapture",
-            screenWidth,
-            screenHeight,
-            screenDensity,
-            DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
-            imageReader.getSurface(),
-            null,
-            handler
-        );
-
-        // Handle the captured images from the ImageReader
-        imageReader.setOnImageAvailableListener(
-            reader -> {
-                Image image = imageReader.acquireLatestImage();
-                if (image != null) {
-                    // Process the captured image
-                    processScreenshot(image);
-                    // Release the image resources
-                    image.close();
-
-                    virtualDisplay.release();
-                }
-            },
-            handler
-        );
+        this.virtualDisplay =
+            mediaProjection.createVirtualDisplay(
+                "ScreenCapture",
+                screenWidth,
+                screenHeight,
+                screenDensity,
+                DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
+                imageReader.getSurface(),
+                null,
+                handler
+            );
     }
 
     private void processScreenshot(Image image) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuiface/capacitor-plugin-screenshot",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "Capacitor plugin to take screenshot for iOS and Android devices",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -45,14 +45,14 @@
     "prepare": "npx shx cp -u ./.githooks/* ./.git/hooks/"
   },
   "devDependencies": {
-    "@capacitor/android": "^5.0.0",
-    "@capacitor/core": "^5.0.0",
+    "@capacitor/android": "^6.0.0",
+    "@capacitor/core": "^6.0.0",
     "@capacitor/docgen": "^0.0.18",
-    "@capacitor/ios": "^5.0.0",
-    "@ionic/eslint-config": "^0.3.0",
+    "@capacitor/ios": "^6.0.0",
+    "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
-    "eslint": "^7.11.0",
+    "eslint": "^8.57.0",
     "prettier": "~2.3.0",
     "prettier-plugin-java": "~1.0.2",
     "rimraf": "^3.0.2",
@@ -61,7 +61,7 @@
     "typescript": "~4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^5.0.0"
+    "@capacitor/core": "^6.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",