PDFTool(Android) - bug修复

Annotations/src/main/java/com/compdfkit/annotations/PDFAnnotationSampleActivity.java

@@ -10,7 +10,6 @@ import androidx.activity.result.ActivityResultLauncher;
 import com.compdfkit.annotations.databinding.AnnotationPdfSampleActivityBinding;
 import com.compdfkit.core.annotation.CPDFAnnotation;
 import com.compdfkit.tools.common.basic.activity.CBasicPDFActivity;
-import com.compdfkit.tools.common.pdf.CPDFApplyConfigUtil;
 import com.compdfkit.tools.common.pdf.CPDFConfigurationUtils;
 import com.compdfkit.tools.common.pdf.config.AnnotationsConfig;
 import com.compdfkit.tools.common.pdf.config.CPDFConfiguration;

Annotations/src/main/res/values/annotation_themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Annotation_Basic_Theme" parent="ComPDFKit.Theme.Light">
     </style>

ComPDFKit_Tools/build.gradle

@@ -43,10 +43,12 @@ android {
 dependencies {
 
     api fileTree(include: ['*.jar'], dir: 'libs')
+    // use this
     api project(path:':ComPDFKit_Repo:compdfkit')
     api project(path:':ComPDFKit_Repo:compdfkit-ui')
-//    api ('com.compdf:compdfkit:2.0.1')
-//    api ('com.compdf:compdfkit-ui:2.0.1')
+    // or use
+//    api ('com.compdf:compdfkit:2.1.0')
+//    api ('com.compdf:compdfkit-ui:2.1.0')
     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/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationbar/data/CAnnotationToolDatas.java

@@ -9,7 +9,6 @@ import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleType;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.manager.CStyleManager;
 import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationlist/CPDFAnnotationListFragment.java

@@ -19,7 +19,6 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.PopupWindow;
 import android.widget.ProgressBar;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -27,22 +26,16 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.view.GravityCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.compdfkit.core.annotation.CPDFAnnotation;
 import com.compdfkit.core.annotation.CPDFReplyAnnotation;
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.document.CPDFSdk;
-import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.annotation.pdfannotationbar.data.CAnnotationToolDatas;
 import com.compdfkit.tools.annotation.pdfannotationlist.adapter.CPDFAnnotListAdapter;
 import com.compdfkit.tools.annotation.pdfannotationlist.bean.CPDFAnnotListItem;
 import com.compdfkit.tools.annotation.pdfannotationlist.data.CPDFAnnotDatas;
-import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CMarkedTipsWindow;
 import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CPDFEditReplyDialogFragment;
 import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CPDFReplyDetailsDialogFragment;
 import com.compdfkit.tools.common.interfaces.COnSetPDFDisplayPageIndexListener;
@@ -74,6 +67,7 @@ public class CPDFAnnotationListFragment extends Fragment {
 
     private ProgressBar progressBar;
 
+
     public static CPDFAnnotationListFragment newInstance() {
         return new CPDFAnnotationListFragment();
     }
@@ -90,19 +84,19 @@ public class CPDFAnnotationListFragment extends Fragment {
             // get xfdf format file name
             String fileName = CUriUtil.getUriFileName(getContext(), uri);
             //Determine whether the file is in xfdf format
-            if (fileName.toLowerCase().endsWith(".xfdf")){
+            if (fileName.toLowerCase().endsWith(".xfdf")) {
                 // Save the file to the app's internal storage cache directory
                 String dir = new File(getContext().getCacheDir(), CFileUtils.CACHE_FOLDER + File.separator + "xfdfFile").getAbsolutePath();
                 // Get the saved file path
                 String importFilePath = CFileUtils.copyFileToInternalDirectory(getContext(), uri, dir, fileName);
                 CLog.e("ComPDFKit-Tools", "importFilePath:" + importFilePath);
 
-                if (!TextUtils.isEmpty(importFilePath)){
+                if (!TextUtils.isEmpty(importFilePath)) {
                     boolean importResult = CPDFAnnotDatas.importAnnotations(pdfView.getCPdfReaderView().getPDFDocument(), importFilePath);
-                    if (importResult){
+                    if (importResult) {
                         CToastUtil.showLongToast(getContext(), R.string.tools_import_success);
                         pdfView.getCPdfReaderView().reloadPages();
-                        pdfView.postDelayed(()-> updateAnnotationList(), 400);
+                        pdfView.postDelayed(this::updateAnnotationList, 400);
                     }
                     CLog.e("ComPDFKit-Tools", "import Annotation xfdf format file " + (importResult ? "success" : "fail"));
                 }
@@ -132,7 +126,7 @@ public class CPDFAnnotationListFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
         listAdapter = new CPDFAnnotListAdapter();
         updateAnnotationList();
-        listAdapter.addOnItemChildClickListener((adapter,view1,position) -> {
+        listAdapter.addOnItemChildClickListener((adapter, view1, position) -> {
             CPDFAnnotListItem item = adapter.list.get(position);
             if (view1.getId() == R.id.cl_root) {
                 if (!item.isHeader()) {
@@ -141,14 +135,14 @@ public class CPDFAnnotationListFragment extends Fragment {
                         displayPageIndexListener.displayPage(item.getPage());
                     }
                 }
-            } else if(view1.getId() == R.id.iv_review_status){
+            } else if (view1.getId() == R.id.iv_review_status) {
                 listAdapter.showReviewStatusMenu(getContext(), position, view1);
-            } else if(view1.getId() == R.id.cb_marked_status){
+            } else if (view1.getId() == R.id.cb_marked_status) {
                 listAdapter.showMarkedStatusMenu(getContext(), position, view1);
-            } else if(view1.getId() == R.id.iv_more){
+            } else if (view1.getId() == R.id.iv_more) {
                 showAnnotationMoreMenu(item, position, view1);
             }
-        },R.id.iv_review_status, R.id.cb_marked_status, R.id.iv_more, R.id.cl_root);
+        }, R.id.iv_review_status, R.id.cb_marked_status, R.id.iv_more, R.id.cl_root);
         rvAnnotation.setLayoutManager(new LinearLayoutManager(getContext()));
         rvAnnotation.setAdapter(listAdapter);
     }
@@ -160,19 +154,20 @@ public class CPDFAnnotationListFragment extends Fragment {
 
     /**
      * Reload the annotation list data
+     *
      * @param showProgressBar Whether to display the loading status when loading
      */
     public void updateAnnotationList(boolean showProgressBar) {
-        if (showProgressBar){
+        if (showProgressBar) {
             progressBar.setVisibility(View.VISIBLE);
         }
         CThreadPoolUtils.getInstance().executeIO(() -> {
             List<CPDFAnnotListItem> list = CPDFAnnotDatas.getAnnotationList(pdfView);
             if (getActivity() != null) {
-                getActivity().runOnUiThread(()->{
-                    if (list == null || list.size() <= 0) {
+                getActivity().runOnUiThread(() -> {
+                    if (list.isEmpty()) {
                         clEmptyView.setVisibility(View.VISIBLE);
-                    }else {
+                    } else {
                         clEmptyView.setVisibility(View.GONE);
                     }
                     listAdapter.setList(list);
@@ -184,13 +179,11 @@ public class CPDFAnnotationListFragment extends Fragment {
 
     /**
      * show toolbar annotation menu, in CPDFBOTAFragment
-     * @param anchorView
+     *
      */
-    public void showAnnotationMenu(View anchorView){
+    public void showAnnotationMenu(View anchorView) {
         CPopupMenuWindow menuWindow = new CPopupMenuWindow(getContext());
-        menuWindow.addItem(R.string.tools_import_annotations, v -> {
-            importAnnotFileLauncher.launch(CFileUtils.getIntent("application/octet-stream"));
-        });
+        menuWindow.addItem(R.string.tools_import_annotations, v -> importAnnotFileLauncher.launch(CFileUtils.getIntent("application/octet-stream")));
         menuWindow.addItem(R.string.tools_export_annotations, v -> {
             // Select the directory to export the annotation files
             String dirPath = Environment.getExternalStorageDirectory().getAbsolutePath();
@@ -198,15 +191,13 @@ public class CPDFAnnotationListFragment extends Fragment {
             directoryDialog.setSelectFolderListener(dir -> {
                 CPDFDocument document = pdfView.getCPdfReaderView().getPDFDocument();
                 boolean result = CPDFAnnotDatas.exportAnnotations(document, dir, CFileUtils.getFileNameNoExtension(document.getFileName()));
-                if (result){
+                if (result) {
                     CToastUtil.showLongToast(getContext(), R.string.tools_export_success);
                 }
             });
             directoryDialog.show(getChildFragmentManager(), "dirDialog");
         });
-        menuWindow.addItem(R.string.tools_delete_all_annotations, v -> {
-            deleteAllAnnotations();
-        });
+        menuWindow.addItem(R.string.tools_delete_all_annotations, v -> deleteAllAnnotations());
         menuWindow.addItem(R.string.tools_delete_all_replies, v -> {
             CPDFDocument document = pdfView.getCPdfReaderView().getPDFDocument();
             CPDFAnnotDatas.removeAllAnnotationReply(document);
@@ -218,9 +209,9 @@ public class CPDFAnnotationListFragment extends Fragment {
     /**
      * delete pdf document all annotations
      */
-    public void deleteAllAnnotations(){
+    public void deleteAllAnnotations() {
         boolean result = CPDFAnnotDatas.removeAllAnnotations(listAdapter.list);
-        if (result){
+        if (result) {
             pdfView.getCPdfReaderView().reloadPages();
             updateAnnotationList();
         }
@@ -229,13 +220,14 @@ public class CPDFAnnotationListFragment extends Fragment {
     /**
      * Displays the more options menu for the selected annotation, including:
      * adding an annotation reply, showing the annotation reply list, and deleting the annotation.
-     * @param item The annotation data currently selected from the list
-     * @param position The position of the selected item in the list
+     *
+     * @param item       The annotation data currently selected from the list
+     * @param position   The position of the selected item in the list
      * @param anchorView The view to anchor the menu to
      */
-    private void showAnnotationMoreMenu(CPDFAnnotListItem item, int position, View anchorView){
+    private void showAnnotationMoreMenu(CPDFAnnotListItem item, int position, View anchorView) {
         CPopupMenuWindow moreMenu = new CPopupMenuWindow(getContext());
-        moreMenu.addItem(R.string.tools_add_a_new_reply,v -> {
+        moreMenu.addItem(R.string.tools_add_a_new_reply, v -> {
             CPDFEditReplyDialogFragment editReplyDialogFragment = CPDFEditReplyDialogFragment.addReply();
             editReplyDialogFragment.setReplyContentListener(content -> {
                 CPDFReplyAnnotation replyAnnotation = item.getAttr().createReplyAnnotation();
@@ -245,40 +237,36 @@ public class CPDFAnnotationListFragment extends Fragment {
             });
             editReplyDialogFragment.show(getChildFragmentManager(), "addReplyDialogFragment");
         });
-        moreMenu.addItem(R.string.tools_view_replies, v -> {
-            showReplyDetailsFragment(item, position);
-        });
+        moreMenu.addItem(R.string.tools_view_replies, v -> showReplyDetailsFragment(item, position));
         moreMenu.addItem(R.string.tools_delete_annotation, v -> {
             boolean result = item.getAttr().removeFromPage();
-            if (result){
+            if (result) {
                 listAdapter.remove(position);
                 ArrayList<Integer> pages = new ArrayList<>();
                 pages.add(item.getPage());
                 pdfView.getCPdfReaderView().reloadPages(pages);
-                pdfView.getCPdfReaderView().postDelayed(()-> updateAnnotationList(false), 450);
+                pdfView.getCPdfReaderView().postDelayed(() -> updateAnnotationList(false), 450);
             }
         });
         int[] windowPos = CDimensUtils.calculatePopWindowPos(anchorView, moreMenu.getContentView());
-        windowPos[0] -= anchorView.getMeasuredWidth() /2 ;
+        windowPos[0] -= anchorView.getMeasuredWidth() / 2;
         windowPos[1] -= anchorView.getMeasuredHeight();
         moreMenu.setAnimationStyle(R.style.PopupAnimation);
         moreMenu.showAtLocation(anchorView, Gravity.START | Gravity.TOP, windowPos[0], windowPos[1]);
     }
 
-    private void showReplyDetailsFragment(CPDFAnnotListItem item, int position){
+    private void showReplyDetailsFragment(CPDFAnnotListItem item, int position) {
         CPDFReplyDetailsDialogFragment replyDetailsDialogFragment = CPDFReplyDetailsDialogFragment.newInstance();
         replyDetailsDialogFragment.setCPDFAnnotation(item.getAttr());
         replyDetailsDialogFragment.setAnnotAuthor(pdfView.getCPDFConfiguration().annotationsConfig.annotationAuthor);
-        replyDetailsDialogFragment.setUpdateAnnotationListListener(()->{
+        replyDetailsDialogFragment.setUpdateAnnotationListListener(() -> {
             listAdapter.remove(position);
             ArrayList<Integer> pages = new ArrayList<>();
             pages.add(item.getPage());
             pdfView.getCPdfReaderView().reloadPages(pages);
-            pdfView.getCPdfReaderView().postDelayed(()-> updateAnnotationList(false), 450);
-        });
-        replyDetailsDialogFragment.setDismissListener(()->{
-            listAdapter.notifyItemChanged(position);
+            pdfView.getCPdfReaderView().postDelayed(() -> updateAnnotationList(false), 450);
         });
+        replyDetailsDialogFragment.setDismissListener(() -> listAdapter.notifyItemChanged(position));
         replyDetailsDialogFragment.show(getChildFragmentManager(), "replyDetailsDialogFragment");
     }
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationlist/adapter/CPDFAnnotListAdapter.java

@@ -18,14 +18,11 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.compdfkit.core.annotation.CPDFAnnotation;
-import com.compdfkit.core.annotation.CPDFReplyAnnotation;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.annotation.pdfannotationbar.bean.CAnnotToolBean;
 import com.compdfkit.tools.annotation.pdfannotationlist.bean.CPDFAnnotListItem;
 import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CMarkedTipsWindow;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationlist/adapter/CPDFAnnotReplyListAdapter.java

@@ -20,7 +20,6 @@ import com.compdfkit.core.annotation.CPDFAnnotation;
 import com.compdfkit.core.annotation.CPDFReplyAnnotation;
 import com.compdfkit.core.common.CPDFDate;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.annotation.pdfannotationlist.bean.CPDFAnnotListItem;
 import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CMarkedTipsWindow;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationlist/data/CPDFAnnotDatas.java

@@ -1,3 +1,12 @@
+/**
+ * Copyright © 2014-2024 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.
+ * UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+ * This notice may not be removed from this file.
+ */
+
 package com.compdfkit.tools.annotation.pdfannotationlist.data;
 
 
@@ -45,8 +54,8 @@ public class CPDFAnnotDatas {
 
             for (int i = 0; i <= count - 1; i++) {
                 List<CPDFAnnotation> pageAnnotations = document.pageAtIndex(i).getAnnotations();
-                List<CPDFAnnotListItem> annotListItems = convertPageAnnotations(pageAnnotations, i);
-                if (annotListItems.size() > 0){
+                List<CPDFAnnotListItem> annotListItems = convertPageAnnotations(pageAnnotations);
+                if (!annotListItems.isEmpty()){
                     CPDFAnnotListItem headerItem = new CPDFAnnotListItem();
                     headerItem.setHeader(true);
                     headerItem.setAnnotationCount(annotListItems.size());
@@ -56,14 +65,14 @@ public class CPDFAnnotDatas {
                 }
             }
         }catch (Exception e){
-
+            e.printStackTrace();
         }
         return list;
     }
 
-    private static List<CPDFAnnotListItem> convertPageAnnotations(List<CPDFAnnotation> list, int page){
+    private static List<CPDFAnnotListItem> convertPageAnnotations(List<CPDFAnnotation> list){
         List<CPDFAnnotListItem> annotListItems = new ArrayList<>();
-        if (list == null || list.size() == 0){
+        if (list == null || list.isEmpty()){
             return annotListItems;
         }
         for (CPDFAnnotation cpdfAnnotation : list) {
@@ -88,7 +97,7 @@ public class CPDFAnnotDatas {
             attrTime = CPDFDate.toStandardDate(modifyDate);
         }
         int attrAlpha = 0;
-        String attrContent = "";
+        String attrContent;
         switch (cpdfAnnotation.getType()){
             case TEXT:
                 CPDFTextAnnotation textAnnotation = (CPDFTextAnnotation) cpdfAnnotation;
@@ -180,7 +189,7 @@ public class CPDFAnnotDatas {
 
     /**
      * export annotations to xfdf file
-     * @param document
+     * @param document the document
      * @param saveDir Saved directory
      * @param saveName The name of the saved file, excluding the xfdf file suffix
      * @return export success or failure status
@@ -200,9 +209,9 @@ public class CPDFAnnotDatas {
 
     /**
      * Import annotations in xfdf file
-     * @param document
+     * @param document the document
      * @param importFilePath imported xfdf file path
-     * @return
+     * @return import result
      */
     public static boolean importAnnotations(CPDFDocument document, String importFilePath){
         File cacheFile = new File(document.getContext().getCacheDir(), "annotationExportCache");
@@ -217,7 +226,7 @@ public class CPDFAnnotDatas {
             if (annotations != null) {
                 for (CPDFAnnotation annotation : annotations) {
                     CPDFReplyAnnotation[] replyAnnotations = annotation.getAllReplyAnnotations();
-                    if (replyAnnotations != null && replyAnnotations.length >0){
+                    if (replyAnnotations != null){
                         for (CPDFReplyAnnotation replyAnnotation : replyAnnotations) {
                             replyAnnotation.removeFromPageIncludeReplyAnnot();
                         }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfproperties/pdfsignature/CAddSignatureActivity.java

@@ -33,7 +33,6 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.annotation.pdfproperties.pdfsignature.data.CSignatureDatas;
 import com.compdfkit.tools.common.utils.dialog.CImportImageDialogFragment;
-import com.compdfkit.tools.common.utils.image.CBitmapUtil;
 import com.compdfkit.tools.common.utils.image.CImageUtil;
 import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
 import com.compdfkit.tools.common.utils.view.colorpicker.ColorPickerDialogFragment;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/contextmenu/CPDFContextMenuHelper.java

@@ -9,7 +9,6 @@
 
 package com.compdfkit.tools.common.contextmenu;
 
-import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Bundle;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/contextmenu/impl/CMarkupContextMenuView.java

@@ -14,10 +14,7 @@ import android.view.View;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.compdfkit.core.annotation.CPDFReplyAnnotation;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CPDFEditReplyDialogFragment;
-import com.compdfkit.tools.annotation.pdfannotationlist.dialog.CPDFReplyDetailsDialogFragment;
 import com.compdfkit.tools.common.contextmenu.CPDFContextMenuHelper;
 import com.compdfkit.tools.common.contextmenu.interfaces.ContextMenuMarkupProvider;
 import com.compdfkit.tools.common.contextmenu.provider.ContextMenuView;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/contextmenu/impl/CScreenShotContextMenuView.java

@@ -16,21 +16,17 @@ import android.graphics.RectF;
 import android.view.LayoutInflater;
 import android.view.View;
 
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.bumptech.glide.Glide;
 import com.compdfkit.core.edit.CPDFEditManager;
 import com.compdfkit.core.edit.CPDFEditPage;
-import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.contextmenu.CPDFContextMenuHelper;
 import com.compdfkit.tools.common.contextmenu.interfaces.ContextMenuScreenShotProvider;
 import com.compdfkit.tools.common.contextmenu.provider.ContextMenuView;
 import com.compdfkit.tools.common.pdf.CPDFDocumentFragment;
 import com.compdfkit.tools.common.utils.CFileUtils;
-import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.date.CDateUtil;
 import com.compdfkit.tools.common.utils.image.CImageUtil;
 import com.compdfkit.ui.reader.CPDFPageView;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/contextmenu/interfaces/ContextMenuScreenShotProvider.java

@@ -10,13 +10,11 @@
 package com.compdfkit.tools.common.contextmenu.interfaces;
 
 
-import android.graphics.Bitmap;
 import android.graphics.RectF;
 import android.view.LayoutInflater;
 import android.view.View;
 
 import com.compdfkit.tools.common.contextmenu.CPDFContextMenuHelper;
-import com.compdfkit.ui.proxy.CPDFInkAnnotImpl;
 import com.compdfkit.ui.reader.CPDFPageView;
 
 public interface ContextMenuScreenShotProvider {

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

@@ -18,7 +18,6 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.basic.activity.CBasicPDFActivity;
 import com.compdfkit.tools.common.basic.activity.CPermissionActivity;
 import com.compdfkit.tools.common.pdf.config.CPDFConfiguration;
 

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

@@ -38,10 +38,9 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 
 import com.compdfkit.core.annotation.CPDFAnnotation;
-import com.compdfkit.core.annotation.CPDFFreetextAnnotation;
 import com.compdfkit.core.annotation.form.CPDFSignatureWidget;
-import com.compdfkit.core.document.CPDFBackground;
 import com.compdfkit.core.document.CPDFDocument;
+import com.compdfkit.core.document.CPDFSdk;
 import com.compdfkit.core.edit.CPDFEditConfig;
 import com.compdfkit.core.edit.CPDFEditManager;
 import com.compdfkit.core.edit.CPDFEditPage;
@@ -89,7 +88,6 @@ import com.compdfkit.tools.signature.info.signlist.CPDFCertDigitalSignListDialog
 import com.compdfkit.tools.signature.verify.CVerifySignStatusView;
 import com.compdfkit.tools.viewer.pdfsearch.CSearchReplaceToolbar;
 import com.compdfkit.ui.contextmenu.IContextMenuShowListener;
-import com.compdfkit.ui.proxy.CPDFAnnotDefaultImpl;
 import com.compdfkit.ui.proxy.form.CPDFComboboxWidgetImpl;
 import com.compdfkit.ui.proxy.form.CPDFListboxWidgetImpl;
 import com.compdfkit.ui.proxy.form.CPDFPushbuttonWidgetImpl;
@@ -236,7 +234,6 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         screenManager.bind(this);
-
         initDocument(() -> {
             initPDFView();
             initToolBarView();
@@ -285,17 +282,17 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
                 }
             }
         });
-        pdfView.addReaderViewCallback(new CPDFIReaderViewCallback(){
+        pdfView.addReaderViewCallback(new CPDFIReaderViewCallback() {
             @Override
             public void onTapMainDocArea() {
                 if (pdfSearchToolBarView.getVisibility() == VISIBLE) {
                     pdfSearchToolBarView.showSearchReplaceContextMenu();
                     return;
                 }
-                if (pdfView.getCPdfReaderView().getTouchMode() == CPDFReaderView.TouchMode.SCREENSHOT){
+                if (pdfView.getCPdfReaderView().getTouchMode() == CPDFReaderView.TouchMode.SCREENSHOT) {
                     return;
                 }
-                if (!cpdfConfiguration.modeConfig.readerOnly){
+                if (!cpdfConfiguration.modeConfig.readerOnly) {
                     //Use the CFillScreenManager.class to manage fullscreen switching.
                     screenManager.fillScreenChange();
                 }
@@ -309,12 +306,12 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
             }
         });
         pdfView.getCPdfReaderView().setPdfAddAnnotCallback((cpdfPageView, cpdfBaseAnnot) -> {
-            CLog.e("ComPDFKit","Add Annot Callback- type:" + cpdfBaseAnnot.getAnnotType().name());
+            CLog.e("ComPDFKit", "Add Annot Callback- type:" + cpdfBaseAnnot.getAnnotType().name());
             CPDFAnnotation annotation = cpdfBaseAnnot.onGetAnnotation();
             annotation.setTitle(cpdfConfiguration.annotationsConfig.annotationAuthor);
             annotation.updateAp();
 
-            CLog.e("ComPDFKit","Add Annot Callback- setTitle:"+annotation.getTitle());
+            CLog.e("ComPDFKit", "Add Annot Callback- setTitle:" + annotation.getTitle());
             // Annotation creation completed listener, you can use cpdfBaseAnnot.getAnnotType() to determine the type of the added annotation
             if (cpdfBaseAnnot instanceof CPDFListboxWidgetImpl) {
                 // When the ListBox form is created, display an editing dialog for adding list data
@@ -359,7 +356,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
         } else {
 
             if (readerView.getTouchMode() == CPDFReaderView.TouchMode.SCREENSHOT
-            && readerView.getViewMode() == CPDFReaderView.ViewMode.PDFEDIT){
+                    && readerView.getViewMode() == CPDFReaderView.ViewMode.PDFEDIT) {
                 readerView.setTouchMode(CPDFReaderView.TouchMode.EDIT);
             }
             pdfView.exitEditMode();
@@ -437,7 +434,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
                                 tabs.add(outlineTab);
                                 tabs.add(bookmarkTab);
                                 tabs.add(annotationTab);
-                                if (pdfToolBar.getMode() == CPreviewMode.Annotation){
+                                if (pdfToolBar.getMode() == CPreviewMode.Annotation) {
                                     annotationTab.setDefaultSelect(true);
                                 }
                             }
@@ -532,10 +529,10 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
         CPDFEditConfig editConfig = pdfView.getCPdfReaderView()
                 .getEditManager()
                 .getEditConfigBuilder()
-                    .setScreenshotRectColor(Color.TRANSPARENT)
-                    .setScreenshotBorderColor(ContextCompat.getColor(getContext(), R.color.tools_color_accent))
-                    .setScreenshotBorderDash(new float[]{8.0F, 4F})
-                    .build();
+                .setScreenshotRectColor(Color.TRANSPARENT)
+                .setScreenshotBorderColor(ContextCompat.getColor(getContext(), R.color.tools_color_accent))
+                .setScreenshotBorderDash(new float[]{8.0F, 4F})
+                .build();
 
         pdfView.getCPdfReaderView().getEditManager().updateEditConfig(editConfig);
 
@@ -644,7 +641,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
                         menuWindow.addItem(R.drawable.tools_ic_document_info, R.string.tools_document_info, v1 -> showDocumentInfo(pdfView));
                         break;
                     case Save:
-                        menuWindow.addItem(R.drawable.tools_ic_menu_save, R.string.tools_save, v1 ->{
+                        menuWindow.addItem(R.drawable.tools_ic_menu_save, R.string.tools_save, v1 -> {
                             pdfView.savePDF((filePath, pdfUri) -> {
                                 CToastUtil.showLongToast(getContext(), R.string.tools_save_success);
                             }, e -> {
@@ -659,7 +656,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
                         break;
                     case OpenDocument:
                         menuWindow.addItem(R.drawable.tools_ic_new_file, R.string.tools_open_document, v1 -> {
-                                selectDocument();
+                            selectDocument();
                         });
                         break;
                     case Flattened:
@@ -674,7 +671,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
                                         }
                                     }
                                 });
-                            }else {
+                            } else {
                                 pdfView.savePDF((filePath, pdfUri) -> flattenedPdf(), e -> flattenedPdf());
                             }
                         });
@@ -880,7 +877,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
             if (menuWindow != null) {
                 menuWindow.dismiss();
             }
-        }catch (Exception e){
+        } catch (Exception e) {
 
         }
         super.onDestroy();
@@ -890,7 +887,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
         this.initListener = initListener;
     }
 
-    public interface CPDFDocumentFragmentInitListener{
+    public interface CPDFDocumentFragmentInitListener {
         void compile(CPDFViewCtrl pdfView);
     }
 }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/annotation/CPDFAnnotationManager.java

@@ -51,8 +51,6 @@ import com.compdfkit.ui.reader.CPDFPageView;
 import com.compdfkit.ui.reader.CPDFReaderView;
 import com.compdfkit.ui.utils.CPDFTextUtils;
 
-import java.lang.annotation.Annotation;
-
 public class CPDFAnnotationManager {
 
     public void addFreeText(String content, CPDFReaderView readerView, CPDFPageView pageView, PointF pointF) {

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/dialog/CAlertDialog.java

@@ -14,7 +14,6 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/dialog/CEditDialog.java

@@ -17,7 +17,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/image/CImageUtil.java

@@ -15,7 +15,6 @@ import android.graphics.Canvas;
 import android.view.View;
 
 import com.compdfkit.tools.common.utils.CFileUtils;
-import com.compdfkit.tools.common.utils.date.CDateUtil;
 
 import java.io.File;
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/viewutils/CViewUtils.java

@@ -11,7 +11,6 @@ package com.compdfkit.tools.common.utils.viewutils;
 
 
 import android.app.Dialog;
-import android.app.UiModeManager;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/utils/window/CBasePopupWindow.java

@@ -6,7 +6,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/CPDFToolBar.java

@@ -30,7 +30,6 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentActivity;
 
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.utils.dialog.CAlertDialog;
 import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.utils.window.CModeSwitchDialogFragment;
 import com.compdfkit.tools.common.views.pdfview.CPreviewMode;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfbota/CPDFBotaDialogFragment.java

@@ -10,37 +10,20 @@
 package com.compdfkit.tools.common.views.pdfbota;
 
 
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
-import android.text.TextUtils;
 import android.view.View;
 
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.widget.ViewPager2;
 
-import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.annotation.pdfannotationbar.data.CAnnotationToolDatas;
 import com.compdfkit.tools.annotation.pdfannotationlist.CPDFAnnotationListFragment;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
-import com.compdfkit.tools.common.utils.CFileUtils;
-import com.compdfkit.tools.common.utils.CLog;
-import com.compdfkit.tools.common.utils.CToastUtil;
-import com.compdfkit.tools.common.utils.CUriUtil;
-import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
 import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
-import com.compdfkit.tools.common.utils.window.CPopupMenuWindow;
 import com.compdfkit.tools.common.views.CToolBar;
-import com.compdfkit.tools.common.views.directory.CFileDirectoryDialog;
 import com.compdfkit.tools.common.views.pdfbota.adapter.CBotaViewPagerAdapter;
 import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 import com.compdfkit.tools.viewer.pdfoutline.CPDFOutlineFragment;
@@ -48,9 +31,7 @@ import com.compdfkit.tools.viewer.pdfthumbnail.CPDFThumbnailFragment;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 
 /**

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/manager/provider/CEditSelectionsProvider.java

@@ -18,7 +18,6 @@ import com.compdfkit.core.edit.CPDFEditArea;
 import com.compdfkit.core.edit.CPDFEditImageArea;
 import com.compdfkit.core.edit.CPDFEditTextArea;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.CToastUtil;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleType;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/docseditor/pdfpageeditinsert/CInsertPdfPageDialogFragment.java

@@ -10,7 +10,6 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/watermark/CWatermarkEditDialog.java

@@ -28,7 +28,6 @@ import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.utils.CFileUtils;
-import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.CPermissionUtil;
 import com.compdfkit.tools.common.utils.activitycontracts.CMultiplePermissionResultLauncher;
 import com.compdfkit.tools.common.utils.threadpools.SimpleBackgroundTask;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CPDFSelectDigitalSignatureDialog.java

@@ -19,7 +19,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.RadioGroup;
 
 import androidx.activity.result.ActivityResultLauncher;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CSelectSignTypeDialog.java

@@ -14,7 +14,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.RadioGroup;
 
 import androidx.annotation.NonNull;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/pdfproperties/pdfsign/CDigitalSignStylePreviewView.java

@@ -4,7 +4,6 @@ package com.compdfkit.tools.signature.pdfproperties.pdfsign;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
@@ -25,7 +24,6 @@ import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.CFileUtils;
 import com.compdfkit.tools.common.utils.date.CDateUtil;
 import com.compdfkit.tools.common.utils.glide.GlideApp;
-import com.compdfkit.tools.common.utils.image.CBitmapUtil;
 import com.compdfkit.tools.common.utils.image.CImageUtil;
 
 import java.io.File;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfdisplaysettings/CPDFDisplaySettingDialogFragment.java

@@ -10,8 +10,6 @@
 package com.compdfkit.tools.viewer.pdfdisplaysettings;
 
 
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,9 +23,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatRadioButton;
 import androidx.core.content.ContextCompat;
 
-import com.compdfkit.core.utils.ColorUtils;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.dialog.CDialogFragmentUtil;
 import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.CToolBar;
@@ -35,7 +31,6 @@ import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 import com.compdfkit.ui.reader.CPDFReaderView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.android.material.shape.MaterialShapeDrawable;
 
 public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
         implements RadioGroup.OnCheckedChangeListener, CompoundButton.OnCheckedChangeListener {

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfthumbnail/adpater/CPDFEditThumbnailListAdapter.java

@@ -8,7 +8,6 @@
  */
 package com.compdfkit.tools.viewer.pdfthumbnail.adpater;
 
-import android.content.res.Configuration;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
@@ -32,7 +31,6 @@ import com.bumptech.glide.request.transition.Transition;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.interfaces.COnSetPDFDisplayPageIndexListener;
-import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.glide.CPDFWrapper;
 import com.compdfkit.tools.docseditor.drag.CDefaultItemTouchHelpCallback;
 

ComPDFKit_Tools/src/main/res/values-zh-rCN/tools_strings.xml

@@ -86,7 +86,7 @@
     <string name="tools_annotations">注释</string>
 
     <string name="tools_copy">复制</string>
-    <string name="tools_annot_highlight">亮高</string>
+    <string name="tools_annot_highlight">高亮</string>
     <string name="tools_annot_underline">下划线</string>
     <string name="tools_context_menu_strikethrough">删除线</string>
     <string name="tools_annot_squiggly">波浪线</string>

ContentEditor/src/main/res/values/edit_themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Edit_Ctrl_Demo_Theme" parent="ComPDFKit.Theme.Light">
     </style>

DigitalSignature/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.Compdfkit_android_demo" parent="ComPDFKit.Theme.Light">
     </style>

DocsEditor/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.Compdfkit_android_demo" parent="ComPDFKit.Theme.Light">
 

Forms/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Form_Compdfkit_android_demo" parent="ComPDFKit.Theme.Light">
     </style>

PDFViewer/build.gradle

@@ -49,6 +49,8 @@ android {
 
 dependencies {
 
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

PDFViewer/src/main/java/com/compdfkit/pdfviewer/home/CHomeFunListAdapter.java

@@ -30,7 +30,7 @@ public class CHomeFunListAdapter extends CBaseQuickAdapter<HomeFunBean, CBaseQui
     public static final int ITEM_CONTENT = 1;
 
     @Override
-    protected CBaseQuickViewHolder onCreateViewHolder(Context context, ViewGroup parent, int viewType) {
+    public CBaseQuickViewHolder onCreateViewHolder(Context context, ViewGroup parent, int viewType) {
         if (viewType == ITEM_TITLE){
             return new CBaseQuickViewHolder(R.layout.rv_item_home_fun_item_title, parent);
         }else {
@@ -39,7 +39,7 @@ public class CHomeFunListAdapter extends CBaseQuickAdapter<HomeFunBean, CBaseQui
     }
 
     @Override
-    protected void onBindViewHolder(CBaseQuickViewHolder holder, int position, HomeFunBean item) {
+    public void onBindViewHolder(CBaseQuickViewHolder holder, int position, HomeFunBean item) {
         if (item.isHead()) {
             holder.setText(R.id.tv_title, item.getTitle());
         } else {

PDFViewer/src/main/java/com/compdfkit/pdfviewer/home/HomeActivity.java

@@ -15,6 +15,7 @@ import android.os.Bundle;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.compdfkit.core.document.CPDFSdk;
 import com.compdfkit.pdfviewer.R;
 import com.compdfkit.pdfviewer.databinding.ActivityHomeBinding;
 

PDFViewer/src/main/java/com/compdfkit/pdfviewer/home/HomeFunFragment.java

@@ -9,11 +9,7 @@
 
 package com.compdfkit.pdfviewer.home;
 
-import android.app.UiModeManager;
-import android.content.Context;
-import android.content.res.Configuration;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,8 +23,6 @@ import com.compdfkit.pdfviewer.R;
 import com.compdfkit.pdfviewer.databinding.FragmentHomeBinding;
 import com.compdfkit.pdfviewer.home.datas.FunDatas;
 import com.compdfkit.tools.common.pdf.CPDFDocumentActivity;
-import com.compdfkit.tools.common.utils.CToastUtil;
-import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.pdfview.CPreviewMode;
 import com.compdfkit.ui.utils.CPDFCommomUtils;
 

PDFViewer/src/main/java/com/compdfkit/pdfviewer/home/SelectWatermarkFunFragment.java

@@ -27,12 +27,12 @@ public class SelectWatermarkFunFragment extends CBasicBottomSheetDialogFragment
     }
 
     @Override
-    protected int layoutId() {
+    public int layoutId() {
         return R.layout.fragment_watermark_select_fun;
     }
 
     @Override
-    protected void onCreateView(View rootView) {
+    public void onCreateView(View rootView) {
         ConstraintLayout clAddWatermark = rootView.findViewById(R.id.cl_add_watermark);
         ConstraintLayout clRemoveWatermark = rootView.findViewById(R.id.cl_remove_watermark);
         clAddWatermark.setOnClickListener(addWatermarkClickListener);
@@ -40,7 +40,7 @@ public class SelectWatermarkFunFragment extends CBasicBottomSheetDialogFragment
     }
 
     @Override
-    protected void onViewCreate() {
+    public void onViewCreate() {
 
     }
 

Samples/src/main/java/com/compdfkit/samples/SampleApplication.java

@@ -18,9 +18,9 @@ import com.compdfkit.samples.samples.AnnotationTest;
 import com.compdfkit.samples.samples.BackgroundTest;
 import com.compdfkit.samples.samples.BatesTest;
 import com.compdfkit.samples.samples.BookmarkTest;
+import com.compdfkit.samples.samples.ContentEditorTest;
 import com.compdfkit.samples.samples.DigitalSignaturesTest;
 import com.compdfkit.samples.samples.DocumentInfoTest;
-import com.compdfkit.samples.samples.ContentEditorTest;
 import com.compdfkit.samples.samples.DocumentSaveExtraFontSubsetTest;
 import com.compdfkit.samples.samples.EncryptTest;
 import com.compdfkit.samples.samples.FlattenTest;

Samples/src/main/java/com/compdfkit/samples/SampleDetailActivity.java

@@ -24,7 +24,6 @@ import androidx.appcompat.widget.AppCompatTextView;
 
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.LoggingOutputListener;
-import com.google.android.material.button.MaterialButton;
 
 import java.io.File;
 

Samples/src/main/java/com/compdfkit/samples/samples/AnnotationReplyTest.java

@@ -11,7 +11,6 @@ import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 
 import java.io.File;

Samples/src/main/java/com/compdfkit/samples/samples/ContentEditorTest.java

@@ -1,12 +1,10 @@
 package com.compdfkit.samples.samples;
 
 
-import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.RectF;
-import android.media.ExifInterface;
 
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.edit.CPDFEditCharItem;

Samples/src/main/java/com/compdfkit/samples/samples/DocumentSaveExtraFontSubsetTest.java

@@ -1,7 +1,6 @@
 package com.compdfkit.samples.samples;
 
 
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.RectF;
@@ -9,13 +8,11 @@ import android.graphics.RectF;
 import com.compdfkit.core.common.CPDFDocumentException;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.edit.CPDFEditCharItem;
-import com.compdfkit.core.edit.CPDFEditImageArea;
 import com.compdfkit.core.edit.CPDFEditPage;
 import com.compdfkit.core.edit.CPDFEditTextArea;
 import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 import com.compdfkit.ui.reader.CPDFPageView;
 

Viewer/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Viewer_Ctrl_Demo_Theme" parent="ComPDFKit.Theme.Light">
     </style>