PDFTool(Android) - CPDFDocumentFrament 主题适配 - 页面编辑

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/basic/fragment/CBasicBottomSheetDialogFragment.java

@@ -69,7 +69,7 @@ public abstract class CBasicBottomSheetDialogFragment extends BottomSheetDialogF
     protected abstract @LayoutRes int layoutId();
 
     protected int getStyle(){
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Theme);
     }
 
     protected boolean fullScreen(){

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java

@@ -203,7 +203,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        getContext().getTheme().applyStyle(R.style.ComPDFKit_Theme_Light, true);
+        getContext().getTheme().applyStyle(R.style.ComPDFKit_Theme_Dark, true);
         View rootView = inflater.inflate(R.layout.tools_pdf_document_fragment, container, false);
         clRoot = rootView.findViewById(R.id.cl_root);
         pdfView = rootView.findViewById(R.id.pdf_view);
@@ -224,9 +224,6 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (getContext() != null) {
-            getContext().setTheme(R.style.Tools_Base_Theme);
-        }
         screenManager.bind(this);
         //Extract PDF files from the Android assets folder
         parseConfiguration();

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/docseditor/pdfpageedit/CPDFPageEditDialogFragment.java

@@ -124,7 +124,7 @@ public class CPDFPageEditDialogFragment extends CBasicBottomSheetDialogFragment
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Theme);
     }
 
     @Override

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/docseditor/pdfpageeditinsert/CInsertBlankPageDialogFragment.java

@@ -64,11 +64,6 @@ public class CInsertBlankPageDialogFragment extends CBasicBottomSheetDialogFragm
         this.document = document;
     }
 
-    @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/docseditor/pdfpageeditinsert/CInsertPdfPageDialogFragment.java

@@ -98,11 +98,6 @@ public class CInsertPdfPageDialogFragment extends CBasicBottomSheetDialogFragmen
         this.pdfView = pdfView;
     }
 
-    @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/res/color/tools_radio_btn_text_status_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="@color/tools_text_color_primary" android:state_checked="true"/>
+    <item android:color="?android:attr/textColorPrimary" android:state_checked="true"/>
     <item android:color="@color/tools_text_color_hint"/>
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
     <corners android:radius="6dp" />
-    <solid android:color="@color/tools_color_background" />
+    <solid android:color="?android:attr/colorBackground" />
 </shape>

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

@@ -4,7 +4,7 @@
         <shape>
             <corners android:radius="1dp"
                 />
-            <solid android:color="@color/tools_color_primary"/>
+            <solid android:color="?attr/colorPrimary"/>
         </shape>
     </item>
 
@@ -12,14 +12,14 @@
         <selector >
             <item android:state_enabled="false">
                 <shape>
-                    <solid android:color="@color/tools_color_primary"/>
+                    <solid android:color="?attr/colorPrimary"/>
                 </shape>
             </item>
             <item>
                 <shape>
                     <corners android:radius="1dp"
                         />
-                    <stroke android:color="@color/tools_color_accent" android:width="1dp"/>
+                    <stroke android:color="?attr/colorAccent" android:width="1dp"/>
                 </shape>
             </item>
         </selector>

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

@@ -24,8 +24,8 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:text="@string/tools_view_setting"
-        android:textColor="@color/tools_subtitle_1_color"
-        android:textSize="16sp" />
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+         />
 
 </LinearLayout>
 

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorPrimary"
     tools:layout_height="?android:attr/actionBarSize">
 
 
@@ -14,8 +15,7 @@
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:fontFamily="sans-serif-medium"
-        android:textColor="@color/tools_text_color_primary"
-        android:textSize="22sp"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0"
@@ -42,7 +42,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.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_tool_bar_done"
@@ -89,6 +89,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_pageedit_bar_edit"
-        app:tint="@color/tools_text_color_primary"
+        app:tint="?attr/colorOnPrimary"
         />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,6 +2,7 @@
 <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"
+    android:background="?android:attr/colorBackground"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools">
 

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

@@ -2,6 +2,7 @@
 <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"
+    android:background="?android:attr/colorBackground"
     android:layout_height="match_parent">
 
     <com.compdfkit.tools.docseditor.CPageEditBar
@@ -41,7 +42,6 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     android:text="@string/tools_page_edit_insert_page_pagesize"
-                    android:textColor="@color/tools_text_color_primary"
                     />
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/iv_tool_insert_page_right"
@@ -54,7 +54,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/tools_pageedit_right_arrow"
-                    app:tint="@color/tools_on_primary" />
+                    app:tint="?attr/colorOnPrimary" />
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/iv_tool_insert_page_cur_size"
                     style="@style/tools_edit_page_insertpage_cursize_style"
@@ -62,7 +62,6 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     android:text="A4(595*842)"
-                    android:textColor="@color/tools_text_color_primary"
                     />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -104,7 +103,6 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     android:text="@string/tools_page_edit_insert_page_pagedirection"
-                    android:textColor="@color/tools_text_color_primary"
                     />
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/iv_tool_insert_page_horizontal"
@@ -150,7 +148,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/tools_pageedit_line_height"
                     android:gravity="center"
-                    android:textColor="@color/tools_text_color_primary"
+                    android:textColor="?android:attr/textColorPrimary"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     android:text="@string/tools_page_edit_insert_page_insert_to"
@@ -186,12 +184,13 @@
                         android:checked="false"
                         android:textColor="@color/tools_radio_btn_text_status_color"
                         android:text="@string/tools_page_edit_insert_page_before"/>
+
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/et_tool_edit_page_enterpage"
                         android:hint="@string/tools_page_edit_insert_page_enterpage_tint"
                         android:gravity="bottom"
                         android:inputType="number"
-                        android:textColorHint="@color/tools_text_color_hint"
+                        android:textColorHint="?attr/hintTextColor"
                         android:textSize="14sp"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/tools_pageedit_line_height"/>

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

@@ -2,7 +2,7 @@
 <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="@color/tools_style_content_bg"
+    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_pageedit_insert_pdf_page_dialog_fragment.xml

@@ -2,7 +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"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground">
 
     <com.compdfkit.tools.docseditor.CPageEditBar
         android:id="@+id/page_edit_tool_bar"
@@ -10,10 +11,10 @@
         android:layout_height="?android:attr/actionBarSize"
         android:elevation="4dp"
         android:title="@string/tools_document_info"
-        app:tools_done_title="@string/tools_save"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tools_done_title="@string/tools_save" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -39,7 +40,6 @@
                 <TextView
                     style="@style/tools_edit_page_insertpage_pagesize_style"
                     android:text="@string/tools_page_edit_insert_page_filename"
-                    android:textColor="@color/tools_text_color_primary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -55,13 +55,12 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/tools_ic_pageedit_arrow_right"
-                    app:tint="@color/tools_on_primary" />
+                    app:tint="?attr/colorOnPrimary" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/iv_tool_insert_page_filename"
                     style="@style/tools_edit_page_insertpage_cursize_style"
                     android:singleLine="true"
-                    android:textColor="@color/tools_text_color_primary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/iv_tool_insert_page_right"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -81,7 +80,7 @@
                     android:layout_height="@dimen/tools_pageedit_line_height"
                     android:gravity="center"
                     android:text="@string/tools_page_edit_insert_page_range"
-                    android:textColor="@color/tools_text_color_primary"
+                    android:textColor="?android:attr/textColorPrimary"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -131,8 +130,9 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:gravity="bottom"
-                android:inputType="textCapWords"
                 android:hint="@string/tools_e_g_page"
+                android:inputType="textCapWords"
+                android:textColorHint="?attr/hintTextColor"
                 android:textSize="14sp" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -147,7 +147,7 @@
                     android:layout_height="@dimen/tools_pageedit_line_height"
                     android:gravity="center"
                     android:text="@string/tools_page_edit_insert_page_insert_to"
-                    android:textColor="@color/tools_text_color_primary"
+                    android:textColor="?android:attr/textColorPrimary"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -164,37 +164,39 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/tools_pageedit_line_height"
                         android:checked="true"
-                        android:textColor="@color/tools_radio_btn_text_status_color"
-                        android:text="@string/tools_page_edit_insert_page_home_page" />
+                        android:text="@string/tools_page_edit_insert_page_home_page"
+                        android:textColor="@color/tools_radio_btn_text_status_color" />
 
                     <RadioButton
                         android:id="@+id/rb_tools_edit_page_insert_location_lastpage"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/tools_pageedit_line_height"
-                        android:textColor="@color/tools_radio_btn_text_status_color"
-                        android:text="@string/tools_page_edit_insert_page_last_page" />
+                        android:text="@string/tools_page_edit_insert_page_last_page"
+                        android:textColor="@color/tools_radio_btn_text_status_color" />
 
                     <RadioButton
                         android:id="@+id/rb_tools_edit_page_insert_location_before"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/tools_pageedit_line_height"
-                        android:textColor="@color/tools_radio_btn_text_status_color"
-                        android:text="@string/tools_page_edit_insert_page_before" />
+                        android:text="@string/tools_page_edit_insert_page_before"
+                        android:textColor="@color/tools_radio_btn_text_status_color" />
 
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/et_tool_edit_page_enterpage"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/tools_pageedit_line_height"
-                        android:textSize="14sp"
                         android:gravity="bottom"
                         android:hint="@string/tools_page_edit_insert_page_enterpage_tint"
-                        android:inputType="number" />
+                        android:inputType="number"
+                        android:textColorHint="?attr/hintTextColor"
+                        android:textSize="14sp" />
 
                     <RadioButton
                         android:id="@+id/rb_tools_edit_page_insert_location_after"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/tools_pageedit_line_height"
-                        android:text="@string/tools_page_edit_insert_page_after" />
+                        android:text="@string/tools_page_edit_insert_page_after"
+                        android:textColor="@color/tools_radio_btn_text_status_color" />
                 </RadioGroup>
             </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:theme="@style/Tools_Base_Theme.BasicBottomSheetDialogStyle"
-    style="@style/Tools_Base_Theme.BasicBottomSheetDialogStyle"
     android:layout_height="@dimen/tools_pageedit_line_height"
     android:textColor="@color/tools_radio_btn_text_status_color"
     android:text="@string/tools_page_edit_insert_page_allpage"/>

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

@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="?android:attr/actionBarSize"
         android:animateLayoutChanges="true"
-        android:background="@color/tools_color_primary"
+        android:background="?android:attr/colorPrimary"
         android:clickable="true"
         android:elevation="4dp"
         android:focusable="true">
@@ -32,14 +32,14 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_insert"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_page_edit_toolbar_insert"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -63,14 +63,14 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_replace"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_page_edit_toolbar_replace"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -96,14 +96,14 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_extract"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_page_edit_toolbar_extract"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -128,14 +128,14 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_copy"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_page_edit_toolbar_copy"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -160,14 +160,14 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_rotate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_page_edit_toolbar_rotate"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -192,14 +192,14 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_delete"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_page_edit_toolbar_delete"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?attr/colorOnPrimary"
 
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -79,4 +79,7 @@
     <color name="tools_dark_text_color_primary_inverse">#CC000000</color>
     <color name="tools_dark_reader_setting_head_bg_color">#303238</color>
 
+    <color name="tools_dark_style_content_bg">#414347</color>
+
+
 </resources>

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

@@ -153,7 +153,7 @@
         <item name="android:minHeight">40dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="layout_constraintHorizontal_weight">2</item>
-        <item name="android:textColor">@color/tools_themes_dark</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
 
@@ -163,7 +163,7 @@
         <item name="android:maxWidth">200dp</item>
         <item name="android:minHeight">40dp</item>
         <item name="android:gravity">center_vertical</item>
-        <item name="android:textColor">@color/tools_themes_dark</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="tools_dialog_theme" parent="Theme.AppCompat.Light.Dialog">
@@ -176,9 +176,13 @@
         <item name="colorAccent">@color/tools_color_accent</item>
     </style>
 
+    <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" parent="Widget.Design.BottomSheet.Modal" tools:ignore="ResourceName">
+    <style name="ComPDFKit.Theme.BottomSheetStyle.Transparent"  tools:ignore="ResourceName">
         <item name="android:background">@android:color/transparent</item>
-        <item name="android:maxWidth">@dimen/material_bottom_sheet_max_width</item>
     </style>
 </resources>

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

@@ -65,8 +65,9 @@
 
 
     <attr name="compdfkit_BottomSheetDialog_Transparent_Theme" format="reference" tools:ignore="ResourceName"/>
+    <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"/>
 
     <style name="ComPDFKit.Theme" parent="Theme.MaterialComponents.NoActionBar.Bridge" tools:ignore="ResourceName">
         <item name="colorPrimary">@color/tools_color_primary</item>
@@ -118,6 +119,7 @@
         <item name="colorPrimary">@color/tools_color_primary</item>
         <item name="colorOnPrimary">@color/tools_on_primary</item>
         <item name="android:textColorPrimary">@color/tools_text_color_primary</item>
+        <item name="android:colorBackground">@color/tools_color_background</item>
         <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>
@@ -128,34 +130,56 @@
         <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: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>
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog" tools:ignore="ResourceName">
-
+        <item name="bottomSheetStyle">@style/ComPDFKit.Theme.BottomSheetStyle</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>
+        <item name="compdfkit_PDFStyleDialog_ContentColor">@color/tools_dark_style_content_bg</item>
+        <item name="android:textColorPrimary">@color/tools_dark_text_color_primary</item>
+        <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="colorSecondary">@color/tools_dark_secondary</item>
+        <item name="hintTextColor">@color/tools_text_color_hint</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>
+        <item name="compdfkit_PDFStyleDialog_ContentColor">@color/tools_style_content_bg</item>
+        <item name="android:textColorPrimary">@color/tools_text_color_primary</item>
+        <item name="colorControlActivated">@color/tools_dark_color_accent</item>
+        <item name="colorControlNormal">?attr/colorOnPrimary</item>
+        <item name="colorAccent">@color/tools_color_accent</item>
+        <item name="colorSecondary">@color/tools_secondary</item>
+        <item name="hintTextColor">@color/tools_text_color_hint</item>
     </style>
 
-
-
     <style name="ComPDFKit.Theme.BottomSheetDialog.Dark.Transparent" tools:ignore="ResourceName">
-        <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Dark</item>
+        <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>
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Light.Transparent" tools:ignore="ResourceName">
-        <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Light</item>
+        <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</item>
     </style>