compdfkit_flutter 2.2.2

Author: xiaolongrick

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.2.2
+* Added the features support for ComPDFKit PDF SDK for iOS iOS V2.2.2.
+* Added the features support for ComPDFKit PDF SDK for Android Android V2.2.2.
+* `CPDFDocument()` can now be used independently, without relying on `CPDFReaderWidget`, enhancing flexibility and ease of use.
+* Added the ability to save a watermark to the current PDF when adding it.
+* Fixed the inaccurate judgment issue in the `hasChange()` method.
+* Fixed an issue where some document text fields in forms were not displaying content.
+* Fixed an issue on the Android platform where Ink annotations became smaller after drawing.
+* Fixed an issue on the Android platform where the pen size shrank when drawing Ink annotations after zooming in on a page.
+* Fixed an input issue with the **LaBan Key** input method on the Android platform.
+* Fixed a potential crash issue on the Android platform when enabling the rotate function. 
+* Fixed a crash issue on the Android platform when importing XFDF annotations. 
+* Fixed an issue on the Android platform where annotations did not appear when printing with `document.printDocument()`. 
+* Fixed an issue on Android where the `saveAs()` method resulted in a “document cannot be edited” prompt after saving.
+
+
 ## 2.2.1
 * Added the features support for ComPDFKit PDF SDK for iOS [iOS V2.2.1](https://www.compdf.com/pdf-sdk/changelog-ios#v2-2-1).
 * Added the features support for ComPDFKit PDF SDK for Android [Android V2.2.1](https://www.compdf.com/pdf-sdk/changelog-android#v2-2-1).

CONFIGURATION.md

@@ -784,10 +784,11 @@ This section is used to configure the types of forms enabled in the view's botto
 
 ##### Parameters
 
-| Name                    | Type          | Example | Description                                                  |
-| ----------------------- | ------------- | ------- | ------------------------------------------------------------ |
-| themeMode               | CPDFThemeMode | light   | Set the view theme style, support `light`, `dark`, `system`, the default is `light` theme<br />**ComPDFKit SDK for Flutter:** => 2.0.2<br />Only Android Platform. |
-| fileSaveExtraFontSubset | boolean       | true    | When saving a document, whether to save the used font set together with the document. |
+| Name                    | Type                | Example                      | Description                                                  |
+| ----------------------- | ------------------- | ---------------------------- | ------------------------------------------------------------ |
+| themeMode               | CPDFThemeMode       | light                        | Set the view theme style, support `light`, `dark`, `system`, the default is `light` theme<br />**ComPDFKit SDK for Flutter:** => 2.0.2<br />Only Android Platform. |
+| fileSaveExtraFontSubset | boolean             | true                         | When saving a document, whether to save the used font set together with the document. |
+| watermark               | CPDFWatermarkConfig | {   "saveAsNewFile" : true } | The user can configure the watermark addition popup, allowing them to choose whether to save the watermark directly to the current document or save it to a different directory.<br>**true**: Save to a different directory<br>**false**: Add to the current document directly |
 
 ##### themeMode Constants
 
@@ -1066,7 +1067,10 @@ This section is used to configure the types of forms enabled in the view's botto
   },
   "global" : {
     "themeMode" : "system",
-    "fileSaveExtraFontSubset" : true
+    "fileSaveExtraFontSubset" : true,
+    "watermark": {
+      "saveAsNewFile" : true
+    }
   }
 }
 ```

README.md

@@ -151,7 +151,7 @@ Alternatively you can update the `AndroidManifest.xml` file to use `FlutterFragm
  dependencies:
    flutter:
      sdk: flutter
-+  compdfkit_flutter: ^2.2.1
++  compdfkit_flutter: ^2.2.2
 ```
 
 8. Add the PDF documents you want to display in the project
@@ -197,7 +197,7 @@ cd example
  dependencies:
    flutter:
      sdk: flutter
-+  compdfkit_flutter: ^2.2.1
++  compdfkit_flutter: ^2.2.2
 ```
 
 4. Open your project's Podfile in a text editor:
@@ -220,8 +220,8 @@ open ios/Podfile
    use_modular_headers!`
 
    flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-+  pod 'ComPDFKit_Tools', podspec:'https://www.compdf.com/download/ios/cocoapods/xcframeworks/compdfkit_tools/2.2.1.podspec'
-+  pod 'ComPDFKit', podspec:'https://www.compdf.com/download/ios/cocoapods/xcframeworks/compdfkit/2.2.1.podspec'
++  pod 'ComPDFKit_Tools', podspec:'https://www.compdf.com/download/ios/cocoapods/xcframeworks/compdfkit_tools/2.2.2.podspec'
++  pod 'ComPDFKit', podspec:'https://www.compdf.com/download/ios/cocoapods/xcframeworks/compdfkit/2.2.2.podspec'
 
  end
 ```
@@ -557,8 +557,8 @@ target 'PDFView_RN' do
     # Pods for testing
   end
 
-+  pod 'ComPDFKit', :git => 'https://github.com/ComPDFKit/compdfkit-pdf-sdk-ios-swift.git', :tag => '2.2.1'
-+  pod 'ComPDFKit_Tools', :git => 'https://github.com/ComPDFKit/compdfkit-pdf-sdk-ios-swift.git', :tag => '2.2.1'
++  pod 'ComPDFKit', :git => 'https://github.com/ComPDFKit/compdfkit-pdf-sdk-ios-swift.git', :tag => '2.2.2'
++  pod 'ComPDFKit_Tools', :git => 'https://github.com/ComPDFKit/compdfkit-pdf-sdk-ios-swift.git', :tag => '2.2.2'
 
   # Enables Flipper.
   #

android/build.gradle

@@ -5,6 +5,8 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
+
     }
 
     dependencies {
@@ -16,14 +18,17 @@ rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
+        maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
+
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
     compileSdk 33
-
+    namespace "com.compdfkit.flutter.compdfkit_flutter"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -40,7 +45,7 @@ android {
         implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
         // dependencies compdfkit pdf sdk
-        api 'com.compdf:compdfkit-tools:2.2.1'
+        api 'com.compdf:compdfkit-tools:2.2.2'
 
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'org.mockito:mockito-core:5.0.0'

android/src/main/java/com/compdfkit/flutter/compdfkit_flutter/constants/CPDFConstants.java

@@ -150,6 +150,8 @@ public static class ChannelMethod {
     public static final String REMOVE_ALL_WATERMARKS = "remove_all_watermarks";
     public static final String GET_ENCRYPT_ALGORITHM = "get_encrypt_algorithm";
     public static final String SET_IMPORT_FONT_DIRECTORY = "set_import_font_directory";
+    public static final String CREATE_DOCUMENT_PLUGIN = "create_document_plugin";
+
   }
 
 }

android/src/main/java/com/compdfkit/flutter/compdfkit_flutter/plugin/CPDFDocumentPlugin.java

@@ -40,9 +40,14 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Environment;
+import android.print.PrintAttributes;
+import android.print.PrintAttributes.MediaSize;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintManager;
 import android.text.TextUtils;
 import android.util.Log;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 import com.bumptech.glide.request.target.Target;
 import com.compdfkit.core.common.CPDFDocumentException;
 import com.compdfkit.core.document.CPDFDocument;
@@ -58,8 +63,10 @@
 import com.compdfkit.tools.common.utils.CFileUtils;
 import com.compdfkit.tools.common.utils.glide.GlideApp;
 import com.compdfkit.tools.common.utils.image.CBitmapUtil;
+import com.compdfkit.tools.common.utils.print.CPDFPrintUtils;
 import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
 import com.compdfkit.tools.common.utils.threadpools.SimpleBackgroundTask;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 import com.compdfkit.ui.reader.CPDFReaderView;
 import io.flutter.plugin.common.BinaryMessenger;
@@ -75,6 +82,8 @@ public class CPDFDocumentPlugin extends BaseMethodChannelPlugin {
 
   private CPDFViewCtrl pdfView;
 
+  private CPDFDocument document;
+
   public CPDFDocumentPlugin(Context context,
       BinaryMessenger binaryMessenger, String documentUid) {
     super(context, binaryMessenger);
@@ -83,8 +92,12 @@ public CPDFDocumentPlugin(Context context,
 
   public void setReaderView(CPDFViewCtrl pdfView) {
     this.pdfView = pdfView;
+    this.document = pdfView.getCPdfReaderView().getPDFDocument();
   }
 
+  public void setDocument(CPDFDocument cpdfDocument) {
+    this.document = cpdfDocument;
+  }
 
   @Override
   public String methodName() {
@@ -93,26 +106,55 @@ public String methodName() {
 
   @Override
   public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
-    if (pdfView == null || pdfView.getCPdfReaderView().getPDFDocument() == null) {
+    if (document == null) {
       result.error("-1", "CPDFReaderView isnull or CPDFDocument is null", null);
       return;
     }
-    CPDFReaderView readerView = pdfView.getCPdfReaderView();
-    CPDFDocument document = readerView.getPDFDocument();
     switch (call.method) {
       case OPEN_DOCUMENT:
         String filePath = call.argument("filePath");
         String openPwd = call.argument("password");
         PDFDocumentError error;
+        Object object;
         if (filePath.startsWith(CONTENT_SCHEME) || filePath.startsWith(
             FileUtils.FILE_SCHEME)) {
-          pdfView.openPDF(Uri.parse(filePath), openPwd, () -> {
-            result.success(true);
-          });
+          object = Uri.parse(filePath);
+          error = document.open(Uri.parse(filePath), openPwd);
         } else {
-          pdfView.openPDF(filePath, openPwd, () -> {
-            result.success(true);
-          });
+          object = filePath;
+          error = document.open(filePath, openPwd);
+        }
+        switch (error){
+          case PDFDocumentErrorSuccess:
+            result.success("success");
+            break;
+          case PDFDocumentErrorPassword:
+            result.success("errorPassword");
+            break;
+          case PDFDocumentErrorFile:
+            result.success("errorFile");
+            break;
+          case PDFDocumentErrorPage:
+            result.success("errorPage");
+            break;
+          case PDFDocumentErrorFormat:
+            result.success("errorFormat");
+            break;
+          case PDFDocumentErrorUnknown:
+            result.success("unknown");
+            break;
+          case PDFDocumentErrorSecurity:
+            result.success("errorSecurity");
+            break;
+          case PDFDocumentNotVerifyLicense:
+            result.success("notVerifyLicense");
+            break;
+          case PDFDocumentErrorNoReadPermission:
+            result.success("noReadPermission");
+            break;
+        }
+        if (error == PDFDocumentError.PDFDocumentErrorSuccess && pdfView != null){
+          pdfView.setPDFDocument(document, object, error, null);
         }
         break;
       case GET_FILE_NAME:
@@ -159,7 +201,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
           cacheFile.mkdirs();
           boolean importResult = document.importAnnotations(xfdfFilePath,
               cacheFile.getAbsolutePath());
-          readerView.reloadPages();
+          if (pdfView != null) {
+            pdfView.getCPdfReaderView().reloadPages();
+          }
           result.success(importResult);
         } catch (Exception e) {
           e.printStackTrace();
@@ -190,8 +234,8 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         break;
       case REMOVE_ALL_ANNOTATIONS:
         boolean deleteResult = document.removeAllAnnotations();
-        if (deleteResult) {
-          readerView.invalidateAllChildren();
+        if (deleteResult && pdfView != null) {
+          pdfView.getCPdfReaderView().invalidateAllChildren();
         }
         result.success(deleteResult);
         break;
@@ -211,6 +255,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         String savePath = call.argument("save_path");
         boolean removeSecurity = call.argument("remove_security");
         boolean fontSubSet = call.argument("font_sub_set");
+        if (pdfView != null){
+          pdfView.exitEditMode();
+        }
         CThreadPoolUtils.getInstance().executeIO(() -> {
           try {
             boolean saveResult;
@@ -219,10 +266,15 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
             } else {
               saveResult = document.saveAs(savePath, removeSecurity, false, fontSubSet);
             }
-            if (document.shouleReloadDocument()) {
-              document.reload();
-            }
-            result.success(saveResult);
+            CThreadPoolUtils.getInstance().executeMain(()->{
+              if (document.shouleReloadDocument()) {
+                document.reload();
+                if (pdfView != null) {
+                  pdfView.getCPdfReaderView().reloadPages();
+                }
+              }
+              result.success(saveResult);
+            });
           } catch (CPDFDocumentException e) {
             e.printStackTrace();
             result.error("SAVE_FAIL",
@@ -232,9 +284,10 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         });
         break;
       case PRINT:
-        String path = readerView.getPDFDocument().getAbsolutePath();
-        Uri uri = readerView.getPDFDocument().getUri();
-        CFileUtils.startPrint(context, path, uri);
+        FragmentActivity fragmentActivity = CViewUtils.getFragmentActivity(pdfView.getContext());
+        if (fragmentActivity != null){
+          CPDFPrintUtils.printCurrentDocument(fragmentActivity, document);
+        }
         break;
       case REMOVE_PASSWORD:
         CThreadPoolUtils.getInstance().executeIO(() -> {
@@ -326,16 +379,18 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         }
         break;
       case CREATE_WATERMARK:
-        Object object = call.arguments;
-        Log.e("ComPDFKit-Flutter", "watermark:" + object.toString());
+        Object watermarkObj = call.arguments;
+        Log.e("ComPDFKit-Flutter", "watermark:" + watermarkObj.toString());
         createWatermark(call, result, pdfView, document);
         break;
       case REMOVE_ALL_WATERMARKS:
         for (int watermarkCount = document.getWatermarkCount(); watermarkCount > 0;
             watermarkCount--) {
           document.getWatermark(watermarkCount - 1).clear();
         }
-        pdfView.getCPdfReaderView().reloadPages();
+        if (pdfView != null) {
+          pdfView.getCPdfReaderView().reloadPages();
+        }
         break;
       default:
         break;

android/src/main/java/com/compdfkit/flutter/compdfkit_flutter/plugin/CPDFViewCtrlPlugin.java

@@ -263,7 +263,8 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
         documentFragment.showBOTA();
         break;
       case SHOW_ADD_WATERMARK_VIEW:
-        documentFragment.showAddWatermarkDialog();
+        boolean saveAsNewFile = (boolean) call.arguments;
+        documentFragment.showAddWatermarkDialog(saveAsNewFile);
         break;
       case SHOW_SECURITY_VIEW:
         documentFragment.showSecurityDialog();

android/src/main/java/com/compdfkit/flutter/compdfkit_flutter/plugin/ComPDFKitSDKPlugin.java

@@ -9,6 +9,7 @@
 
 package com.compdfkit.flutter.compdfkit_flutter.plugin;
 
+import static com.compdfkit.flutter.compdfkit_flutter.constants.CPDFConstants.ChannelMethod.CREATE_DOCUMENT_PLUGIN;
 import static com.compdfkit.flutter.compdfkit_flutter.constants.CPDFConstants.ChannelMethod.CREATE_URI;
 import static com.compdfkit.flutter.compdfkit_flutter.constants.CPDFConstants.ChannelMethod.GET_TEMP_DIRECTORY;
 import static com.compdfkit.flutter.compdfkit_flutter.constants.CPDFConstants.ChannelMethod.INIT_SDK;
@@ -31,6 +32,7 @@
 import androidx.annotation.NonNull;
 
 import androidx.annotation.Nullable;
+import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.document.CPDFSdk;
 import com.compdfkit.core.font.CPDFFont;
 import com.compdfkit.flutter.compdfkit_flutter.utils.FileUtils;
@@ -135,6 +137,13 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
                 CPDFSdk.setImportFontDir(importFontDir, addSysFont);
                 result.success(true);
                 break;
+            case CREATE_DOCUMENT_PLUGIN:
+                String id = (String) call.arguments;
+                CPDFDocumentPlugin documentPlugin = new CPDFDocumentPlugin(context, binaryMessenger, id);
+                documentPlugin.setDocument(new CPDFDocument(context));
+                documentPlugin.register();
+                result.success(true);
+                break;
             default:
                 break;
         }
@@ -145,13 +154,13 @@ public boolean onActivityResult(int requestCode, int resultCode, @Nullable Inten
         if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK){
             if(data != null && data.getData() != null){
                 Uri uri = data.getData();
+                CFileUtils.takeUriPermission(context, uri);
                 successResult(uri.toString());
             }
             return true;
         } else if (requestCode == REQUEST_CODE && resultCode != Activity.RESULT_OK){
             successResult(null);
         }
-
         return false;
     }