PDFTool(Android) - CPDFDocumentFrament 主题适配 - 预览设置、文档信息

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfdisplaysettings/CPDFDisplaySettingDialogFragment.java

@@ -21,6 +21,7 @@ import android.widget.Switch;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatRadioButton;
+import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
 
 import com.compdfkit.tools.R;
@@ -45,7 +46,7 @@ public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
 
     private AppCompatRadioButton rbCoverDoublePage;
 
-    private Switch swIsContinue;
+    private SwitchCompat swIsContinue;
 
     private RadioGroup rgScrollDirection;
 
@@ -53,7 +54,7 @@ public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
 
     private AppCompatRadioButton rbHorizontal;
 
-    private Switch swIsCropMode;
+    private SwitchCompat swIsCropMode;
 
     private RadioGroup readerBgRadioGroup;
 
@@ -78,9 +79,10 @@ public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(STYLE_NORMAL, R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle);
+        setStyle(STYLE_NORMAL, CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Theme));
     }
 
+
     @Override
     public void onStart() {
         super.onStart();

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/viewer/pdfinfo/CPDFDocumentInfoDialogFragment.java

@@ -73,6 +73,12 @@ public class CPDFDocumentInfoDialogFragment extends BottomSheetDialogFragment {
         this.pdfView = pdfView;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStyle(STYLE_NORMAL, CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Theme));
+    }
+
     @Override
     public void onStart() {
         super.onStart();

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

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -29,19 +28,19 @@
                 android:id="@+id/tv_scroll"
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
-                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"
                 android:text="@string/tools_scroll"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="12sp" />
 
             <RadioGroup
                 android:id="@+id/radio_group_scroll_direction"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/tools_color_background"
+                android:background="?android:attr/colorBackground"
                 >
 
 
@@ -64,12 +63,12 @@
                 android:id="@+id/tv_reader_mode"
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
-                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"
                 android:text="@string/tools_display_mode"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="12sp" />
 
 
@@ -77,7 +76,8 @@
                 android:id="@+id/radio_group_reader_mode"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/tools_color_background"
+                android:background="?android:attr/colorBackground"
+
                 >
 
 
@@ -104,14 +104,14 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="20dp"
-                android:background="@color/tools_reader_setting_head_bg_color" />
+                android:background="?attr/compdfkit_HeadItem_BackgroundColor" />
 
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 style="@style/tools_pdf_reader_setting_item_style"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:background="@color/tools_color_background"
+                android:background="?android:attr/colorBackground"
                 >
 
 
@@ -122,12 +122,12 @@
                     android:drawablePadding="16dp"
                     android:text="@string/tools_continuous_scroll"
                     android:gravity="center_vertical"
-                    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" />
 
-                <Switch
+                <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/sw_is_continue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -135,7 +135,6 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -143,7 +142,7 @@
                 style="@style/tools_pdf_reader_setting_item_style"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:background="@color/tools_color_background"
+                android:background="?android:attr/colorBackground"
                 >
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -153,12 +152,12 @@
                     android:drawablePadding="16dp"
                     android:text="@string/tools_crop"
                     android:gravity="center_vertical"
-                    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" />
 
-                <Switch
+                <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/sw_is_crop"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -173,12 +172,12 @@
                 android:id="@+id/tv_reader_background_color"
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
-                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"
                 android:text="@string/tools_themes"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="12sp" />
 
 
@@ -186,7 +185,8 @@
                 android:id="@+id/radio_group_reader_bg"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/tools_color_background"
+                android:background="?android:attr/colorBackground"
+
                 >
 
 

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

@@ -33,7 +33,7 @@
         <item name="layout_constraintStart_toStartOf">parent</item>
         <item name="layout_constraintHorizontal_weight">1</item>
         <item name="android:paddingStart">16dp</item>
-        <item name="android:textColor">@color/tools_text_color_primary</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:gravity">start|center_vertical</item>
 
     </style>
@@ -47,7 +47,7 @@
         <item name="android:paddingEnd">20dp</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layout_constraintHorizontal_weight">2</item>
-        <item name="android:textColor">@color/tools_color_accent</item>
+        <item name="android:textColor">?attr/colorAccent</item>
     </style>
 
     <style name="tools_document_info_item_style">
@@ -57,7 +57,7 @@
     <style name="tools_document_info_dividing_line_style">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">0.5dp</item>
-        <item name="android:background">@color/tools_item_dividing_line_color</item>
+        <item name="android:background">?attr/dividerColor</item>
     </style>
 
     <style name="tools_pdf_reader_setting_item_style">
@@ -65,13 +65,15 @@
         <item name="android:layout_height">55dp</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:textColor">?android:attr/textColorPrimary</item>
         <item name="android:gravity">center_vertical</item>
     </style>
 
     <style name="tools_pdf_reader_mode_radio_button_style" parent="tools_pdf_reader_setting_item_style">
         <item name="android:button">@null</item>
         <item name="android:drawablePadding">16dp</item>
+        <item name="android:drawableEnd">@drawable/tools_reader_settings_page_mode_radio_button</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:background">@drawable/tools_reader_settings_radio_button_ripple</item>
     </style>
 
@@ -178,8 +180,6 @@
 
     <style name="ComPDFKit.Theme.BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal" tools:ignore="ResourceName">
         <item name="android:maxWidth">@dimen/material_bottom_sheet_max_width</item>
-        <item name="android:background">@color/tools_dark_color_background</item>
-
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetStyle.Transparent"  tools:ignore="ResourceName">