PDFSamples(Android) - 1.模块名整理

ComPDFKit_Tools/build.gradle

@@ -40,8 +40,8 @@ android {
 dependencies {
 
     api fileTree(include: ['*.jar'], dir: 'libs')
-    api project(path:':compdfkit-repo:compdfkit')
-    api project(path:':compdfkit-repo:compdfkit-ui')
+    api project(path:':Compdfkit-repo:compdfkit')
+    api project(path:':Compdfkit-repo:compdfkit-ui')
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/activity/CBasicActivity.java

@@ -41,7 +41,7 @@ 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 com.compdfkit.tools.common.views.pdfview.CPreviewMode;
-import com.compdfkit.tools.contenteditor.CPDFEditType;
+import com.compdfkit.tools.contenteditor.CPDFEditPage;
 import com.compdfkit.tools.docseditor.pdfpageedit.CPDFPageEditDialogFragment;
 import com.compdfkit.tools.forms.pdfproperties.pdfcombobox.CustomComboBoxWidgetImpl;
 import com.compdfkit.tools.forms.pdfproperties.pdflistbox.CustomListBoxWidgetImpl;
@@ -189,7 +189,7 @@ public class CBasicActivity extends AppCompatActivity {
         });
     }
 
-    protected @CPDFEditType int curEditMode = CPDFEditType.EDIT_CLOSE;
+    protected int curEditMode = CPDFEditPage.LoadUnknown;
 
 
     protected void showPageEdit(CPDFViewCtrl pdfView, boolean enterEdit, CPDFPageEditDialogFragment.OnBackLisener backListener) {

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

@@ -21,7 +21,6 @@ import android.view.View;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.compdfkit.core.edit.CPDFEditPage;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.contextmenu.CPDFContextMenuHelper;
 import com.compdfkit.tools.common.contextmenu.interfaces.ContextMenuEditTextProvider;
@@ -32,7 +31,7 @@ import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleDialogFragment;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleType;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.manager.CStyleManager;
-import com.compdfkit.tools.contenteditor.CPDFEditType;
+import com.compdfkit.tools.contenteditor.CPDFEditPage;
 import com.compdfkit.ui.edit.CPDFEditSelections;
 import com.compdfkit.ui.edit.CPDFEditTextSelections;
 import com.compdfkit.ui.reader.CPDFPageView;
@@ -88,12 +87,12 @@ public class CEditTextContextMenuView implements ContextMenuEditTextProvider {
         int lines = (!TextUtils.isEmpty(text) && isEditAreaValid == true) == true ? 2 : 1;
         menuView.setLineNumber(lines);
 
-        if (type == CPDFEditType.EDIT_TEXT ) {
-            menuView.addItem(R.string.tools_context_menu_add_text, 0,v -> {
+        if (type == CPDFEditPage.LoadText) {
+            menuView.addItem(R.string.tools_context_menu_add_text, 0, v -> {
                 pageView.addEditTextArea(point);
             });
         }
-        if (type == CPDFEditType.EDIT_IMAGE) {
+        if (type == CPDFEditPage.LoadImage) {
             menuView.addItem(R.string.tools_context_menu_add_image, 0, v -> {
                 helper.getReaderView().setAddImagePoint(point);
                 helper.getReaderView().setAddImagePage(pageView.getPageNum());
@@ -112,7 +111,7 @@ public class CEditTextContextMenuView implements ContextMenuEditTextProvider {
                 helper.dismissContextMenu();
             });
         } else if (!TextUtils.isEmpty(text) && isEditAreaValid == true) {
-            menuView.addItem(R.string.tools_context_menu_select_paste, 0,v -> {
+            menuView.addItem(R.string.tools_context_menu_select_paste, 0, v -> {
                 pageView.pasteEditTextArea(point, pageView.getCopyTextAreaWidth(), pageView.getCopyTextAreaHeight(), false);
                 helper.dismissContextMenu();
             });
@@ -120,7 +119,7 @@ public class CEditTextContextMenuView implements ContextMenuEditTextProvider {
                 pageView.pasteEditTextArea(point, pageView.getCopyTextAreaWidth(), pageView.getCopyTextAreaHeight(), true);
                 helper.dismissContextMenu();
             });
-        } else if (TextUtils.isEmpty(text) && pageView.getAreaInfoType() == CPDFEditPage.EditAreaTypeImage) {
+        } else if (TextUtils.isEmpty(text) && pageView.getAreaInfoType() == CPDFEditPage.LoadImage) {
             menuView.addItem(R.string.tools_context_menu_paste, 0, v -> {
                 pageView.pasteEditImageArea(point, pageView.getCopyTextAreaWidth(), pageView.getCopyTextAreaHeight());
                 helper.dismissContextMenu();

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/contenteditor/CEditToolbar.java

@@ -105,11 +105,11 @@ public class CEditToolbar extends RelativeLayout implements View.OnClickListener
             menuShowListener.dismissContextMenu();
         }
         if (ivEditText.isSelected() && !ivEditImage.isSelected()) {
-            pdfView.getCPdfReaderView().getEditManager().changeEditType(CPDFEditType.EDIT_TEXT);
+            pdfView.getCPdfReaderView().getEditManager().changeEditType(CPDFEditPage.LoadText);
         } else if (!ivEditText.isSelected() && ivEditImage.isSelected()) {
-            pdfView.getCPdfReaderView().getEditManager().changeEditType(CPDFEditType.EDIT_IMAGE);
+            pdfView.getCPdfReaderView().getEditManager().changeEditType(CPDFEditPage.LoadImage);
         } else if (!ivEditText.isSelected() && !ivEditImage.isSelected()) {
-            pdfView.getCPdfReaderView().getEditManager().changeEditType(CPDFEditType.EDIT_TEXT_IMAGE);
+            pdfView.getCPdfReaderView().getEditManager().changeEditType(CPDFEditPage.LoadTextImage);
         }
     }
 
@@ -167,13 +167,13 @@ public class CEditToolbar extends RelativeLayout implements View.OnClickListener
                     return;
                 }
                 int type = pdfView.getCPdfReaderView().getLoadType();
-                if (type == CPDFEditType.EDIT_TEXT) {
+                if (type == CPDFEditPage.LoadText) {
                     ivEditText.setSelected(true);
                     ivEditImage.setSelected(false);
-                } else if (type == CPDFEditType.EDIT_IMAGE) {
+                } else if (type == CPDFEditPage.LoadImage) {
                     ivEditText.setSelected(false);
                     ivEditImage.setSelected(true);
-                } else if (type == CPDFEditType.EDIT_TEXT_IMAGE) {
+                } else if (type == CPDFEditPage.LoadTextImage) {
                     ivEditText.setSelected(false);
                     ivEditImage.setSelected(false);
                 }
@@ -196,7 +196,7 @@ public class CEditToolbar extends RelativeLayout implements View.OnClickListener
             }
         });
         if (beginedit) {
-            editManager.beginEdit(CPDFEditType.EDIT_TEXT_IMAGE);
+            editManager.beginEdit(CPDFEditPage.LoadTextImage);
         }
     }
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/contenteditor/CPDFEditType.java

@@ -1,6 +1,6 @@
 /**
  * Copyright © 2014-2023 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.
@@ -9,26 +9,13 @@
 
 package com.compdfkit.tools.contenteditor;
 
-import androidx.annotation.IntDef;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+public class CPDFEditPage {
+    public static final int LoadUnknown = 0;
 
+    public static final int LoadText = com.compdfkit.core.edit.CPDFEditPage.LoadText;
 
-@IntDef({
-        CPDFEditType.EDIT_CLOSE,
-        CPDFEditType.EDIT_TEXT,
-        CPDFEditType.EDIT_IMAGE,
-        CPDFEditType.EDIT_TEXT_IMAGE})
-@Retention(RetentionPolicy.SOURCE)
-public @interface CPDFEditType {
-
-    int EDIT_CLOSE = 0;
-
-    int EDIT_TEXT = 1;
-
-    int EDIT_IMAGE = 2;
-
-    int EDIT_TEXT_IMAGE = 3;
+    public static final int LoadImage = com.compdfkit.core.edit.CPDFEditPage.LoadImage;
 
+    public static final int LoadTextImage = LoadText | LoadImage;
 }

ContentEditor/src/main/java/com/compdfkit/contenteditor/PDFEditSampleActivity.java

@@ -45,7 +45,7 @@ import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleDialogFragm
 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.CPreviewMode;
-import com.compdfkit.tools.contenteditor.CPDFEditType;
+import com.compdfkit.tools.contenteditor.CPDFEditPage;
 import com.compdfkit.tools.viewer.pdfsearch.CSearchResultDialogFragment;
 import com.compdfkit.ui.reader.CPDFPageView;
 import com.compdfkit.ui.reader.CPDFReaderView;
@@ -191,7 +191,7 @@ public class PDFEditSampleActivity extends CBasicActivity {
             binding.pdfView.setViewMode(CPDFReaderView.ViewMode.PDFEDIT);
             CPDFEditManager editManager = binding.pdfView.getCPdfReaderView().getEditManager();
             if (!editManager.isEditMode()) {
-                editManager.beginEdit(CPDFEditType.EDIT_TEXT_IMAGE);
+                editManager.beginEdit(CPDFEditPage.LoadTextImage);
             }
         }
     }

PDFViewer/src/main/java/com/compdfkit/pdfviewer/MainActivity.java

@@ -47,7 +47,7 @@ import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CStyleDialogFragm
 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.CPreviewMode;
-import com.compdfkit.tools.contenteditor.CPDFEditType;
+import com.compdfkit.tools.contenteditor.CPDFEditPage;
 import com.compdfkit.tools.viewer.pdfsearch.CSearchResultDialogFragment;
 import com.compdfkit.ui.contextmenu.IContextMenuShowListener;
 import com.compdfkit.ui.proxy.form.CPDFComboboxWidgetImpl;
@@ -175,7 +175,7 @@ public class MainActivity extends CBasicActivity {
         if (mode == CPreviewMode.Edit) {
             binding.pdfView.getCPdfReaderView().setViewMode(CPDFReaderView.ViewMode.PDFEDIT);
             if (editManager != null && !editManager.isEditMode()) {
-                editManager.beginEdit(CPDFEditType.EDIT_TEXT_IMAGE);
+                editManager.beginEdit(CPDFEditPage.LoadTextImage);
             }
             if (!hasPermissions(STORAGE_PERMISSIONS)){
                 EasyPermissions.requestPermissions(this, "request permission", 1234, STORAGE_PERMISSIONS);
@@ -209,7 +209,7 @@ public class MainActivity extends CBasicActivity {
             if (binding.pdfView.getCPdfReaderView().getEditManager().isEditMode()){
                 curEditMode = binding.pdfView.getCPdfReaderView().getLoadType();
             }else {
-                curEditMode = CPDFEditType.EDIT_CLOSE;
+                curEditMode = CPDFEditPage.LoadUnknown;
             }
             binding.pdfView.exitEditMode();
             binding.pdfToolBar.setVisibility(View.GONE);

samples/build.gradle

@@ -33,8 +33,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    api project(path:':compdfkit-repo:compdfkit')
-    api project(path:':compdfkit-repo:compdfkit-ui')
+    api project(path:':Compdfkit-repo:compdfkit')
+    api project(path:':Compdfkit-repo:compdfkit-ui')
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
 

samples/src/main/java/com/compdfkit/samples/samples/AnnotationTest.java

@@ -14,7 +14,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.text.TextUtils;
 
 import com.compdfkit.core.annotation.CPDFAnnotation;
 import com.compdfkit.core.annotation.CPDFBorderStyle;
@@ -33,17 +32,11 @@ import com.compdfkit.core.document.CPDFDestination;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.document.action.CPDFGoToAction;
 import com.compdfkit.core.page.CPDFPage;
-import com.compdfkit.core.page.CPDFTextPage;
-import com.compdfkit.core.page.CPDFTextRange;
-import com.compdfkit.core.page.CPDFTextSearcher;
-import com.compdfkit.core.page.CPDFTextSelection;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
 import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
-import com.compdfkit.ui.reader.CPDFReaderView;
-import com.compdfkit.ui.textsearch.ITextSearcher;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -369,14 +362,12 @@ public class AnnotationTest extends PDFSamples {
     private void addHighlight(CPDFDocument document) {
         //Also search for the `Page` keyword in the 3rd of the document
         CPDFPage pdfPage = document.pageAtIndex(3);
-        CPDFTextPage pdfTextPage = pdfPage.getTextPage();
         //Then, add a highlight annotation for the specific area.
         RectF annotRect = new RectF(315, 258, 372, 288);
         annotRect = pdfPage.convertRectToPage(false, pdfPage.getSize().width(), pdfPage.getSize().height(), annotRect);
         CPDFHighlightAnnotation highlightAnnotation = (CPDFHighlightAnnotation) pdfPage.addAnnot(CPDFAnnotation.Type.HIGHLIGHT);
         highlightAnnotation.setColor(Color.YELLOW);
         highlightAnnotation.setAlpha((255 / 2));
-
         highlightAnnotation.setQuadRects(new RectF[]{annotRect});
         highlightAnnotation.setMarkedText("Page");
         highlightAnnotation.setRect(annotRect);

settings.gradle

@@ -20,6 +20,6 @@ include ':ContentEditor'
 include ':Forms'
 include ':DocsEditor'
 include ':ComPDFKit_Tools'
-include ':compdfkit-repo:compdfkit'
-include ':compdfkit-repo:compdfkit-ui'
-include ':samples'
+include ':Compdfkit-repo:compdfkit'
+include ':Compdfkit-repo:compdfkit-ui'
+include ':Samples'