PDFTool(Android) - 选择保存目录时禁止保存到根目录

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfproperties/pdffreetext/CFreeTextStyleFragment.java

@@ -11,7 +11,6 @@ package com.compdfkit.tools.annotation.pdfproperties.pdffreetext;
 
 
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,9 +20,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
-import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.view.colorpicker.CColorPickerFragment;
 import com.compdfkit.tools.common.utils.view.colorpicker.widget.ColorPickerView;
 import com.compdfkit.tools.common.utils.view.sliderbar.CSliderBar;

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

@@ -30,7 +30,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.annotation.pdfproperties.pdfsignature.data.CSignatureDatas;
 import com.compdfkit.tools.common.utils.dialog.CImportImageDialogFragment;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/directory/CFileDirectoryDialog.java

@@ -91,14 +91,7 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
             callback = new OnBackPressedCallback(true) {
                 @Override
                 public void handleOnBackPressed() {
-                    String dir = titleAdapter.getLastFolder();
-                    if (!TextUtils.isEmpty(dir) && titleAdapter.list.size() != 1) {
-                        titleAdapter.toupperLevel();
-                        String upperLevelDir = titleAdapter.getLastFolder();
-                        refreshDirectories(upperLevelDir);
-                    } else {
-                        dismiss();
-                    }
+                   back();
                 }
             };
             componentDialog.getOnBackPressedDispatcher().addCallback(callback);
@@ -106,6 +99,17 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
         return dialog;
     }
 
+    private void back(){
+        String dir = titleAdapter.getLastFolder();
+        if (!TextUtils.isEmpty(dir) && titleAdapter.list.size() != 1) {
+            titleAdapter.toupperLevel();
+            String upperLevelDir = titleAdapter.getLastFolder();
+            refreshDirectories(upperLevelDir);
+        } else {
+            dismiss();
+        }
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -125,7 +129,6 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
             if (selectFolderListener != null) {
                 if (!TextUtils.isEmpty(dir)){
                     selectFolderListener.folder(dir);
-
                 }else {
                     selectFolderListener.folder(getNormalFolder());
                 }
@@ -136,9 +139,7 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
 
     @Override
     protected void onViewCreate() {
-        toolBar.setBackBtnClickListener(v -> {
-            dismiss();
-        });
+        toolBar.setBackBtnClickListener(v -> back());
         if (getArguments() != null) {
             String title = getArguments().getString(EXTRA_TITLE);
             if (!TextUtils.isEmpty(title)){
@@ -149,7 +150,6 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
                 btnConfirm.setText(confirmButtonTitle);
             }
         }
-
         initFolderTitleList();
         initDirectoriesList();
     }
@@ -201,6 +201,7 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
 
 
     private void refreshDirectories(String rootDir){
+        refreshConfirmBtn();
         new SimpleBackgroundTask<List<File>>(getContext()){
 
             @Override
@@ -219,6 +220,15 @@ public class CFileDirectoryDialog extends CBasicBottomSheetDialogFragment {
         return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
     }
 
+    private void refreshConfirmBtn(){
+        String dir = titleAdapter.getLastFolder();
+        if (!TextUtils.isEmpty(dir) && titleAdapter.list.size() != 1) {
+            btnConfirm.setEnabled(true);
+        } else {
+            btnConfirm.setEnabled(false);
+        }
+    }
+
     public void setSelectFolderListener(COnSelectFolderListener selectFolderListener) {
         this.selectFolderListener = selectFolderListener;
     }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/font/CFontStyleSpinnerAdapter.java

@@ -9,13 +9,10 @@ import android.widget.BaseAdapter;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
-import com.compdfkit.core.font.CPDFFontName;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.views.pdfproperties.font.bean.CFontStyleItemBean;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**

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

@@ -14,7 +14,6 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.core.edit.CPDFEditArea;
 import com.compdfkit.core.edit.CPDFEditImageArea;
 import com.compdfkit.core.edit.CPDFEditTextArea;

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

@@ -10,10 +10,6 @@
 package com.compdfkit.tools.common.views.pdfproperties.pdfstyle.manager.provider;
 
 
-import android.text.TextUtils;
-
-import com.compdfkit.core.annotation.CPDFTextAttribute;
-import com.compdfkit.core.font.CPDFFont;
 import com.compdfkit.tools.common.utils.CLog;
 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/views/pdfproperties/preview/CAnnotFreeTextPreviewView.java

@@ -12,7 +12,6 @@ package com.compdfkit.tools.common.views.pdfproperties.preview;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -24,7 +23,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 
 import com.compdfkit.core.annotation.CPDFTextAttribute;
-import com.compdfkit.core.font.CPDFFont;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/preview/CBasicAnnotPreviewView.java

@@ -20,7 +20,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.compdfkit.core.annotation.CPDFLineAnnotation;
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;
 
 abstract class CBasicAnnotPreviewView extends FrameLayout {

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/preview/CStylePreviewView.java

@@ -21,7 +21,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.compdfkit.core.annotation.CPDFLineAnnotation;
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.viewutils.CDimensUtils;
 import com.compdfkit.tools.common.views.pdfproperties.pdfstyle.CAnnotStyle;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/contenteditor/pdfproperties/CEditTextProperFragment.java

@@ -1,7 +1,6 @@
 package com.compdfkit.tools.contenteditor.pdfproperties;
 
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,7 +11,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 
 import com.compdfkit.core.annotation.CPDFTextAttribute;
-import com.compdfkit.core.font.CPDFFont;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.view.colorpicker.CColorPickerFragment;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdflistbox/CListBoxStyleFragment.java

@@ -18,7 +18,6 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.view.colorpicker.CColorPickerFragment;
 import com.compdfkit.tools.common.utils.view.sliderbar.CSliderBar;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdfpushbutton/CPushButtonStyleFragment.java

@@ -21,7 +21,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.view.colorpicker.CColorPickerFragment;
 import com.compdfkit.tools.common.utils.view.sliderbar.CSliderBar;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdftextfield/CTextFieldStyleFragment.java

@@ -23,7 +23,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.appcompat.widget.AppCompatImageView;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.view.colorpicker.CColorPickerFragment;
 import com.compdfkit.tools.common.utils.view.sliderbar.CSliderBar;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/watermark/pdfproperties/CWatermarkTextStyleFragment.java

@@ -11,7 +11,6 @@ package com.compdfkit.tools.security.watermark.pdfproperties;
 
 
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,7 +22,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.SwitchCompat;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.view.colorpicker.CColorPickerFragment;
 import com.compdfkit.tools.common.utils.view.colorpicker.widget.ColorPickerView;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/watermark/view/CWatermarkPageView.java

@@ -29,7 +29,6 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.watermark.CPDFWatermark;
 import com.compdfkit.tools.R;

ComPDFKit_Tools/src/main/res/drawable/tools_file_directory_done_btn_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:enterFadeDuration="200" android:exitFadeDuration="200">
+
+    <item android:state_enabled="false" android:drawable="@color/tools_icon_enable_color"/>
+    <item android:drawable="@color/tools_directory_item_title_color"/>
+
+</selector>

ComPDFKit_Tools/src/main/res/layout/tools_file_directory_dialog.xml

@@ -53,7 +53,7 @@
         android:id="@+id/btn_ok"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:background="@color/tools_directory_item_title_color"
+        android:background="@drawable/tools_file_directory_done_btn_selector"
         android:foreground="@drawable/tools_common_btn_corner_ripple"
         android:gravity="center"
         android:text="@string/tools_page_edit_toolbar_done"

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

@@ -19,12 +19,10 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.compdfkit.core.annotation.CPDFTextAttribute;
 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.CLog;
 import com.compdfkit.tools.common.views.pdfview.CPreviewMode;
 import com.compdfkit.ui.utils.CPDFCommomUtils;