Преглед изворни кода

PDFTool(Android) - CPDFDocumentFrament 主题适配 - 水印样式弹窗

liuxiaolong пре 11 месеци
родитељ
комит
3dbb841c41
23 измењених фајлова са 95 додато и 55 уклоњено
  1. 1 1
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationbar/CAnnotationToolbar.java
  2. 1 1
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/CStyleDialogFragment.java
  3. 18 4
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/CStyleUIParams.java
  4. 0 10
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/manager/provider/CStyleProvider.java
  5. 1 1
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdfsign/CustomSignatureWidgetImpl.java
  6. 1 1
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdfsign/SignatureWidgetImpl.java
  7. 2 0
      ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/watermark/pdfproperties/CWatermarkTextStyleFragment.java
  8. 1 1
      ComPDFKit_Tools/src/main/res/color/tools_font_style_iv_color.xml
  9. 7 7
      ComPDFKit_Tools/src/main/res/drawable/tools_bg_import_certificate_digital_id_item.xml
  10. 1 2
      ComPDFKit_Tools/src/main/res/drawable/tools_seek_bar_progress_drawable.xml
  11. 6 3
      ComPDFKit_Tools/src/main/res/drawable/tools_seek_bar_thumb_drawable.xml
  12. 2 2
      ComPDFKit_Tools/src/main/res/drawable/tools_style_preview_bg.xml
  13. 2 2
      ComPDFKit_Tools/src/main/res/layout/tools_cpdf_font_view.xml
  14. 0 1
      ComPDFKit_Tools/src/main/res/layout/tools_cpdf_security_watermark_image_style_fragment.xml
  15. 11 9
      ComPDFKit_Tools/src/main/res/layout/tools_cpdf_security_watermark_text_style_fragment.xml
  16. 1 0
      ComPDFKit_Tools/src/main/res/layout/tools_dialog_tool_bar.xml
  17. 1 0
      ComPDFKit_Tools/src/main/res/layout/tools_properties_switch_view_layout.xml
  18. 3 1
      ComPDFKit_Tools/src/main/res/layout/tools_slider_bar.xml
  19. 1 1
      ComPDFKit_Tools/src/main/res/layout/tools_slider_bar_value_layout.xml
  20. 1 1
      ComPDFKit_Tools/src/main/res/layout/tools_spinner_list_item.xml
  21. 1 1
      ComPDFKit_Tools/src/main/res/layout/tools_style_dialog_fragment.xml
  22. 1 1
      ComPDFKit_Tools/src/main/res/values/tools_styles.xml
  23. 32 5
      ComPDFKit_Tools/src/main/res/values/tools_themes.xml

+ 1 - 1
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationbar/CAnnotationToolbar.java

@@ -132,7 +132,7 @@ public class CAnnotationToolbar extends FrameLayout {
         CStyleManager styleManager = new CStyleManager(pdfView);
         CStyleType styleType = toolListAdapter.getCurrentAnnotType().getStyleType();
         CAnnotStyle style = styleManager.getStyle(styleType);
-        CStyleUIParams styleUiParams = CStyleUIParams.defaultStyle(styleType);
+        CStyleUIParams styleUiParams = CStyleUIParams.defaultStyle(getContext(), styleType);
         CStyleDialogFragment dialogFragment = CStyleDialogFragment.newInstance(style);
         dialogFragment.setStyleUiConfig(styleUiParams);
         styleManager.setAnnotStyleFragmentListener(dialogFragment);

+ 1 - 1
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/CStyleDialogFragment.java

@@ -96,7 +96,7 @@ public class CStyleDialogFragment extends BottomSheetDialogFragment implements C
             return;
         }
         if (styleUIParams == null){
-            styleUIParams = CStyleUIParams.defaultStyle(annotStyle.getType());
+            styleUIParams = CStyleUIParams.defaultStyle(getContext(), annotStyle.getType());
         }
         viewModel = new ViewModelProvider(getActivity()).get(CStyleViewModel.class);
         setStyle(STYLE_NORMAL, styleUIParams.theme);

+ 18 - 4
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/views/pdfproperties/pdfstyle/CStyleUIParams.java

@@ -10,9 +10,13 @@
 package com.compdfkit.tools.common.views.pdfproperties.pdfstyle;
 
 
+import android.content.Context;
+import android.content.res.Resources;
+
 import androidx.annotation.DrawableRes;
 
 import com.compdfkit.tools.R;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 
 import java.io.Serializable;
 
@@ -30,28 +34,38 @@ public class CStyleUIParams implements Serializable {
 
     public boolean fillScreenHeight;
 
-    public int theme = R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_TopCorners;
+    public int theme = R.style.ComPDFKit_Theme_BottomSheetDialog_Light_Transparent;
 
     public float dimAmount = 0.2F;
 
     public @DrawableRes  int backgroundDrawable;
 
-    public static CStyleUIParams defaultStyle(CStyleType styleType){
+    public static CStyleUIParams defaultStyle(Context context, CStyleType styleType){
         CStyleUIParams params = new CStyleUIParams();
         params.showToolbar = true;
         params.dimAmount = 0.2F;
         params.backgroundDrawable = R.drawable.tools_annot_style_dialog_window_bg;
         params.dialogStyleType = DialogStyleType.Dialog;
+        params.theme = params.getStyleTheme(context, R.attr.compdfkit_BottomSheetDialog_Transparent_Theme, R.style.ComPDFKit_Theme_BottomSheetDialog_Light_Transparent);
         if (styleType == CStyleType.ANNOT_STAMP || styleType == CStyleType.ANNOT_SIGNATURE || styleType == CStyleType.FORM_SIGNATURE_FIELDS){
             params.fillScreenHeight = true;
-            params.theme = R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
+            params.theme = params.getStyleTheme(context, R.attr.compdfkit_BottomSheetDialog_Theme, R.style.ComPDFKit_Theme_BottomSheetDialog_Light);
             params.dialogStyleType = CStyleUIParams.DialogStyleType.Activity;
             params.dimAmount = 0F;
         }
         if (styleType == CStyleType.ANNOT_PIC){
             params.showToolbar = false;
-            params.theme = R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
+            params.theme = params.getStyleTheme(context, R.attr.compdfkit_BottomSheetDialog_Theme, R.style.ComPDFKit_Theme_BottomSheetDialog_Light);
         }
         return params;
     }
+
+    private int getStyleTheme(Context context, int resId, int defaultResId){
+        int themeId = CViewUtils.getThemeAttrResourceId(context.getTheme(), resId);
+        if (themeId != 0){
+            return themeId;
+        }else {
+            return defaultResId;
+        }
+    }
 }

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

@@ -24,17 +24,7 @@ public interface CStyleProvider {
 
     public CAnnotStyle getStyle(CStyleType type);
 
-
-
-
     default public String getAnnotStyleFontName(CAnnotStyle annotStyle){
-//        String fontName;
-//        if (!TextUtils.isEmpty(annotStyle.getExternFontName())){
-//            fontName = CPDFTextAttribute.FontNameHelper.obtainOutFontName(annotStyle.getExternFontName(), annotStyle.isFontBold(), annotStyle.isFontItalic());
-//        } else {
-//            fontName = CPDFTextAttribute.FontNameHelper.obtainFontName(annotStyle.getFontType(), annotStyle.isFontBold(), annotStyle.isFontItalic());
-//        }
-//        CLog.e("字体", "更新字体fontName:" + fontName);
         CLog.e("字体", "更新字体:" + annotStyle.getExternFontName());
         return annotStyle.getExternFontName();
     }

+ 1 - 1
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdfsign/CustomSignatureWidgetImpl.java

@@ -33,7 +33,7 @@ public class CustomSignatureWidgetImpl extends CPDFSignatureWidgetImpl {
     public void onSignatureWidgetFocused(CPDFSignatureWidget cpdfSignatureWidget) {
         CStyleManager styleManager = new CStyleManager(this, pageView);
         CStyleDialogFragment styleDialogFragment = CStyleDialogFragment.newInstance(styleManager.getStyle(CStyleType.FORM_SIGNATURE_FIELDS));
-        CStyleUIParams styleUiParams = CStyleUIParams.defaultStyle(CStyleType.FORM_SIGNATURE_FIELDS);
+        CStyleUIParams styleUiParams = CStyleUIParams.defaultStyle(pageView.getContext(), CStyleType.FORM_SIGNATURE_FIELDS);
         styleDialogFragment.setStyleUiConfig(styleUiParams);
         styleDialogFragment.setStyleDialogDismissListener(() -> {
             CAnnotStyle annotStyle = styleDialogFragment.getAnnotStyle();

+ 1 - 1
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/pdfsign/SignatureWidgetImpl.java

@@ -114,7 +114,7 @@ public class SignatureWidgetImpl extends CPDFSignatureWidgetImpl {
     private void fillElectronicSignature(){
         CStyleManager styleManager = new CStyleManager(this, pageView);
         CStyleDialogFragment styleDialogFragment = CStyleDialogFragment.newInstance(styleManager.getStyle(CStyleType.FORM_SIGNATURE_FIELDS));
-        CStyleUIParams styleUiParams = CStyleUIParams.defaultStyle(CStyleType.FORM_SIGNATURE_FIELDS);
+        CStyleUIParams styleUiParams = CStyleUIParams.defaultStyle(pageView.getContext(), CStyleType.FORM_SIGNATURE_FIELDS);
         styleDialogFragment.setStyleUiConfig(styleUiParams);
         styleDialogFragment.setStyleDialogDismissListener(() -> {
             CAnnotStyle annotStyle = styleDialogFragment.getAnnotStyle();

+ 2 - 0
ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/watermark/pdfproperties/CWatermarkTextStyleFragment.java

@@ -23,9 +23,11 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.SwitchCompat;
 
 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;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.pdfproperties.basic.CBasicPropertiesFragment;
 import com.compdfkit.tools.common.views.pdfproperties.colorlist.ColorListView;
 import com.compdfkit.tools.common.views.pdfproperties.font.CPDFFontView;

+ 1 - 1
ComPDFKit_Tools/src/main/res/color/tools_font_style_iv_color.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="#4982E6" android:state_selected="true"/>
-    <item android:color="@color/tools_text_color_primary"/>
+    <item android:color="?android:attr/textColorPrimary"/>
 </selector>

+ 7 - 7
ComPDFKit_Tools/src/main/res/drawable/tools_bg_import_certificate_digital_id_item.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true">
-        <shape >
-            <solid android:color="@color/tools_text_color_primary_inverse"/>
-            <stroke android:color="@color/tools_color_accent" android:width="2dp"/>
+        <shape>
+
+            <stroke android:width="2dp" android:color="?attr/colorAccent" />
         </shape>
     </item>
-    <item >
-        <shape >
-            <solid android:color="@color/tools_text_color_primary_inverse"/>
-            <stroke android:color="@color/tools_item_dividing_line_color" android:width="1px"/>
+    <item>
+        <shape>
+
+            <stroke android:width="1px" android:color="?attr/dividerColor" />
         </shape>
     </item>
 </selector>

+ 1 - 2
ComPDFKit_Tools/src/main/res/drawable/tools_seek_bar_progress_drawable.xml

@@ -3,7 +3,6 @@
     <item android:id="@android:id/background">
         <shape>
             <solid android:color="#5C1460F3" />
-
         </shape>
 
     </item>
@@ -19,7 +18,7 @@
     <item android:id="@android:id/progress">
         <clip>
             <shape>
-                <solid android:color="@color/tools_color_accent" />
+                <solid android:color="?attr/colorAccent" />
             </shape>
         </clip>
 

+ 6 - 3
ComPDFKit_Tools/src/main/res/drawable/tools_seek_bar_thumb_drawable.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-        <solid android:color="@color/tools_color_accent"/>
-    <size android:width="12dp" android:height="12dp"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/colorAccent" />
+    <size
+        android:width="12dp"
+        android:height="12dp" />
 </shape>

+ 2 - 2
ComPDFKit_Tools/src/main/res/drawable/tools_style_preview_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/tools_on_secondary"/>
-    <stroke android:width="0.5dp" android:color="@color/tools_control_line_color"/>
+    <solid android:color="?attr/colorOnSecondary"/>
+    <stroke android:width="0.5dp" android:color="?attr/dividerColor"/>
 </shape>

+ 2 - 2
ComPDFKit_Tools/src/main/res/layout/tools_cpdf_font_view.xml

@@ -24,7 +24,7 @@
         android:layout_marginStart="16dp"
         android:spinnerMode="dropdown"
         android:popupElevation="4dp"
-        android:dropDownSelector="@color/tools_color_primary"
+        android:dropDownSelector="?attr/colorPrimary"
         android:popupBackground="@drawable/tools_common_window_bg"
         app:layout_constraintBottom_toBottomOf="@id/tv_font_type"
         app:layout_constraintEnd_toStartOf="@id/spinner_font_style"
@@ -50,7 +50,7 @@
         android:layout_marginEnd="16dp"
         android:spinnerMode="dropdown"
         android:popupElevation="4dp"
-        android:dropDownSelector="@color/tools_color_primary"
+        android:dropDownSelector="?attr/colorPrimary"
         android:popupBackground="@drawable/tools_common_window_bg"
         app:layout_constraintBottom_toBottomOf="@id/tv_font_type"
         app:layout_constraintStart_toEndOf="@id/spinner_font"

+ 0 - 1
ComPDFKit_Tools/src/main/res/layout/tools_cpdf_security_watermark_image_style_fragment.xml

@@ -140,7 +140,6 @@
             android:layout_marginTop="28dp"
             android:layout_marginBottom="32dp"
             android:text="@string/tools_tile"
-            android:textColor="@color/tools_text_color_disable"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_page_range" />

+ 11 - 9
ComPDFKit_Tools/src/main/res/layout/tools_cpdf_security_watermark_text_style_fragment.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:background="?android:attr/colorBackground"
+    tools:layout_gravity="bottom">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_rootView"
@@ -30,13 +33,12 @@
             app:tools_slider_bar_value_show_type="percentage" />
 
         <com.compdfkit.tools.common.views.pdfproperties.font.CPDFFontView
+            android:id="@+id/font_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/slider_bar"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:id="@+id/font_view"
-            />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/slider_bar" />
 
         <com.compdfkit.tools.common.utils.view.sliderbar.CSliderBar
             android:id="@+id/font_size_slider_bar"
@@ -117,7 +119,7 @@
                 android:id="@+id/spinner_page_range"
                 android:layout_width="180dp"
                 android:layout_height="match_parent"
-                android:dropDownSelector="@color/tools_color_primary"
+                android:dropDownSelector="?attr/colorPrimary"
                 android:popupBackground="@drawable/tools_common_window_bg" />
 
         </LinearLayout>
@@ -131,7 +133,6 @@
             android:layout_marginTop="28dp"
             android:layout_marginBottom="32dp"
             android:text="@string/tools_tile"
-            android:textColor="@color/tools_text_color_disable"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_page_range" />
@@ -141,10 +142,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:theme="@style/Tools_MySwitch"
+            app:theme="@style/Tools_MySwitch"
             app:layout_constraintBottom_toBottomOf="@id/tv_tile"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_tile" />
+            app:layout_constraintTop_toTopOf="@id/tv_tile"
+            tools:checked="true" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 0
ComPDFKit_Tools/src/main/res/layout/tools_dialog_tool_bar.xml

@@ -35,6 +35,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_back"
+        app:tint="?attr/colorOnPrimary"
         tools:visibility="visible" />
 
     <androidx.appcompat.widget.AppCompatImageView

+ 1 - 0
ComPDFKit_Tools/src/main/res/layout/tools_properties_switch_view_layout.xml

@@ -23,6 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
+        app:theme="?attr/switchStyle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

+ 3 - 1
ComPDFKit_Tools/src/main/res/layout/tools_slider_bar.xml

@@ -31,7 +31,9 @@
 
         <androidx.appcompat.widget.AppCompatSeekBar
             android:id="@+id/seek_bar"
-            style="@style/tools_seek_bar_style"
+            style="?attr/seekBarStyle"
+            android:paddingHorizontal="12dp"
+            android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:max="100"
             android:layout_gravity="center"

+ 1 - 1
ComPDFKit_Tools/src/main/res/layout/tools_slider_bar_value_layout.xml

@@ -11,7 +11,7 @@
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

+ 1 - 1
ComPDFKit_Tools/src/main/res/layout/tools_spinner_list_item.xml

@@ -14,7 +14,7 @@
         android:gravity="center_vertical"
         android:layout_marginEnd="16dp"
         android:text="@string/tools_view_setting"
-        android:textColor="@color/tools_subtitle_1_color"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
         app:autoSizeTextType="uniform"
         app:autoSizeMaxTextSize="14sp"
         app:autoSizeMinTextSize="9sp"

+ 1 - 1
ComPDFKit_Tools/src/main/res/layout/tools_style_dialog_fragment.xml

@@ -14,7 +14,7 @@
         android:id="@+id/cl_viewPager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/tools_style_content_bg"
+        android:background="?attr/compdfkit_PDFStyleDialog_ContentColor"
         app:layout_constraintVertical_bias="0"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="44dp"

+ 1 - 1
ComPDFKit_Tools/src/main/res/values/tools_styles.xml

@@ -115,7 +115,7 @@
     <style name="tools_style_fragment_line">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">0.8dp</item>
-        <item name="android:background">@color/tools_control_line_color</item>
+        <item name="android:background">?attr/dividerColor</item>
     </style>
 
     <style name="tools_slider_bar_value_view_style">

+ 32 - 5
ComPDFKit_Tools/src/main/res/values/tools_themes.xml

@@ -45,13 +45,13 @@
         <item name="textAppearanceSubtitle1">@style/ToolsTextAppearanceSubtitle1</item>
         <item name="textAppearanceButton">@style/ToolsAppTextAppearance.Button</item>
         <item name="bottomSheetStyle">@style/tools_basic_bottom_sheet_style</item>
-        <item name="colorControlActivated">@color/tools_color_accent</item>
+        <item name="colorControlActivated">@color/tools_dark_color_accent</item>
         <item name="android:navigationBarColor">@color/tools_style_content_bg</item>
         <item name="android:windowIsFloating">false</item>
     </style>
 
     <style name="Tools_MySwitch" parent="Theme.AppCompat.Light">
-        <item name="colorControlActivated">@color/tools_color_accent</item>
+        <item name="colorControlActivated">@color/tools_dark_color_accent</item>
     </style>
 
     <style name="Tools_Base_Theme.BasicBottomSheetDialogStyle.TopCorners">
@@ -89,6 +89,8 @@
         <item name="textAppearanceSubtitle1">@style/ToolsTextAppearanceSubtitle1</item>
         <item name="textAppearanceButton">@style/ToolsAppTextAppearance.Button</item>
         <item name="colorControlActivated">@color/tools_color_accent</item>
+        <item name="seekBarStyle">@style/ComPDFKit.Theme.SeekBar</item>
+        <item name="colorOnSecondary">@color/tools_on_secondary</item>
     </style>
 
 
@@ -164,7 +166,7 @@
         <item name="compdfkit_HeadItem_BackgroundColor">@color/tools_dark_reader_setting_head_bg_color</item>
         <item name="dividerColor">@color/tools_dark_divider_color</item>
         <item name="compdfkit_PDFStyleDialog_ContentColor">@color/tools_dark_style_content_bg</item>
-
+        <item name="colorOnSecondary">@color/tools_dark_on_secondary</item>
 
     </style>
 
@@ -173,6 +175,11 @@
         <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>
+        <item name="switchStyle">@style/ComPDFKit.Theme.SwitchCompat</item>
+        <item name="seekBarStyle">@style/ComPDFKit.Theme.SeekBar</item>
+        <item name="colorOnSecondary">@color/tools_on_secondary</item>
+        <item name="dialogTheme">@style/ComPDFKit.Theme.Dialog</item>
+
     </style>
 
 
@@ -187,13 +194,14 @@
         <item name="colorControlActivated">@color/tools_dark_color_accent</item>
         <item name="colorControlNormal">?attr/colorOnPrimary</item>
         <item name="colorAccent">@color/tools_dark_color_accent</item>
+        <item name="android: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>
+        <item name="colorOnSecondary">@color/tools_dark_on_secondary</item>
 
     </style>
 
@@ -212,13 +220,15 @@
         <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">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="bottomSheetStyle">@style/ComPDFKit.Theme.BottomSheetStyle.Transparent</item>
         <item name="compdfkit_BottomSheetDialog_CloseIcon">@drawable/tools_ic_grey_oval_close_dark</item>
+        <item name="colorControlActivated">@color/tools_dark_color_accent</item>
+        <item name="colorControlNormal">?attr/colorOnPrimary</item>
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Light.Transparent" tools:ignore="ResourceName">
@@ -254,6 +264,8 @@
         <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>
+        <item name="switchStyle">@style/ComPDFKit.Theme.SwitchCompat</item>
+        <item name="seekBarStyle">@style/ComPDFKit.Theme.SeekBar</item>
     </style>
 
     <style name="ComPDFKit.Theme.Dialog.Dark" tools:ignore="ResourceName">
@@ -267,4 +279,19 @@
 
     </style>
 
+
+    <style name="ComPDFKit.Theme.SwitchCompat" parent="Theme.AppCompat.Light" tools:ignore="ResourceName">
+        <item name="colorControlActivated">?attr/colorAccent</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.SeekBar" parent="Widget.AppCompat.ProgressBar.Horizontal"  tools:ignore="ResourceName">
+        <item name="android:progressDrawable">@drawable/tools_seek_bar_progress_drawable</item>
+        <item name="android:maxHeight">2dp</item>
+        <item name="android:minHeight">2dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:thumb">@drawable/tools_seek_bar_thumb_drawable</item>
+    </style>
+
+
+
 </resources>