PDFTool(Android) - CPDFDocumentFrament 主题适配 - 安全

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/encryption/CDocumentEncryptionDialog.java

@@ -113,11 +113,6 @@ public class CDocumentEncryptionDialog extends CBasicBottomSheetDialogFragment i
     }
 
 
-    @Override
-    protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_FillScreen;
-    }
-
     @Override
     protected boolean fullScreen() {
         return true;

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

@@ -2,6 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="match_parent">
 
 
@@ -23,7 +25,7 @@
             android:background="@drawable/tools_properties_signature_add_sign"
             android:minWidth="70dp"
             android:text="@string/tools_page_edit_toolbar_done"
-            android:textColor="@color/tools_color_accent"
+            android:textColor="?attr/colorAccent"
             android:textSize="16sp" />
 
     </com.compdfkit.tools.common.views.CToolBar>
@@ -49,7 +51,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_password_to_open_the_document"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -84,12 +86,13 @@
                 android:layout_marginTop="8dp"
                 android:background="@null"
                 android:enabled="false"
+                android:textColor="?android:attr/textColorPrimary"
                 android:gravity="center_vertical"
                 android:hint="@string/tools_set_password"
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingStart="8dp"
-                android:textColorHint="@color/tools_text_color_hint"
+                android:textColorHint="?attr/hintTextColor"
                 android:textSize="13sp"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintEnd_toStartOf="@id/iv_user_pwd_show"
@@ -105,6 +108,7 @@
                 android:padding="2dp"
                 app:layout_constraintBottom_toBottomOf="@id/et_user_password"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintTop_toTopOf="@id/et_user_password"
                 app:srcCompat="@drawable/tools_btn_eyes_visible_selector" />
 
@@ -113,7 +117,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
                 android:layout_marginTop="8dp"
-                android:background="@color/tools_reader_setting_head_bg_color"
+                android:background="?attr/compdfkit_HeadItem_BackgroundColor"
                 app:layout_constraintTop_toBottomOf="@id/et_user_password" />
 
 
@@ -124,7 +128,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_owner_password"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/line2" />
@@ -157,13 +161,14 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
                 android:background="@null"
+                android:textColor="?android:attr/textColorPrimary"
                 android:enabled="false"
+                android:textColorHint="?attr/hintTextColor"
                 android:gravity="center_vertical"
                 android:hint="@string/tools_set_password"
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingStart="8dp"
-                android:textColorHint="@color/tools_text_color_hint"
                 android:textSize="13sp"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintEnd_toStartOf="@id/iv_owner_pwd_show"
@@ -188,6 +193,7 @@
                 android:layout_height="35dp"
                 android:layout_marginEnd="24dp"
                 android:padding="2dp"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="@id/et_owner_password"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/et_owner_password"
@@ -232,7 +238,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
                 android:layout_marginTop="8dp"
-                android:background="@color/tools_reader_setting_head_bg_color"
+                android:background="?attr/compdfkit_HeadItem_BackgroundColor"
                 android:gravity="center_vertical"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
@@ -248,7 +254,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_encryption_level"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_owner_functions" />
 
@@ -270,7 +276,7 @@
                     android:layout_width="wrap_content"
                     android:minWidth="170dp"
                     android:layout_height="match_parent"
-                    android:dropDownSelector="@color/tools_color_primary"
+                    android:dropDownSelector="?attr/colorPrimary"
                     android:popupBackground="@drawable/tools_common_window_bg" />
 
             </LinearLayout>