v2.2.1

Author: xiaolongrick

ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar

@@ -11,17 +11,17 @@ In addition to the `ComPDFKit_Tools` module source code, we also provide a Gradl
 
 ```diff
 dependencies {
-  implementation 'com.compdf:compdfkit:2.1.3'
-  implementation 'com.compdf:compdfkit-ui:2.1.3'
-+  implementation 'com.compdf:compdfkit-tools:2.1.3'
+  implementation 'com.compdf:compdfkit:2.2.1'
+  implementation 'com.compdf:compdfkit-ui:2.2.1'
++  implementation 'com.compdf:compdfkit-tools:2.2.1'
 }
 ```
 
 ## Usage
 
 The ComPDFKit_Tools module provides two main components: [CPDFDocumentActivity](./src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentActivity.java) and [CPDFDocumentFragment.java](./src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java). These components enable you to easily implement PDF functionalities.
 
-* **CPDFDocumentActivity.java**
+### CPDFDocumentActivity
 
 Use CPDFDocumentActivity to display a PDF document:
 ```java
@@ -34,7 +34,7 @@ CPDFDocumentActivity.startActivity(context, uri, password, configuration);
 CPDFDocumentActivity.startActivity(context, filePath, password, configuration);
 ```
 
-* **CPDFDocumentFragment.java**
+### CPDFDocumentFragment
 
 Use CPDFDocumentFragment to load a PDF document into a Fragment:
 ```java
@@ -53,5 +53,80 @@ CPDFDocumentFragment documentFragment = CPDFDocumentFragment.newInstance(
   configuration);
 ```
 
+### Watermark
 
+If you only need to use the watermark function, you can use `CWatermarkEditDialog` alone. The following is an example of use:
 
+```java
+// The example uses the sample document located in the assets directory
+String path = CFileUtils.getAssetsTempFile(this, "test.pdf", "test.pdf");
+CWatermarkEditDialog editDialog = CWatermarkEditDialog.newInstance();
+// You can pass the file path or URI of the PDF document directly
+editDialog.setDocument(path, null);
+// Or pass an existing CPDFDocument object
+// editDialog.setDocument(document);
+editDialog.setPageIndex(0);
+// Set the saving path of the document with watermark added. If not set, when you click [Save],
+// a file directory selection pop-up window will pop up for saving.
+File saveFile = new File(getFilesDir(), "temp/test.pdf");
+editDialog.setSavePath(saveFile.getAbsolutePath());
+editDialog.setDefaultText("ComPDFKit");
+// editDialog.setDefaultImagePath("xxx.png");
+editDialog.setCompleteListener(pdfFile -> {
+  if (!TextUtils.isEmpty(pdfFile)){
+    openPDF(pdfFile);
+  }
+  editDialog.dismiss();
+});
+editDialog.show(getSupportFragmentManager(), "addWatermarkDialog");
+
+private void openPDF(String path){
+  CPDFDocumentActivity.startActivity(this, path, "",
+                                     CPDFConfigurationUtils.normalConfig(this, "tools_default_configuration.json"));
+}
+```
+
+<img src="screenshots/img_2.jpg" style="zoom: 30%;" />
+
+### Encryption
+
+If you need to set an opening password or permission password for a document, you can do so through `CDocumentEncryptionDialog`. The following is an example:
+
+```java
+private void encryption(){
+  String path = CFileUtils.getAssetsTempFile(this, "test_SetPassword.pdf", "test_SetPassword.pdf");
+
+  CPDFDocument document = new CPDFDocument(this);
+  document.open(path);
+
+  CPDFDocument.PDFDocumentPermissions permission = document.getPermissions();
+  //only has user permission
+  if (permission == CPDFDocument.PDFDocumentPermissions.PDFDocumentPermissionsUser) {
+    // You can enter the owner permissions password and reload the pdf to gain owner permissions
+    CInputOwnerPwdDialog inputOwnerPwdDialog = CInputOwnerPwdDialog.newInstance();
+    inputOwnerPwdDialog.setDocument(document);
+    inputOwnerPwdDialog.setConfirmClickListener(ownerPassword -> {
+      inputOwnerPwdDialog.dismiss();
+      document.reload(ownerPassword);
+      showEncryptionDialog(document);
+    });
+    inputOwnerPwdDialog.show(getSupportFragmentManager(), "inputOwnerPwdDialog");
+    return;
+  }
+  showEncryptionDialog(document);
+}
+
+private void showEncryptionDialog(CPDFDocument document){
+  CDocumentEncryptionDialog encryptionDialog = CDocumentEncryptionDialog.newInstance();
+  encryptionDialog.setDocument(document);
+  encryptionDialog.setEncryptionResultListener((isRemoveSecurity, result, filePath, password) -> openPDF(filePath));
+  encryptionDialog.show(getSupportFragmentManager(), "showEncryptionDialog");
+}
+
+private void openPDF(String path){
+  CPDFDocumentActivity.startActivity(this, path, "",
+                                     CPDFConfigurationUtils.normalConfig(this, "tools_default_configuration.json"));
+}
+```
+
+<img src="screenshots/img_3.jpg" style="zoom: 30%;" />

ComPDFKit_Repo/compdfkit/ComPDFKit.aar

@@ -54,8 +54,8 @@ dependencies {
     api project(path:':ComPDFKit_Repo:compdfkit')
     api project(path:':ComPDFKit_Repo:compdfkit-ui')
     // or use
-//    api ('com.compdf:compdfkit:2.2.0')
-//    api ('com.compdf:compdfkit-ui:2.2.0')
+//    api ('com.compdf:compdfkit:2.2.1')
+//    api ('com.compdf:compdfkit-ui:2.2.1')
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
     api 'androidx.documentfile:documentfile:1.0.1'

ComPDFKit_Tools/README.md

@@ -23,7 +23,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
-import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -67,8 +67,6 @@ public class CAnnotationToolbar extends FrameLayout {
 
     private CPDFViewCtrl pdfView;
 
-    private FragmentManager fragmentManager;
-
     private COnAnnotationChangeListener annotationChangeListener;
 
     private LinearLayout llAnnotTools;
@@ -120,10 +118,6 @@ public void initWithPDFView(CPDFViewCtrl pdfView) {
 //        redoUndoManager();
     }
 
-    public void setFragmentManager(FragmentManager fragmentManager) {
-        this.fragmentManager = fragmentManager;
-    }
-
     private void showAnnotStyleDialog() {
         CViewUtils.hideKeyboard(this);
         CStyleManager styleManager = new CStyleManager(pdfView);
@@ -157,7 +151,10 @@ public void onChangeOpacity(int opacity) {
                 }
             }
         });
-        dialogFragment.show(fragmentManager, "annotStyleDialogFragment");
+        FragmentActivity fragmentActivity = CViewUtils.getFragmentActivity(getContext());
+        if (fragmentActivity != null) {
+            dialogFragment.show(fragmentActivity.getSupportFragmentManager(), "annotStyleDialogFragment");
+        }
     }
 
     private void switchAnnotationType(CAnnotToolBean bean) {

ComPDFKit_Tools/build.gradle

@@ -16,17 +16,14 @@
 import android.os.Environment;
 import android.text.TextUtils;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ProgressBar;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -38,6 +35,7 @@
 import com.compdfkit.tools.annotation.pdfannotationlist.data.CPDFAnnotDatas;
 import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CPDFEditReplyDialogFragment;
 import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CPDFReplyDetailsDialogFragment;
+import com.compdfkit.tools.common.basic.fragment.CBasicThemeFragment;
 import com.compdfkit.tools.common.interfaces.COnSetPDFDisplayPageIndexListener;
 import com.compdfkit.tools.common.utils.CFileUtils;
 import com.compdfkit.tools.common.utils.CLog;
@@ -54,7 +52,7 @@
 import java.util.List;
 
 
-public class CPDFAnnotationListFragment extends Fragment {
+public class CPDFAnnotationListFragment extends CBasicThemeFragment {
 
     private RecyclerView rvAnnotation;
 
@@ -111,14 +109,17 @@ public void initWithPDFView(CPDFViewCtrl pdfView) {
         this.pdfView = pdfView;
     }
 
-    @Nullable
+
+    @Override
+    protected int layoutId() {
+        return R.layout.tools_bota_annotation_list_fragment;
+    }
+
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.tools_bota_annotation_list_fragment, container, false);
+    protected void onCreateView(View rootView) {
         rvAnnotation = rootView.findViewById(R.id.rv_annotation);
         clEmptyView = rootView.findViewById(R.id.cl_annot_empty_view);
         progressBar = rootView.findViewById(R.id.progress_bar);
-        return rootView;
     }
 
     @Override

ComPDFKit_Tools/screenshots/img_2.jpg

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014-2024 PDF Technologies, Inc. All Rights Reserved.
+ * Copyright © 2014-2025 PDF Technologies, Inc. All Rights Reserved.
  *
  * THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  * AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.

ComPDFKit_Tools/screenshots/img_3.jpg

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2014-2024 PDF Technologies, Inc. All Rights Reserved.
+ * Copyright © 2014-2025 PDF Technologies, Inc. All Rights Reserved.
  * <p>
  * THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  * AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.