v2.6.6

1. Added support for TalkBack to improve accessibility.
2. Added a brand-new CPDFPageNavigator quick page navigation slider component.
3. Fixed the issue of stamp click rotation crash
4. Remove the default request storage permission for CPDFDocumentFragment
5. Fixed an occasional crash issue in CPDFEditToolbar.
6. Fixed an issue where saving changes in content editing mode might not take effect.

Author: xiaolongrick

ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar

@@ -55,8 +55,8 @@ dependencies {
     api project(path:':ComPDFKit_Repo:compdfkit')
     api project(path:':ComPDFKit_Repo:compdfkit-ui')
     // or use
-    // api ('com.compdf:compdfkit:2.6.5')
-    // api ('com.compdf:compdfkit-ui:2.6.5')
+    // api ('com.compdf:compdfkit:2.6.6')
+    // api ('com.compdf:compdfkit-ui:2.6.6')
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
     api "androidx.print:print:1.0.0"

ComPDFKit_Repo/compdfkit/ComPDFKit.aar

@@ -36,9 +36,13 @@
 import com.compdfkit.tools.common.pdf.config.AnnotationsConfig;
 import com.compdfkit.tools.common.utils.CListUtil;
 import com.compdfkit.tools.common.utils.CLog;
+import com.compdfkit.tools.common.utils.customevent.CPDFCustomEventCallbackHelper;
+import com.compdfkit.tools.common.utils.customevent.CPDFCustomEventField;
+import com.compdfkit.tools.common.utils.customevent.CPDFCustomEventType;
 import com.compdfkit.tools.common.utils.viewutils.CDimensUtils;
 import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.pdfproperties.CAnnotationType;
+import com.compdfkit.tools.common.views.pdfproperties.CTypeUtil;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CBasicOnStyleChangeListener;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleDialogFragment;
@@ -54,6 +58,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -214,6 +219,12 @@ public void onChangeOpacity(int opacity) {
         }
     }
 
+    private boolean hasAnnotationStyleSelection(CAnnotStyle style) {
+        return style.getTextStamp() != null
+                || style.getStandardStamp() != null
+                || !TextUtils.isEmpty(style.getImagePath());
+    }
+
     public void switchAnnotationUnknown(){
         if (toolListAdapter.getCurrentAnnotType() == CAnnotationType.INK_ERASER) {
             setUndoManagerType(UndoManagerType.AnnotUndo);

ComPDFKit_Tools/build.gradle

@@ -34,9 +34,12 @@ public abstract class CBasicBottomSheetDialogFragment extends BottomSheetDialogF
 
     protected COnDialogDismissListener dismissListener;
 
+    private boolean dismissCallbackDispatched;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        dismissCallbackDispatched = false;
         int styleId = CViewUtils.getThemeStyle(getContext(), themeResId());
         if (styleId != 0){
             setStyle(STYLE_NORMAL, styleId);
@@ -117,20 +120,26 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
     @Override
     public void onCancel(@NonNull DialogInterface dialog) {
         super.onCancel(dialog);
-        if (dismissListener != null) {
-            dismissListener.dismiss();
-        }
+        notifyDismissListenerOnce();
     }
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
-        if (dismissListener != null){
-            dismissListener.dismiss();
-        }
+        notifyDismissListenerOnce();
     }
 
     public void setDismissListener(COnDialogDismissListener dismissListener) {
         this.dismissListener = dismissListener;
     }
+
+    private void notifyDismissListenerOnce() {
+        if (dismissCallbackDispatched) {
+            return;
+        }
+        dismissCallbackDispatched = true;
+        if (dismissListener != null) {
+            dismissListener.dismiss();
+        }
+    }
 }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationbar/CAnnotationToolbar.java

@@ -121,14 +121,17 @@ protected void registerFormHelper(CPDFViewCtrl pdfView) {
     }
 
     public void showDisplaySettings(CPDFViewCtrl pdfView) {
+        curEditMode = pdfView.getCPdfReaderView().getLoadType();
         pdfView.exitEditMode();
         CPDFDisplaySettingDialogFragment displaySettingDialogFragment = CPDFDisplaySettingDialogFragment.newInstance();
         displaySettingDialogFragment.initWithPDFView(pdfView);
+        displaySettingDialogFragment.setDismissListener(()->{
+            restoreEdit(pdfView,true);
+        });
         displaySettingDialogFragment.show(getChildFragmentManager(), "displaySettingsDialog");
     }
 
     public void showDocumentInfo(CPDFViewCtrl pdfView) {
-        pdfView.exitEditMode();
         CPDFDocumentInfoDialogFragment infoDialogFragment = CPDFDocumentInfoDialogFragment.newInstance();
         infoDialogFragment.initWithPDFView(pdfView);
         infoDialogFragment.show(getChildFragmentManager(), "documentInfoDialogFragment");
@@ -200,7 +203,7 @@ protected void showPageEdit(CPDFViewCtrl pdfView, boolean enterEdit, boolean ena
         pageEditDialogFragment.show(getChildFragmentManager(), "pageEditDialogFragment");
     }
 
-    protected void restoreEdit(CPDFViewCtrl pdfView, boolean isEditMode) {
+    public void restoreEdit(CPDFViewCtrl pdfView, boolean isEditMode) {
         if (curEditMode > CPDFEditPage.LoadNone && isEditMode) {
             CPDFEditManager editManager = pdfView.getCPdfReaderView().getEditManager();
             if (!editManager.isEditMode()) {

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/basic/fragment/CBasicBottomSheetDialogFragment.java

@@ -13,15 +13,12 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.activity.CPermissionActivity;
 import com.compdfkit.tools.common.pdf.config.CPDFConfiguration;
-import com.compdfkit.tools.common.utils.CFileUtils;
-import java.security.PublicKey;
 
 public class CPDFDocumentActivity extends CPermissionActivity {
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/basic/fragment/CBasicPDFFragment.java

@@ -11,6 +11,7 @@
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
+import static com.compdfkit.tools.common.utils.customevent.CPDFCustomEventType.ADD_WATERMARK_DIALOG_DISMISSED;
 import static com.compdfkit.tools.contenteditor.CEditToolbar.SELECT_AREA_IMAGE;
 import static com.compdfkit.tools.contenteditor.CEditToolbar.SELECT_AREA_TEXT;
 
@@ -60,6 +61,9 @@
 import com.compdfkit.tools.common.utils.activitycontracts.CSelectPDFDocumentResultContract;
 import com.compdfkit.tools.common.utils.animation.CFillScreenManager;
 import com.compdfkit.tools.common.utils.annotation.CPDFAnnotationManager;
+import com.compdfkit.tools.common.utils.customevent.CPDFCustomEventCallbackHelper;
+import com.compdfkit.tools.common.utils.customevent.CPDFCustomEventField;
+import com.compdfkit.tools.common.utils.customevent.CPDFCustomEventType;
 import com.compdfkit.tools.common.utils.dialog.CAlertDialog;
 import com.compdfkit.tools.common.utils.dialog.CExitTipsDialog;
 import com.compdfkit.tools.common.utils.glide.CPDFGlideInitializer;
@@ -102,7 +106,9 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 public class CPDFDocumentFragment extends CBasicPDFFragment {
@@ -337,7 +343,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             initEditBar();
             initSignatureToolbar();
             applyConfiguration();
-            onDoNext();
             if (initListener != null) {
                 initListener.compile(pdfView);
             }
@@ -480,24 +485,6 @@ protected void initToolBarView() {
         pdfToolBar.setMenuItems(this, cpdfConfiguration.toolbarConfig);
     }
 
-    protected void requestStoragePermissions(CRequestPermissionListener permissionListener) {
-        if (Build.VERSION.SDK_INT >= CPermissionUtil.VERSION_TIRAMISU) {
-            CPermissionUtil.openManageAllFileAppSettings(getContext());
-        } else {
-            multiplePermissionResultLauncher.launch(STORAGE_PERMISSIONS, result -> {
-                if (CPermissionUtil.hasStoragePermissions(getContext())) {
-                    if (permissionListener != null) {
-                        permissionListener.request();
-                    }
-                } else {
-                    if (!CPermissionUtil.shouldShowRequestPermissionRationale(requireActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                        showPermissionsRequiredDialog();
-                    }
-                }
-            });
-        }
-    }
-
     protected void initAnnotToolbar() {
         annotationToolbar.initWithPDFView(pdfView);
         annotationToolbar.addAnnotationChangeListener(type -> {
@@ -720,12 +707,6 @@ public void selectDocument() {
         alertDialog.show(getChildFragmentManager(), "alertDialog");
     }
 
-    protected void onDoNext() {
-        multiplePermissionResultLauncher.launch(STORAGE_PERMISSIONS, result -> {
-
-        });
-    }
-
     protected void showSettingEncryptionDialog() {
         CDocumentEncryptionDialog documentEncryptionDialog = CDocumentEncryptionDialog.newInstance();
         documentEncryptionDialog.setDocument(pdfView.getCPdfReaderView().getPDFDocument());
@@ -933,6 +914,11 @@ public void showAddWatermarkDialog(CPDFWatermarkConfig watermarkConfig) {
                 pdfView.openPDF(pdfFile);
             }
         });
+        watermarkEditDialog.setDismissListener(()-> {
+            Map<String, Object> extraMap = new HashMap<>();
+            extraMap.put(CPDFCustomEventField.CUSTOM_EVENT_TYPE, ADD_WATERMARK_DIALOG_DISMISSED);
+            CPDFCustomEventCallbackHelper.getInstance().notifyClick("", extraMap);
+        });
         watermarkEditDialog.show(getChildFragmentManager(), "watermarkEditDialog");
     }
 

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

@@ -23,6 +23,6 @@ public class CPDFCustomEventField {
     public static final String IMAGE = "image";
     public static final String TEXT = "text";
     public static final String RECT = "rect";
-
+    public static final String STYLE_TYPE = "styleType";
 
 }

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

@@ -14,5 +14,11 @@ public class CPDFCustomEventType {
     public static final String CONTEXT_MENU_ITEM_TAPPED = "ContextMenuItem";
     public static final String INTERCEPT_ANNOTATION_DO_ACTION = "InterceptAnnotationDoAction";
     public static final String INTERCEPT_WIDGET_DO_ACTION = "InterceptWidgetDoAction";
+    public static final String SEARCH_BACK_BUTTON_TAPPED = "SearchBackButtonTapped";
+    public static final String ANNOTATION_STYLE_DIALOG_DISMISSED = "AnnotationStyleDialogDismissed";
+    public static final String FORM_STYLE_DIALOG_DISMISSED = "FormStyleDialogDismissed";
+    public static final String CONTENT_EDITOR_STYLE_DIALOG_DISMISSED = "ContentEditorStyleDialogDismissed";
+
+    public static final String ADD_WATERMARK_DIALOG_DISMISSED = "AddWatermarkDialogDismissed";
 
 }