PDFTool(Android) - CPDFDocumentFrament 主题适配 - 搜索、BOTA

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

@@ -11,6 +11,7 @@ package com.compdfkit.tools.common.utils.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -59,7 +60,11 @@ public class CEditDialog extends DialogFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, R.style.tools_dialog_theme);
+        int themeId = CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.dialogTheme);
+        if (themeId == 0){
+            themeId = R.style.ComPDFKit_Theme_Dialog;
+        }
+        setStyle(STYLE_NO_TITLE, themeId);
     }
 
     @Override
@@ -70,9 +75,6 @@ public class CEditDialog extends DialogFragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (getDialog() != null && getDialog().getWindow() != null) {
-            getDialog().getWindow().setBackgroundDrawableResource(R.drawable.tools_dialog_background);
-        }
         View rootView = inflater.inflate(R.layout.tools_bota_bookmark_input_dialog, container, false);
         editText = rootView.findViewById(R.id.tv_message);
         tvTitle = rootView.findViewById(R.id.tv_title);

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

@@ -84,7 +84,8 @@ public class CViewUtils {
     }
 
     public static void applyViewBackground(View view) {
-        applyViewBackground(view, ContextCompat.getColor(view.getContext(), R.color.tools_color_primary));
+
+        applyViewBackground(view, getThemeAttrData(view.getContext().getTheme(), android.R.attr.colorPrimary));
     }
 
     public static void showKeyboard(View view) {
@@ -125,7 +126,7 @@ public class CViewUtils {
     public static int getThemeAttrResourceId(Resources.Theme theme, int resId){
         try {
             TypedValue typedValue = new TypedValue();
-            boolean result = theme.resolveAttribute(R.attr.compdfkit_BottomSheetDialog_Transparent_Theme, typedValue, true );
+            boolean result = theme.resolveAttribute(resId, typedValue, true );
             if (result){
                 return typedValue.resourceId;
             }else {
@@ -135,4 +136,18 @@ public class CViewUtils {
             return 0;
         }
     }
+    public static int getThemeAttrData(Resources.Theme theme, int resId){
+        try {
+            TypedValue typedValue = new TypedValue();
+            boolean result = theme.resolveAttribute(resId, typedValue, true);
+            int colorPrimary = typedValue.data;
+            if (result){
+                return colorPrimary;
+            }else {
+                return 0;
+            }
+        }catch (Exception e){
+            return 0;
+        }
+    }
 }

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

@@ -64,11 +64,6 @@ public class CPDFBotaDialogFragment extends CBasicBottomSheetDialogFragment {
         this.tabs.add(tab);
     }
 
-    @Override
-    protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
-    }
-
     @Override
     protected float dimAmount() {
         return CViewUtils.isLandScape(getContext()) ? 0.2F : 0F;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfoutline/adapter/COutlineListAdapter.java

@@ -20,6 +20,7 @@ import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.interfaces.COnSetPDFDisplayPageIndexListener;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.pdfview.CPDFViewCtrl;
 import com.compdfkit.tools.viewer.pdfoutline.bean.COutlineData;
 import com.compdfkit.tools.viewer.pdfoutline.data.COutlineDatas;
@@ -67,7 +68,8 @@ public class COutlineListAdapter extends CBaseQuickAdapter<COutlineData, CBaseQu
         holder.getView(R.id.iv_outline_item_arrow).setLayoutParams(layoutParams);
         holder.getView(R.id.iv_outline_item_arrow).setVisibility( item.childOutlineIsEmpty() ? View.INVISIBLE : View.VISIBLE);
         holder.setImageResource(R.id.iv_outline_item_arrow, item.isExpand() ? R.drawable.tools_ic_arrow_down : R.drawable.tools_ic_right);
-        holder.setBackgroundColor(R.id.cl_root, ContextCompat.getColor(holder.itemView.getContext(), item.getLevel() == 1 ? R.color.tools_reader_setting_head_bg_color : R.color.tools_color_background));
+        holder.setBackgroundColor(R.id.cl_root, CViewUtils.getThemeAttrData(holder.itemView.getContext().getTheme(),
+                item.getLevel() == 1 ? R.attr.compdfkit_HeadItem_BackgroundColor : android.R.attr.colorBackground));
         holder.itemView.setOnClickListener(v -> {
             // Check if the child outline of the item is empty
             // If the child outline is empty and an outlineClickListener is set, display the page

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfsearch/CSearchSettingsDialog.java

@@ -21,6 +21,7 @@ import androidx.appcompat.widget.AppCompatTextView;
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment;
 import com.compdfkit.tools.common.interfaces.COnDialogDismissListener;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.pdfproperties.CPropertiesSwitchView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
@@ -49,7 +50,7 @@ public class CSearchSettingsDialog extends CBasicBottomSheetDialogFragment {
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_TopCorners;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Transparent_Theme);
     }
 
     @Override

ComPDFKit_Tools/src/main/res/color/tools_normal_btn_text_color.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/tools_text_color_disable" android:state_enabled="false"/>
-    <item android:color="@color/tools_color_accent" android:state_enabled="true"/>
-    <item android:color="@color/tools_color_accent"/>
+    <item android:color="?attr/colorAccent" android:state_enabled="true"/>
+    <item android:color="?attr/colorAccent"/>
 </selector>

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

@@ -5,7 +5,7 @@
     <item android:id="@android:id/mask">
         <shape>
             <corners android:radius="6dp"/>
-            <solid android:color="@color/tools_color_background"/>
+            <solid android:color="?android:attr/colorBackground"/>
         </shape>
     </item>
 </ripple>

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

@@ -3,7 +3,7 @@
     android:color="@color/tools_ripple_color">
     <item android:id="@android:id/mask">
         <shape android:shape="oval">
-            <solid android:color="@color/tools_color_background" />
+            <solid android:color="?android:attr/colorBackground" />
         </shape>
     </item>
 </ripple>

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <size android:width="2dp" />
-    <solid android:color="@color/tools_color_accent" />
+    <solid android:color="?attr/colorAccent" />
 </shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:color="@color/tools_color_accent" android:width="1dp"
+    <stroke android:color="?attr/colorAccent" android:width="1dp"
         />
     <corners android:radius="2dp"/>
 </shape>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:background="?android:attr/colorBackground"
         android:layout_width="@dimen/tools_dialog_layout_width"
         android:layout_height="wrap_content"
         android:paddingTop="24dp"
@@ -24,7 +24,7 @@
             android:layout_marginHorizontal="24dp"
             android:gravity="center_vertical|start"
             android:text="@string/tools_add_bookmarks"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -35,14 +35,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
-            android:backgroundTint="@color/tools_color_accent"
+            android:backgroundTint="?attr/colorAccent"
             android:gravity="center_vertical"
             android:layout_marginEnd="24dp"
             android:textSize="13sp"
             android:maxLines="1"
             android:minHeight="45dp"
-            android:textColor="@color/tools_text_color_primary"
-            android:textColorHint="@color/tools_text_color_hint"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textColorHint="?android:attr/textColorHint"
             android:textCursorDrawable="@drawable/tools_normal_et_cursor"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -62,14 +62,12 @@
             <Button
                 android:id="@+id/btn_cancel"
                 style="@style/tools_dialog_button_style"
-                android:text="@string/tools_cancel"
-                tools:textColor="@android:color/black" />
+                android:text="@string/tools_cancel" />
 
             <Button
                 android:id="@+id/btn_add"
                 style="@style/tools_dialog_button_style"
-                android:text="@string/tools_okay"
-                tools:textColor="@android:color/black" />
+                android:text="@string/tools_okay" />
 
         </LinearLayout>
 

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

@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
-            android:background="@color/tools_color_background"
+            android:background="?android:attr/colorBackground"
             >
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -31,7 +31,7 @@
                 android:textSize="18sp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_no_bookmarks"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -52,7 +52,7 @@
             android:contentDescription="add bookmark"
             android:src="@drawable/tools_ic_add"
             app:tint="@android:color/white"
-            android:backgroundTint="@color/tools_color_accent"
+            android:backgroundTint="?attr/colorAccent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 

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

@@ -5,6 +5,7 @@
     android:id="@+id/cl_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    tools:background="?android:attr/colorBackground"
     android:foreground="@drawable/tools_common_btn_rectangle_ripple">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -14,7 +15,7 @@
         android:layout_marginVertical="16dp"
         android:layout_marginStart="16dp"
         android:maxLines="1"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_bookmark_page"
@@ -34,7 +35,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_more_vertical"
-        app:tint="@color/tools_on_primary" />
+        app:tint="?attr/colorOnPrimary" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_bookmark_page"
@@ -42,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:maxLines="1"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/iv_bookmark_more"
         app:layout_constraintTop_toTopOf="parent"
@@ -51,7 +52,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/tools_control_line_color"
+        android:background="?attr/dividerColor"
         app:layout_constraintBottom_toBottomOf="parent"
         />
 

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

@@ -21,11 +21,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="4dp"
-        app:tabTextAppearance="@style/tools_tab_layout_text_style"
-        android:background="@color/tools_color_primary"
-        app:tabSelectedTextColor="@color/tools_color_accent"
-        app:tabTextColor="@color/tools_text_color_primary"
-        app:tabIndicatorColor="@color/tools_color_accent"
+        android:background="?android:attr/colorPrimary"
+        style="?attr/compdfkit_tabLayoutStyle"
         app:layout_constraintTop_toBottomOf="@id/tool_bar" />
 
     <androidx.viewpager2.widget.ViewPager2

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

@@ -2,6 +2,7 @@
 <com.compdfkit.tools.common.utils.view.CNestedScrollableHost xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:background="?android:attr/colorBackground"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -23,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
-            android:background="@color/tools_color_background"
+            android:background="?android:attr/colorBackground"
             >
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -33,7 +34,7 @@
                 android:textSize="18sp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_no_outlines"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"

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

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/cl_root"
+    android:background="?android:attr/colorBackground"
     android:foreground="@drawable/tools_common_btn_rectangle_ripple">
 
 
@@ -14,7 +15,7 @@
         android:layout_height="35dp"
         android:visibility="invisible"
         tools:visibility="visible"
-        app:tint="@color/tools_text_color_primary"
+        app:tint="?attr/colorOnPrimary"
         app:srcCompat="@drawable/tools_ic_right"
         android:padding="8dp"
         android:layout_marginStart="4dp"
@@ -32,7 +33,7 @@
         app:layout_constraintHorizontal_bias="0"
         android:minLines="1"
         android:paddingTop="12dp"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         android:paddingBottom="12dp"
         android:singleLine="true"
@@ -51,7 +52,7 @@
         android:gravity="center_vertical"
         android:maxLines="1"
         android:paddingStart="3dp"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         tools:text="1"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -61,7 +62,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/tools_control_line_color"
+        android:background="?attr/dividerColor"
         app:layout_constraintBottom_toBottomOf="parent"
         />
 

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

@@ -57,8 +57,8 @@
             android:layout_height="wrap_content"
             android:drawableEnd="@drawable/tools_ic_syas_arrow"
             android:fontFamily="sans-serif-medium"
-            android:textSize="22sp"
-            app:autoSizeMaxTextSize="22sp"
+            android:textSize="20sp"
+            app:autoSizeMaxTextSize="20sp"
             android:textAppearance="?attr/textAppearanceHeadline6"
             android:drawablePadding="8dp"
             app:drawableTint="?attr/colorOnPrimary"

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

@@ -14,9 +14,10 @@
         android:layout_marginStart="10dp"
         android:layout_marginEnd="24dp"
         android:fontFamily="sans-serif-medium"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="22sp"
         app:layout_constrainedWidth="true"
+        tools:text="ComPDFKit"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
@@ -36,7 +37,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_back"
-        app:tint="@color/tools_on_primary" />
+        app:tint="?attr/colorOnPrimary" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/compdfkit_PDFStyleDialog_ContentColor"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout

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

@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
         android:text="@string/tools_hide_form"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -23,7 +23,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:theme="@style/Tools_MySwitch"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -18,7 +18,7 @@
         android:id="@+id/cl_head"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/tools_reader_setting_head_bg_color"
+        android:background="?attr/compdfkit_HeadItem_BackgroundColor"
         android:layout_below="@id/id_search_head"
         >
 
@@ -51,7 +51,6 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-
         android:id="@+id/id_reader_search_recyclerView"
         android:layout_width="match_parent"
         tools:listitem="@layout/tools_search_keywords_list_item"
@@ -87,6 +86,7 @@
             android:textSize="18sp"
             android:layout_marginTop="16dp"
             android:text="@string/tools_sorry_no_contents"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintTop_toBottomOf="@id/iv_search_empty"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="@drawable/tools_common_btn_rectangle_ripple"
-    android:background="@color/tools_color_primary">
+    android:background="?android:attr/colorPrimary">
 
     <TextView
         android:id="@+id/id_item_search_content_text"
@@ -15,7 +15,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:maxLines="3"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         android:textSize="14sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingVertical="6dp"
     android:gravity="end"
-    android:background="@color/tools_text_color_primary_inverse"
+    android:background="?attr/compdfkit_HeadItem_BackgroundColor"
     >
 
 
@@ -17,7 +17,7 @@
         android:layout_gravity="center"
         android:layout_marginEnd="16dp"
         android:gravity="end"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         android:text="10"/>
 
 </LinearLayout>

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

@@ -3,15 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:elevation="4dp"
+    android:layout_height="wrap_content"
     android:animateLayoutChanges="true"
-    android:background="@color/tools_color_primary"
-    android:layout_height="wrap_content">
+    android:background="?android:attr/colorPrimary"
+    android:elevation="4dp">
 
     <com.compdfkit.tools.common.views.CToolBar
         android:id="@+id/search_toolbar"
         android:layout_width="match_parent"
         android:layout_height="56dp"
+        android:background="?android:attr/colorPrimary"
         android:title="@string/tools_search_hint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,18 +29,19 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="50dp"
                 android:layout_weight="1"
-                app:tabPaddingStart="16dp"
-                app:tabPaddingEnd="16dp"
-                android:background="@color/tools_color_primary"
+                android:background="?attr/colorPrimary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:visibility="invisible"
-                tools:visibility="visible"
+                app:layout_constraintTop_toBottomOf="@id/tool_bar"
+                app:tabIndicatorColor="?attr/colorAccent"
                 app:tabMode="auto"
+                app:tabPaddingEnd="16dp"
+                app:tabPaddingStart="16dp"
                 app:tabRippleColor="@color/tools_color_accent_50"
-                app:layout_constraintTop_toBottomOf="@id/tool_bar"
-                app:tabIndicatorColor="@color/tools_color_accent"
-                app:tabSelectedTextColor="@color/tools_color_accent"
+                app:tabSelectedTextColor="?attr/colorAccent"
                 app:tabTextAppearance="@style/tools_tab_layout_text_style"
-                app:tabTextColor="@color/tools_text_color_primary" />
+                app:tabTextColor="?android:attr/textColorPrimary"
+                tools:visibility="visible" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_search_setting"
@@ -49,7 +51,8 @@
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/tools_common_oval_ripple"
                 android:padding="4dp"
-                app:srcCompat="@drawable/tools_ic_search_setting" />
+                app:srcCompat="@drawable/tools_ic_search_setting"
+                app:tint="?attr/colorOnPrimary" />
 
         </LinearLayout>
 
@@ -65,15 +68,14 @@
             android:id="@+id/et_search"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:background="@null"
             android:gravity="center_vertical"
             android:hint="@string/tools_find"
+            android:imeOptions="actionSearch"
             android:paddingStart="16dp"
             android:paddingEnd="8dp"
             android:singleLine="true"
-            android:imeOptions="actionSearch"
-            android:background="@null"
-            android:textColor="@color/tools_text_color_primary"
-            android:textColorHint="@color/tools_text_color_hint"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/barrier"
@@ -97,7 +99,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/iv_search"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/tools_ic_close" />
+            app:srcCompat="@drawable/tools_ic_close"
+            app:tint="?attr/colorOnPrimary" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_search"
@@ -108,7 +111,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/tools_ic_search" />
+            app:srcCompat="@drawable/tools_ic_search"
+            app:tint="?attr/colorOnPrimary" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_previous"
@@ -117,37 +121,37 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/tools_common_oval_ripple"
             android:padding="6dp"
-            app:tint="@color/tools_text_color_primary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/iv_next"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/tools_ic_left_arrow" />
+            app:srcCompat="@drawable/tools_ic_left_arrow"
+            app:tint="?attr/colorOnPrimary" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_next"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:layout_marginEnd="8dp"
-            android:padding="6dp"
-            app:tint="@color/tools_text_color_primary"
             android:background="@drawable/tools_common_oval_ripple"
+            android:padding="6dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/iv_search_list"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/tools_ic_right_arrow" />
+            app:srcCompat="@drawable/tools_ic_right_arrow"
+            app:tint="?attr/colorOnPrimary" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_search_list"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:layout_marginEnd="8dp"
-            android:padding="6dp"
-            app:tint="@color/tools_text_color_primary"
             android:background="@drawable/tools_common_oval_ripple"
+            android:padding="6dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/tools_ic_search_list" />
+            app:srcCompat="@drawable/tools_ic_search_list"
+            app:tint="?attr/colorOnPrimary" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/group_search_before"
@@ -182,15 +186,14 @@
             android:id="@+id/et_replace_with"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:background="@null"
             android:gravity="center_vertical"
             android:hint="@string/tools_replace_with"
+            android:imeOptions="actionDone"
             android:paddingStart="16dp"
             android:paddingEnd="8dp"
             android:singleLine="true"
-            android:imeOptions="actionDone"
-            android:background="@null"
-            android:textColor="@color/tools_text_color_primary"
-            android:textColorHint="@color/tools_text_color_hint"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/btn_replace_all"
@@ -208,12 +211,11 @@
             android:paddingHorizontal="16dp"
             android:text="@string/tools_replace_all"
             android:textAllCaps="false"
-            android:textColor="@color/tools_color_accent"
+            android:textColor="?attr/colorAccent"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

ComPDFKit_Tools/src/main/res/values/tools_colors.xml

@@ -63,6 +63,8 @@
     <color name="tools_sign_preview_bg_color">#F4F7FF</color>
     <color name="tools_directory_item_title_color">#4982E6</color>
 
+    <color name="tools_divider_color">#1A000000</color>
+
 
 
     <color name="tools_dark_color_primary">#222429</color>
@@ -80,6 +82,7 @@
     <color name="tools_dark_reader_setting_head_bg_color">#303238</color>
 
     <color name="tools_dark_style_content_bg">#414347</color>
+    <color name="tools_dark_divider_color">#1AFFFFFF</color>
 
 
 </resources>

ComPDFKit_Tools/src/main/res/values/tools_styles.xml

@@ -21,8 +21,8 @@
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
-        <item name="android:textColor">@color/tools_text_color_primary</item>
-        <item name="android:background">@color/tools_reader_setting_head_bg_color</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:background">?attr/compdfkit_HeadItem_BackgroundColor</item>
         <item name="android:textSize">12sp</item>
     </style>
 

ComPDFKit_Tools/src/main/res/values/tools_themes.xml

@@ -68,6 +68,8 @@
     <attr name="compdfkit_BottomSheetDialog_Theme" format="reference" tools:ignore="ResourceName"/>
     <attr name="compdfkit_BottomSheetDialog_CloseIcon" format="reference" tools:ignore="ResourceName"/>
     <attr name="compdfkit_PDFStyleDialog_ContentColor" format="reference" tools:ignore="ResourceName"/>
+    <attr name="compdfkit_HeadItem_BackgroundColor" format="color" tools:ignore="ResourceName"/>
+    <attr name="compdfkit_tabLayoutStyle" format="reference" tools:ignore="ResourceName"/>
 
     <style name="ComPDFKit.Theme" parent="Theme.MaterialComponents.NoActionBar.Bridge" tools:ignore="ResourceName">
         <item name="colorPrimary">@color/tools_color_primary</item>
@@ -123,6 +125,10 @@
         <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Light</item>
         <item name="textAppearanceHeadline6">@style/ComPDFKit.Theme.TextAppearance.Headline6.Light</item>
         <item name="compdfkit_BottomSheetDialog_Transparent_Theme">@style/ComPDFKit.Theme.BottomSheetDialog.Light.Transparent</item>
+        <item name="compdfkit_BottomSheetDialog_Theme">@style/ComPDFKit.Theme.BottomSheetDialog.Light</item>
+        <item name="colorAccent">@color/tools_color_accent</item>
+        <item name="compdfkit_HeadItem_BackgroundColor">@color/tools_reader_setting_head_bg_color</item>
+        <item name="dividerColor">@color/tools_divider_color</item>
 
     </style>
 
@@ -130,21 +136,29 @@
         <item name="colorPrimary">@color/tools_dark_color_primary</item>
         <item name="colorOnPrimary">@color/tools_dark_on_primary</item>
         <item name="android:textColorPrimary">@color/tools_dark_text_color_primary</item>
+        <item name="android:textColorSecondary">@color/tools_dark_text_color_secondary</item>
         <item name="android:colorBackground">@color/tools_dark_color_background</item>
         <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Dark</item>
         <item name="textAppearanceHeadline6">@style/ComPDFKit.Theme.TextAppearance.Headline6.Dark</item>
         <item name="compdfkit_BottomSheetDialog_Transparent_Theme">@style/ComPDFKit.Theme.BottomSheetDialog.Dark.Transparent</item>
         <item name="compdfkit_BottomSheetDialog_Theme">@style/ComPDFKit.Theme.BottomSheetDialog.Dark</item>
+        <item name="colorAccent">@color/tools_dark_color_accent</item>
+        <item name="compdfkit_HeadItem_BackgroundColor">@color/tools_dark_reader_setting_head_bg_color</item>
+        <item name="dividerColor">@color/tools_dark_divider_color</item>
+
+
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog" tools:ignore="ResourceName">
         <item name="bottomSheetStyle">@style/ComPDFKit.Theme.BottomSheetStyle</item>
+        <item name="android:textColorSecondary">@color/tools_text_color_secondary</item>
+        <item name="android:textColorPrimaryInverse">@color/tools_text_color_primary_inverse</item>
+        <item name="compdfkit_tabLayoutStyle">@style/ComPDFKit.Theme.TabLayout</item>
     </style>
 
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Dark" tools:ignore="ResourceName">
         <item name="colorOnPrimary">@color/tools_dark_on_primary</item>
-        <item name="android:windowBackground">@color/tools_dark_color_background</item>
         <item name="colorPrimary">@color/tools_dark_color_primary</item>
         <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Dark</item>
         <item name="android:colorBackground">@color/tools_dark_color_background</item>
@@ -155,11 +169,16 @@
         <item name="colorAccent">@color/tools_dark_color_accent</item>
         <item name="colorSecondary">@color/tools_dark_secondary</item>
         <item name="hintTextColor">@color/tools_text_color_hint</item>
+        <item name="compdfkit_HeadItem_BackgroundColor">@color/tools_dark_reader_setting_head_bg_color</item>
+        <item name="android:textColorSecondary">@color/tools_dark_text_color_secondary</item>
+        <item name="android:textColorPrimaryInverse">@color/tools_dark_text_color_primary_inverse</item>
+        <item name="dividerColor">@color/tools_dark_divider_color</item>
+        <item name="dialogTheme">@style/ComPDFKit.Theme.Dialog</item>
+
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Light" tools:ignore="ResourceName">
         <item name="colorOnPrimary">@color/tools_on_primary</item>
-        <item name="android:windowBackground">@color/tools_color_background</item>
         <item name="colorPrimary">@color/tools_color_primary</item>
         <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Light</item>
         <item name="android:colorBackground">@color/tools_color_background</item>
@@ -170,6 +189,9 @@
         <item name="colorAccent">@color/tools_color_accent</item>
         <item name="colorSecondary">@color/tools_secondary</item>
         <item name="hintTextColor">@color/tools_text_color_hint</item>
+        <item name="compdfkit_HeadItem_BackgroundColor">@color/tools_reader_setting_head_bg_color</item>
+        <item name="dividerColor">@color/tools_divider_color</item>
+        <item name="dialogTheme">@style/ComPDFKit.Theme.Dialog</item>
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Dark.Transparent" tools:ignore="ResourceName">
@@ -184,6 +206,44 @@
         <item name="compdfkit_BottomSheetDialog_CloseIcon">@drawable/tools_ic_grey_oval_close</item>
     </style>
 
+    <style name="ComPDFKit.Theme.TabLayout.TabTextAppearance" parent="TextAppearance.AppCompat.Button" tools:ignore="ResourceName">
+        <item name="textAllCaps">false</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.TabLayout" parent="Widget.Design.TabLayout" tools:ignore="ResourceName">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="tabIndicatorColor">?attr/colorAccent</item>
+        <item name="tabRippleColor">@color/tools_color_accent_50</item>
+        <item name="tabSelectedTextColor">?attr/colorAccent</item>
+        <item name="tabTextAppearance">@style/ComPDFKit.Theme.TabLayout.TabTextAppearance</item>
+        <item name="tabTextColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.Dialog" parent="Theme.AppCompat.Light.Dialog" tools:ignore="ResourceName">
+        <item name="android:windowNoTitle">true</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:colorAccent">@color/tools_color_accent</item>
+        <item name="colorPrimary">@color/tools_color_primary</item>
+        <item name="colorPrimaryContainer">@color/tools_color_accent</item>
+        <item name="colorSecondary">@color/tools_secondary</item>
+        <item name="colorAccent">@color/tools_color_accent</item>
+        <item name="android:colorBackground">@color/tools_color_background</item>
+        <item name="android:textColorPrimary">@color/tools_text_color_primary</item>
+        <item name="hintTextColor">@color/tools_text_color_hint</item>
+        <item name="android:textColorHint">@color/tools_text_color_hint</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.Dialog.Dark" tools:ignore="ResourceName">
+        <item name="android:colorAccent">@color/tools_dark_color_accent</item>
+        <item name="colorPrimary">@color/tools_dark_color_primary</item>
+        <item name="colorPrimaryContainer">@color/tools_dark_color_accent</item>
+        <item name="colorSecondary">@color/tools_dark_secondary</item>
+        <item name="colorAccent">@color/tools_dark_color_accent</item>
+        <item name="android:colorBackground">@color/tools_dark_color_background</item>
+        <item name="android:textColorPrimary">@color/tools_dark_text_color_primary</item>
 
+    </style>
 
 </resources>