PDFTool(Android) - v2.2.2

Author: xiaolongrick

ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.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.1')
-//    api ('com.compdf:compdfkit-ui:2.2.1')
+//    api ('com.compdf:compdfkit:2.2.2')
+//    api ('com.compdf:compdfkit-ui:2.2.2')
     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_Repo/compdfkit/ComPDFKit.aar

@@ -264,6 +264,9 @@
   },
   "global" : {
     "themeMode" : "system",
-    "fileSaveExtraFontSubset" : true
+    "fileSaveExtraFontSubset" : true,
+    "watermark": {
+      "saveAsNewFile" : true
+    }
   }
 }

ComPDFKit_Tools/build.gradle

@@ -75,6 +75,8 @@ protected void onCreateView(View rootView) {
         });
         ivAddTextStamp.setOnClickListener(addTextStampClickListener);
         ivAddImageStamp.setOnClickListener(addImageStampClickListener);
+        rootView.findViewById(R.id.tv_add_text_stamp).setOnClickListener(addTextStampClickListener);
+        rootView.findViewById(R.id.tv_add_image_stamp).setOnClickListener(addImageStampClickListener);
         rootView.findViewById(R.id.cl_rootView).setOnClickListener(v -> dismiss());
         fabAnim(true);
     }

ComPDFKit_Tools/src/main/assets/tools_default_configuration.json

@@ -60,4 +60,16 @@ public ContextMenuView addItem(@StringRes int titleRes, OnClickListener clickLis
         }
         return this;
     }
+
+    public ContextMenuView addItem(String title, OnClickListener clickListener){
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.tools_context_menu_item_layout, null);
+        AppCompatTextView textView = (AppCompatTextView) view;
+        textView.setId(View.generateViewId());
+        textView.setText(title);
+        textView.setOnClickListener(clickListener);
+        if (llContent != null) {
+            llContent.addView(view);
+        }
+        return this;
+    }
 }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfproperties/pdfstamp/CAddStampSwichDialogFragment.java

@@ -728,6 +728,10 @@ private static GlobalConfig parseGlobalConfig(@Nullable JSONObject jsonObject) {
         globalConfig.themeMode = GlobalConfig.CThemeMode.fromString(jsonObject.optString("themeMode", "light"));
         globalConfig.fileSaveExtraFontSubset = jsonObject.optBoolean("fileSaveExtraFontSubset", true);
 
+        JSONObject watermark = jsonObject.optJSONObject("watermark");
+        if (watermark != null){
+            globalConfig.watermark.saveAsNewFile = watermark.optBoolean("saveAsNewFile",true);
+        }
         return globalConfig;
     }
 }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/contextmenu/provider/ContextMenuView.java

@@ -489,7 +489,7 @@ protected void initSearchBar() {
     }
 
     private void restoreEdit() {
-        restoreEdit(pdfView,pdfToolBar.getMode() == CPreviewMode.Edit);
+        restoreEdit(pdfView, pdfToolBar.getMode() == CPreviewMode.Edit);
     }
 
     protected void initEditBar() {
@@ -837,7 +837,7 @@ public void showSearch() {
         }
     }
 
-    public void showBOTA(){
+    public void showBOTA() {
         pdfView.getCPdfReaderView().removeAllAnnotFocus();
         if (pdfView.getCPdfReaderView().getEditManager().isEditMode()) {
             curEditMode = pdfView.getCPdfReaderView().getLoadType();
@@ -864,11 +864,11 @@ public void showBOTA(){
         dialogFragment.show(getChildFragmentManager(), "annotationList");
     }
 
-    public void showPageEdit(boolean enterEditMode){
+    public void showPageEdit(boolean enterEditMode) {
         showPageEdit(pdfView, enterEditMode, this::restoreEdit);
     }
 
-    public void showSecurityDialog(){
+    public void showSecurityDialog() {
         CPDFDocument document = pdfView.getCPdfReaderView().getPDFDocument();
         if (document == null) {
             return;
@@ -888,25 +888,34 @@ public void showSecurityDialog(){
         showSettingEncryptionDialog();
     }
 
-    public void showAddWatermarkDialog(){
+    public void showAddWatermarkDialog() {
+        showAddWatermarkDialog(cpdfConfiguration.globalConfig.watermark.saveAsNewFile);
+    }
+
+    public void showAddWatermarkDialog(boolean saveAsNewFile) {
         CWatermarkEditDialog watermarkEditDialog = CWatermarkEditDialog.newInstance();
         watermarkEditDialog.setDocument(pdfView.getCPdfReaderView().getPDFDocument());
         watermarkEditDialog.setSaveFileExtraFontSubset(pdfView.isSaveFileExtraFontSubset());
         watermarkEditDialog.setPageIndex(pdfView.currentPageIndex);
-        watermarkEditDialog.setCompleteListener((pdfFile) -> {
-            pdfView.getCPdfReaderView().reloadPages();
+        watermarkEditDialog.setSaveAsNewFile(saveAsNewFile);
+        watermarkEditDialog.setCompleteListener((saveAsNewFile1, pdfFile) -> {
             watermarkEditDialog.dismiss();
+            CToastUtil.showLongToast(getContext(), R.string.tools_watermark_add_success);
+            if (!saveAsNewFile1) {
+                pdfView.getCPdfReaderView().reloadPages();
+                return;
+            }
+            pdfView.getCPdfReaderView().reloadPages();
             if (TextUtils.isEmpty(pdfFile)) {
                 CToastUtil.showLongToast(getContext(), R.string.tools_watermark_add_failed);
                 return;
             }
             pdfView.openPDF(pdfFile);
-            CToastUtil.showLongToast(getContext(), R.string.tools_watermark_add_success);
         });
         watermarkEditDialog.show(getChildFragmentManager(), "watermarkEditDialog");
     }
 
-    public void showFlattenedDialog(){
+    public void showFlattenedDialog() {
         if (Build.VERSION.SDK_INT < CPermissionUtil.VERSION_R) {
             multiplePermissionResultLauncher.launch(CPermissionUtil.STORAGE_PERMISSIONS, result -> {
                 if (CPermissionUtil.hasStoragePermissions(getContext())) {
@@ -922,7 +931,7 @@ public void showFlattenedDialog(){
         }
     }
 
-    public void enterSnipMode(){
+    public void enterSnipMode() {
         CPDFReaderView readerView = pdfView.getCPdfReaderView();
         readerView.removeAllAnnotFocus();
         if (readerView.getContextMenuShowListener() != null) {
@@ -939,7 +948,7 @@ public void enterSnipMode(){
         readerView.setTouchMode(CPDFReaderView.TouchMode.SCREENSHOT);
     }
 
-    public void exitSnipMode(){
+    public void exitSnipMode() {
         CPDFReaderView readerView = pdfView.getCPdfReaderView();
         readerView.removeAllAnnotFocus();
         if (readerView.getContextMenuShowListener() != null) {
@@ -950,14 +959,14 @@ public void exitSnipMode(){
             view.clearScreenShotRect();
         }
         CPDFReaderView.ViewMode viewMode = readerView.getViewMode();
-        if(viewMode == CPDFReaderView.ViewMode.PDFEDIT){
+        if (viewMode == CPDFReaderView.ViewMode.PDFEDIT) {
             readerView.setTouchMode(CPDFReaderView.TouchMode.EDIT);
             CPDFEditManager editManager = readerView.getEditManager();
             if (editManager != null && !editManager.isEditMode()) {
                 editManager.enable();
                 editManager.beginEdit(CPDFEditPage.LoadTextImage | CPDFEditPage.LoadPath);
             }
-        }else {
+        } else {
             readerView.setTouchMode(CPDFReaderView.TouchMode.BROWSE);
         }
         screenManager.fillScreenChange();

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFConfigurationUtils.java

@@ -0,0 +1,14 @@
+package com.compdfkit.tools.common.pdf.config;
+
+import java.io.Serializable;
+
+/**
+ * @classname:
+ * @author: LiuXiaoLong
+ * @date: 2025/2/7
+ * description:
+ */
+public class CPDFWatermarkConfig implements Serializable {
+    public boolean saveAsNewFile = true;
+
+}

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java

@@ -33,4 +33,6 @@ public static CThemeMode fromString(String str) {
      */
     public boolean fileSaveExtraFontSubset = true;
 
+    public CPDFWatermarkConfig watermark = new CPDFWatermarkConfig();
+
 }