PDFTools(Android) - 1.修改包名、工程名称、应用名称

annotation-ctrl-demo/build.gradle

@@ -3,11 +3,11 @@ plugins {
 }
 
 android {
-    namespace 'com.compdfkit.demo.annotation'
+    namespace 'com.compdfkit.annotations'
     compileSdk rootProject.ext.android.COMPILESDK
     resourcePrefix 'annotation_'
     defaultConfig {
-        applicationId "com.compdfkit.demo.annotation"
+        applicationId "com.compdfkit.annotations"
         minSdk rootProject.ext.android.MINSDK
         targetSdk rootProject.ext.android.TARGETSDK
         versionCode rootProject.ext.android.VERSIONCODE
@@ -34,8 +34,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation project(':ComPDFKit_Tools')
 
-    implementation project(':compdfkit-tools')
     implementation 'pub.devrel:easypermissions:3.0.0'
 
 }

annotation-ctrl-demo/src/main/java/com/compdfkit/demo/annotation/CAnnotSampleScreenManager.java

@@ -7,15 +7,15 @@
  * This notice may not be removed from this file.
  */
 
-package com.compdfkit.demo.annotation;
+package com.compdfkit.annotations;
 
 
 import android.view.View;
 
 import androidx.constraintlayout.widget.ConstraintSet;
 
+import com.compdfkit.annotations.databinding.AnnotationPdfSampleActivityBinding;
 import com.compdfkit.core.annotation.CPDFAnnotation;
-import com.compdfkit.demo.annotation.databinding.AnnotationPdfSampleActivityBinding;
 import com.compdfkit.tools.common.utils.animation.CFillScreenManager;
 import com.compdfkit.tools.common.utils.animation.ConstraintSetUtils;
 import com.compdfkit.tools.common.views.pdfproperties.CAnnotationType;

annotation-ctrl-demo/src/main/java/com/compdfkit/demo/annotation/PDFAnnotationSampleActivity.java

@@ -1,4 +1,4 @@
-package com.compdfkit.demo.annotation;
+package com.compdfkit.annotations;
 
 import android.Manifest;
 import android.content.Intent;
@@ -10,8 +10,10 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 
+import com.compdfkit.annotations.CAnnotSampleScreenManager;
+import com.compdfkit.annotations.R;
+import com.compdfkit.annotations.databinding.AnnotationPdfSampleActivityBinding;
 import com.compdfkit.core.annotation.CPDFAnnotation;
-import com.compdfkit.demo.annotation.databinding.AnnotationPdfSampleActivityBinding;
 import com.compdfkit.tools.common.activity.CBasicActivity;
 import com.compdfkit.tools.common.utils.CFileUtils;
 import com.compdfkit.tools.common.utils.dialog.CAlertDialog;

annotation-ctrl-demo/src/main/res/layout/annotation_pdf_sample_activity.xml

@@ -62,7 +62,7 @@
         tools:visibility="visible"
         />
 
-    <com.compdfkit.tools.common.views.pdfannotationbar.CAnnotationToolbar
+    <com.compdfkit.tools.annotation.pdfannotationbar.CAnnotationToolbar
         android:id="@+id/annotation_tool_bar"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"

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

@@ -0,0 +1,4 @@
+<resources>
+    <string name="annotation_app_name">Annotations_ComPDFKit</string>
+    <string name="annotation_title">Annotation</string>
+</resources>

compdfkit-tools/src/main/java/com/compdfkit/tools/common/views/pdfannotationbar/CAnnotationToolbar.java

@@ -7,7 +7,7 @@
  * This notice may not be removed from this file.
  */
 
-package com.compdfkit.tools.common.views.pdfannotationbar;
+package com.compdfkit.tools.annotation.pdfannotationbar;
 
 
 import android.content.Context;
@@ -29,11 +29,11 @@ import com.compdfkit.core.undo.CPDFUndoManager;
 import com.compdfkit.core.undo.exception.CPDFRedoFailedException;
 import com.compdfkit.core.undo.exception.CPDFUndoFailedException;
 import com.compdfkit.tools.R;
+import com.compdfkit.tools.annotation.pdfannotationbar.adapter.CPDFAnnotationToolListAdapter;
+import com.compdfkit.tools.annotation.pdfannotationbar.bean.CAnnotToolBean;
+import com.compdfkit.tools.annotation.pdfannotationbar.data.CAnnotationToolDatas;
 import com.compdfkit.tools.common.interfaces.COnAnnotationChangeListener;
 import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
-import com.compdfkit.tools.common.views.pdfannotationbar.adapter.CPDFAnnotationToolListAdapter;
-import com.compdfkit.tools.common.views.pdfannotationbar.bean.CAnnotToolBean;
-import com.compdfkit.tools.common.views.pdfannotationbar.data.CAnnotationToolDatas;
 import com.compdfkit.tools.common.views.pdfproperties.CAnnotationType;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CBasicOnStyleChangeListener;

compdfkit-tools/src/main/java/com/compdfkit/tools/common/views/pdfannotationbar/adapter/CPDFAnnotationToolListAdapter.java

@@ -7,7 +7,7 @@
  * This notice may not be removed from this file.
  */
 
-package com.compdfkit.tools.common.views.pdfannotationbar.adapter;
+package com.compdfkit.tools.annotation.pdfannotationbar.adapter;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -20,9 +20,9 @@ import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 
 import com.compdfkit.tools.R;
+import com.compdfkit.tools.annotation.pdfannotationbar.bean.CAnnotToolBean;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;
-import com.compdfkit.tools.common.views.pdfannotationbar.bean.CAnnotToolBean;
 import com.compdfkit.tools.common.views.pdfproperties.CAnnotationType;
 
 import java.util.List;

compdfkit-tools/src/main/java/com/compdfkit/tools/common/views/pdfannotationbar/bean/CAnnotToolBean.java

@@ -7,7 +7,7 @@
  * This notice may not be removed from this file.
  */
 
-package com.compdfkit.tools.common.views.pdfannotationbar.bean;
+package com.compdfkit.tools.annotation.pdfannotationbar.bean;
 
 
 import android.graphics.Color;

compdfkit-tools/src/main/java/com/compdfkit/tools/common/views/pdfannotationbar/data/CAnnotationToolDatas.java

@@ -1,8 +1,8 @@
-package com.compdfkit.tools.common.views.pdfannotationbar.data;
+package com.compdfkit.tools.annotation.pdfannotationbar.data;
 
 
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.views.pdfannotationbar.bean.CAnnotToolBean;
+import com.compdfkit.tools.annotation.pdfannotationbar.bean.CAnnotToolBean;
 import com.compdfkit.tools.common.views.pdfproperties.CAnnotationType;
 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/common/activity/CBasicActivity.java

@@ -33,7 +33,6 @@ import com.compdfkit.tools.common.contextmenu.CPDFContextMenuHelper;
 import com.compdfkit.tools.common.contextmenu.impl.CEditImageContextMenuView;
 import com.compdfkit.tools.common.contextmenu.impl.CEditTextContextMenuView;
 import com.compdfkit.tools.common.utils.CFileUtils;
-import com.compdfkit.tools.pageedit.CPDFPageEditDialogFragment;
 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;
@@ -41,6 +40,7 @@ import com.compdfkit.tools.common.views.pdfview.CPreviewMode;
 import com.compdfkit.tools.form.pdfproperties.pdfcombobox.CustomComboBoxWidgetImpl;
 import com.compdfkit.tools.form.pdfproperties.pdflistbox.CustomListBoxWidgetImpl;
 import com.compdfkit.tools.form.pdfproperties.pdfsign.CustomSignatureWidgetImpl;
+import com.compdfkit.tools.pageedit.pdfpageedit.CPDFPageEditDialogFragment;
 import com.compdfkit.tools.viewer.contextmenu.CopyContextMenuView;
 import com.compdfkit.tools.viewer.pdfdisplaysettings.CPDFDisplaySettingDialogFragment;
 import com.compdfkit.tools.viewer.pdfinfo.CPDFDocumentInfoDialogFragment;
@@ -69,7 +69,6 @@ public class CBasicActivity extends AppCompatActivity {
         return true;
     }
 
-
     protected void resetContextMenu(CPDFViewCtrl pdfView, CPreviewMode mode) {
         switch (mode) {
             case Viewer:
@@ -110,11 +109,11 @@ public class CBasicActivity extends AppCompatActivity {
                 .setMarkup(CStyleType.ANNOT_SQUIGGLY, defaultColor, 255)
                 .setMarkup(CStyleType.ANNOT_STRIKEOUT, defaultColor, 255)
                 .setShape(CStyleType.ANNOT_SQUARE, defaultColor, 255, Color.TRANSPARENT, 0, 10, null)
-                .setShape(CStyleType.ANNOT_CIRCLE, defaultColor, 255, defaultColor, 255, 5, null)
+                .setShape(CStyleType.ANNOT_CIRCLE, defaultColor, 255, Color.TRANSPARENT, 255, 5, null)
                 .setShape(CStyleType.ANNOT_LINE, defaultColor, 255, defaultColor, 255, 5, null)
                 .setShapeArrow(defaultColor, 255, defaultColor, 255, 5, CPDFLineAnnotation.LineType.LINETYPE_NONE, CPDFLineAnnotation.LineType.LINETYPE_ARROW)
                 .setInkAttribute(defaultColor, 255, 10, 10)
-                .setFreeText(Color.BLACK, 255, 50)
+                .setFreeText(defaultColor, 255, 50)
                 .init(pdfView);
     }