PDFTool(Android) - CPDFDocumentFrament 主题适配 - 水印

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/security/watermark/CWatermarkEditDialog.java

@@ -115,7 +115,11 @@ public class CWatermarkEditDialog extends CBasicBottomSheetDialogFragment implem
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_FillScreen;
+        int themeId = CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Theme);
+        if (themeId == 0){
+            themeId  = R.style.ComPDFKit_Theme_BottomSheetDialog_Light;
+        }
+        return themeId;
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 <?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"/>
-    <stroke android:color="@color/tools_color_primary" android:width="2dp"/>
+    <stroke android:color="?android:attr/colorPrimary" android:width="2dp"/>
 </shape>

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

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

ComPDFKit_Tools/src/main/res/drawable/tools_properties_signature_add_sign.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_cpdf_security_watermark_edit_dialog.xml

@@ -30,7 +30,7 @@
                 android:gravity="center"
                 android:minWidth="70dp"
                 android:text="@string/tools_page_edit_toolbar_done"
-                android:textColor="@color/tools_color_accent"
+                android:textColor="?attr/colorAccent"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -44,7 +44,7 @@
                 android:layout_marginEnd="16dp"
                 android:background="@drawable/tools_common_btn_corner_ripple"
                 android:padding="4dp"
-                app:tint="@color/tools_text_color_primary"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/btn_done"
                 app:layout_constraintTop_toTopOf="parent"
@@ -59,12 +59,10 @@
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/tools_color_primary"
+        android:background="?android:attr/colorPrimary"
         android:elevation="4dp"
         app:layout_constraintTop_toBottomOf="@id/tool_bar"
-        app:tabIndicatorColor="@color/tools_color_accent"
-        app:tabSelectedTextColor="@color/tools_color_accent"
-        app:tabTextColor="@color/tools_text_color_primary" />
+        style="?attr/compdfkit_tabLayoutStyle" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager2"

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/tools_style_content_bg"
+    android:background="?attr/compdfkit_PDFStyleDialog_ContentColor"
     android:paddingHorizontal="8dp"
     android:orientation="vertical"
     android:gravity="center"

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

@@ -83,6 +83,7 @@
 
     <color name="tools_dark_style_content_bg">#414347</color>
     <color name="tools_dark_divider_color">#1AFFFFFF</color>
+    <color name="tools_dark_style_title_color">#CCCCCC</color>
 
 
 </resources>

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

@@ -132,11 +132,9 @@
     </style>
 
     <style name="tools_style_fragment_sub_title_style">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/tools_style_title_color</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginStart">16dp</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
     </style>
 
     <style name="tools_fade_anim_dialog_style">

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

@@ -91,19 +91,34 @@
         <item name="colorControlActivated">@color/tools_color_accent</item>
     </style>
 
-    <style name="ComPDFKit.Theme.TextAppearanceSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" tools:ignore="ResourceName">
+
+
+    <style name="ComPDFKit.Theme.TextAppearance.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" tools:ignore="ResourceName">
         <item name="android:lineSpacingExtra">5sp</item>
     </style>
 
-    <style name="ComPDFKit.Theme.TextAppearanceSubtitle1.Dark" tools:ignore="ResourceName">
+    <style name="ComPDFKit.Theme.TextAppearance.Subtitle1.Dark" tools:ignore="ResourceName">
         <item name="android:textColor">@color/tools_dark_subtitle_1_color</item>
     </style>
 
-    <style name="ComPDFKit.Theme.TextAppearanceSubtitle1.Light" tools:ignore="ResourceName">
+    <style name="ComPDFKit.Theme.TextAppearance.Subtitle1.Light" tools:ignore="ResourceName">
         <item name="android:textColor">@color/tools_subtitle_1_color</item>
     </style>
 
 
+    <style name="ComPDFKit.Theme.TextAppearance.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2" tools:ignore="ResourceName">
+        <item name="android:textColor">@color/tools_style_title_color</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.TextAppearance.Subtitle2.Dark" tools:ignore="ResourceName">
+        <item name="android:textColor">@color/tools_dark_style_title_color</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.TextAppearance.Subtitle2.Light" tools:ignore="ResourceName">
+    </style>
+
+
     <style name="ComPDFKit.Theme.TextAppearance.Headline6" parent="TextAppearance.MaterialComponents.Headline6" tools:ignore="ResourceName">
         <item name="android:lineSpacingExtra">5sp</item>
         <item name="android:textSize">22sp</item>
@@ -122,13 +137,15 @@
         <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="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearance.Subtitle1.Light</item>
+        <item name="textAppearanceSubtitle2">@style/ComPDFKit.Theme.TextAppearance.Subtitle2.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>
+        <item name="compdfkit_PDFStyleDialog_ContentColor">@color/tools_style_content_bg</item>
 
     </style>
 
@@ -138,13 +155,15 @@
         <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="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearance.Subtitle1.Dark</item>
+        <item name="textAppearanceSubtitle2">@style/ComPDFKit.Theme.TextAppearance.Subtitle2.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>
+        <item name="compdfkit_PDFStyleDialog_ContentColor">@color/tools_dark_style_content_bg</item>
 
 
     </style>
@@ -160,7 +179,8 @@
     <style name="ComPDFKit.Theme.BottomSheetDialog.Dark" tools:ignore="ResourceName">
         <item name="colorOnPrimary">@color/tools_dark_on_primary</item>
         <item name="colorPrimary">@color/tools_dark_color_primary</item>
-        <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Dark</item>
+        <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearance.Subtitle1.Dark</item>
+        <item name="textAppearanceSubtitle2">@style/ComPDFKit.Theme.TextAppearance.Subtitle2.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>
@@ -180,7 +200,8 @@
     <style name="ComPDFKit.Theme.BottomSheetDialog.Light" tools:ignore="ResourceName">
         <item name="colorOnPrimary">@color/tools_on_primary</item>
         <item name="colorPrimary">@color/tools_color_primary</item>
-        <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearanceSubtitle1.Light</item>
+        <item name="textAppearanceSubtitle1">@style/ComPDFKit.Theme.TextAppearance.Subtitle1.Light</item>
+        <item name="textAppearanceSubtitle2">@style/ComPDFKit.Theme.TextAppearance.Subtitle2.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>