PDFTool(Android) - CPDFDocumentFrament 主题适配 - 文件目录选择，页码跳转

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

@@ -62,7 +62,11 @@ public class CGotoPageDialog 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

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

@@ -17,6 +17,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.CompoundButton;
 import android.widget.FrameLayout;
+import android.widget.Switch;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,7 +29,7 @@ import com.compdfkit.tools.R;
 
 public class CPropertiesSwitchView extends FrameLayout {
 
-    private SwitchCompat switchCompat;
+    private Switch switchCompat;
 
     private AppCompatTextView title;
 

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

@@ -46,7 +46,7 @@ public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
 
     private AppCompatRadioButton rbCoverDoublePage;
 
-    private SwitchCompat swIsContinue;
+    private Switch swIsContinue;
 
     private RadioGroup rgScrollDirection;
 
@@ -54,7 +54,7 @@ public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
 
     private AppCompatRadioButton rbHorizontal;
 
-    private SwitchCompat swIsCropMode;
+    private Switch swIsCropMode;
 
     private RadioGroup readerBgRadioGroup;
 

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

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

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

@@ -127,10 +127,11 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.appcompat.widget.SwitchCompat
+                <Switch
                     android:id="@+id/sw_is_continue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    style="?attr/switchStyle"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -157,10 +158,11 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.appcompat.widget.SwitchCompat
+                <Switch
                     android:id="@+id/sw_is_crop"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    style="?attr/switchStyle"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

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

@@ -32,7 +32,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/tools_item_dividing_line_color"
+        android:background="?attr/dividerColor"
         app:layout_constraintTop_toBottomOf="@id/rv_folder_title"
         android:id="@+id/line"
         />

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="65dp"
+    tools:background="?android:attr/colorBackground"
     android:background="@drawable/tools_common_btn_rectangle_ripple">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -15,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_baseline_folder"
-        app:tint="@color/tools_text_color_secondary" />
+        app:tint="?attr/colorOnPrimary" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_name"
@@ -26,7 +27,7 @@
         android:singleLine="true"
         android:layout_marginEnd="8dp"
         android:textSize="16sp"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="40dp"
+    tools:background="?android:attr/colorBackground"
     android:background="@drawable/tools_common_btn_rectangle_ripple">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -14,7 +15,7 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="start"
         android:singleLine="true"
-        android:textColor="@color/tools_directory_item_title_color"
+        android:textColor="?android:attr/colorAccent"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -11,6 +11,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:tint="?attr/colorOnPrimary"
         app:srcCompat="@drawable/tools_ic_grey_arrow" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -18,12 +18,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.SwitchCompat
+    <Switch
         android:id="@+id/switch_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        app:theme="?attr/switchStyle"
+        style="?attr/switchStyle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -199,10 +199,10 @@
         <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="colorOnSecondary">@color/tools_dark_on_secondary</item>
+        <item name="switchStyle">@style/ComPDFKit.Theme.SwitchCompat</item>
 
     </style>