PDFTool(Android) - 暗黑模式部分icon调整

ComPDFKit_Tools/src/main/AndroidManifest.xml

@@ -4,8 +4,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <application android:supportsRtl="true"
-        android:theme="@style/ComPDFKit.Theme.Light">
+    <application android:supportsRtl="true">
 
         <provider
             android:name=".common.provider.ComPDFKitToolsFileProvider"

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfannotationlist/adapter/CPDFAnnotListAdapter.java

@@ -22,6 +22,7 @@ import com.compdfkit.tools.R;
 import com.compdfkit.tools.annotation.pdfannotationlist.bean.CPDFAnnotListItem;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.google.android.material.color.MaterialColors;
 
 import java.util.HashMap;
@@ -34,21 +35,37 @@ public class CPDFAnnotListAdapter  extends CBaseQuickAdapter<CPDFAnnotListItem,
     private static final int ITEM_CONTENT = 2;
 
     private static final HashMap<CPDFAnnotation.Type, Integer> ICON_RES_IDS = new HashMap<>();
+    private static final HashMap<CPDFAnnotation.Type, Integer> ICON_RES_IDS_DARK = new HashMap<>();
 
     static {
         ICON_RES_IDS.put(CPDFAnnotation.Type.TEXT, R.drawable.tools_ic_annotation_note);
-        ICON_RES_IDS.put(CPDFAnnotation.Type.HIGHLIGHT, R.drawable.tools_ic_annotation_highlight_default_bg);
-        ICON_RES_IDS.put(CPDFAnnotation.Type.UNDERLINE, R.drawable.tools_ic_annotation_underline_default_bg);
-        ICON_RES_IDS.put(CPDFAnnotation.Type.SQUIGGLY, R.drawable.tools_ic_annotation_squiggly_default_bg);
-        ICON_RES_IDS.put(CPDFAnnotation.Type.STRIKEOUT, R.drawable.tools_ic_annotation_strikeout_default_bg);
+        ICON_RES_IDS.put(CPDFAnnotation.Type.HIGHLIGHT, R.drawable.tools_ic_annotation_highlight_normal);
+        ICON_RES_IDS.put(CPDFAnnotation.Type.UNDERLINE, R.drawable.tools_ic_annotation_underline_normal);
+        ICON_RES_IDS.put(CPDFAnnotation.Type.SQUIGGLY, R.drawable.tools_ic_annotation_squiggly_normal);
+        ICON_RES_IDS.put(CPDFAnnotation.Type.STRIKEOUT, R.drawable.tools_ic_annotation_strikeout_normal);
         ICON_RES_IDS.put(CPDFAnnotation.Type.FREETEXT, R.drawable.tools_ic_annotation_freetext);
-        ICON_RES_IDS.put(CPDFAnnotation.Type.INK, R.drawable.tools_ic_annotation_ink_default_bg);
+        ICON_RES_IDS.put(CPDFAnnotation.Type.INK, R.drawable.tools_ic_annotation_ink_normal);
         ICON_RES_IDS.put(CPDFAnnotation.Type.LINE, R.drawable.tools_ic_annotation_shape_line);
         ICON_RES_IDS.put(CPDFAnnotation.Type.SQUARE, R.drawable.tools_ic_annotation_shape_rectangle);
         ICON_RES_IDS.put(CPDFAnnotation.Type.CIRCLE, R.drawable.tools_ic_annotation_shape_circular);
         ICON_RES_IDS.put(CPDFAnnotation.Type.STAMP, R.drawable.tools_ic_annotation_stamp);
         ICON_RES_IDS.put(CPDFAnnotation.Type.LINK, R.drawable.tools_ic_annotation_link);
         ICON_RES_IDS.put(CPDFAnnotation.Type.SOUND, R.drawable.tools_ic_annotation_sound);
+
+
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.TEXT, R.drawable.tools_ic_annotation_note);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.HIGHLIGHT, R.drawable.tools_ic_annotation_highlight_normal_dark_1);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.UNDERLINE, R.drawable.tools_ic_annotation_underline_normal_dark_1);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.SQUIGGLY, R.drawable.tools_ic_annotation_squiggly_normal_dark_1);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.STRIKEOUT, R.drawable.tools_ic_annotation_strikeout_normal_dark_1);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.FREETEXT, R.drawable.tools_ic_annotation_freetext);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.INK, R.drawable.tools_ic_annotation_ink_normal_dark_1);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.LINE, R.drawable.tools_ic_annotation_shape_line);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.SQUARE, R.drawable.tools_ic_annotation_shape_rectangle);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.CIRCLE, R.drawable.tools_ic_annotation_shape_circular);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.STAMP, R.drawable.tools_ic_annotation_stamp);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.LINK, R.drawable.tools_ic_annotation_link);
+        ICON_RES_IDS_DARK.put(CPDFAnnotation.Type.SOUND, R.drawable.tools_ic_annotation_sound);
     }
 
 
@@ -67,7 +84,12 @@ public class CPDFAnnotListAdapter  extends CBaseQuickAdapter<CPDFAnnotListItem,
             holder.setText(R.id.id_item_annot_head_page, String.valueOf(item.getPage() + 1));
             holder.setText(R.id.id_item_annot_count, String.valueOf(item.getAnnotationCount()));
         }else {
+            int isLightThemeValue = CViewUtils.getThemeAttrData(holder.itemView.getContext().getTheme(), R.attr.isLightTheme);
+            boolean isDarkTheme = isLightThemeValue == 0;
             Integer annotIcon = ICON_RES_IDS.get(item.getAnnotType());
+            if (isDarkTheme){
+                annotIcon = ICON_RES_IDS_DARK.get(item.getAnnotType());
+            }
             if (annotIcon != null) {
                 if (item.getAnnotType() == CPDFAnnotation.Type.LINE){
                     if (item.isArrowLine()){

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

@@ -658,15 +658,7 @@ public class CPDFDocumentFragment extends CBasicPDFFragment {
                             dismissLoadingDialog();
                             if (saveResult) {
                                 CToastUtil.showLongToast(getContext(), R.string.tools_save_success);
-                                Intent intent = new Intent(getContext(), CPDFDocumentActivity.class);
-                                intent.putExtra(CPDFDocumentFragment.EXTRA_FILE_PATH, finalFile.getAbsolutePath());
-                                intent.putExtra(CPDFDocumentFragment.EXTRA_FILE_PASSWORD, document.getPassword());
-                                intent.putExtra(CPDFDocumentFragment.EXTRA_CONFIGURATION, cpdfConfiguration);
-                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                getContext().startActivity(intent);
-                                if (getActivity() != null) {
-                                    getActivity().finish();
-                                }
+                                pdfView.openPDF(finalFile.getAbsolutePath());
                             }
                         });
                     } catch (Exception e) {

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

@@ -78,7 +78,13 @@ public class CPDFDisplaySettingDialogFragment extends BottomSheetDialogFragment
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(STYLE_NORMAL, CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Theme));
+        int themeId = R.style.ComPDFKit_Theme_BottomSheetDialog_Light_SettingsDialog;
+        int isLightThemeValue = CViewUtils.getThemeAttrData(getContext().getTheme(), R.attr.isLightTheme);
+        boolean isDarkTheme = isLightThemeValue == 0;
+        if (isDarkTheme){
+            themeId = R.style.ComPDFKit_Theme_BottomSheetDialog_Dark_SettingsDialog;
+        }
+        setStyle(STYLE_NORMAL, themeId);
     }
 
 

ComPDFKit_Tools/src/main/res/drawable-night/tools_ic_annotation_highlight_default_bg.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M24,0H0V24H24V0ZM22,4H4L2,20H20L22,4Z"
-        android:fillColor="#414347"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M17.6078,17.5L12.6964,5.2215H11.3036L6.3922,17.5H5V18.5H9V17.5H8.0078L9.1077,14.75H14.8923L15.9922,17.5H15V18.5H19V17.5H17.6078ZM14.4923,13.75L12,7.519L9.5077,13.75H14.4923Z"
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"/>
-</vector>

ComPDFKit_Tools/src/main/res/drawable-night/tools_ic_back.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20,11H7.83L13.42,5.41L12,4L4,12L12,20L13.41,18.59L7.83,13H20V11Z"
-      android:fillColor="#FFFFFF"/>
-</vector>

ComPDFKit_Tools/src/main/res/drawable-night/tools_ic_grey_oval_close.xml

@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="30dp"
-    android:height="30dp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-  <path
-      android:pathData="M15,30C23.284,30 30,23.284 30,15C30,6.716 23.284,0 15,0C6.716,0 0,6.716 0,15C0,23.284 6.716,30 15,30Z"
-      android:fillColor="#878C98"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.626,9.626C20.153,9.153 19.387,9.153 18.914,9.626L14.924,13.617L11.009,9.702C10.536,9.23 9.77,9.23 9.298,9.702C8.825,10.175 8.825,10.941 9.298,11.413L13.212,15.328L9.221,19.319C8.749,19.792 8.749,20.558 9.221,21.03C9.694,21.503 10.46,21.503 10.932,21.03L14.923,17.039L18.838,20.954C19.31,21.426 20.076,21.426 20.549,20.953C21.021,20.481 21.021,19.715 20.549,19.242L16.635,15.328L20.625,11.337C21.098,10.864 21.098,10.098 20.626,9.626Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>

ComPDFKit_Tools/src/main/res/drawable-night/tools_ic_pageedit_arrow_right.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M9.778,4L17.556,11.778L9.778,19.556"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#FFFFFF"/>
-</vector>

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

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+  <path
+      android:pathData="M24,0H0V24H24V0ZM22,4H4L2,20H20L22,4Z"
+      android:fillColor="#414347"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.6078,17.5L12.6964,5.2215H11.3036L6.3922,17.5H5V18.5H9V17.5H8.0078L9.1077,14.75H14.8923L15.9922,17.5H15V18.5H19V17.5H17.6078ZM14.4923,13.75L12,7.519L9.5077,13.75H14.4923Z"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+</vector>

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

@@ -3,6 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:theme="@style/ComPDFKit.Theme.BottomSheetDialog.Light.SettingsDialog"
     android:orientation="vertical">
 
     <com.compdfkit.tools.common.views.CToolBar
@@ -47,13 +49,13 @@
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_vertical"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_vertical_scrolling"
+                    android:drawableStart="?attr/compdfkit_setting_icon_vertical"
                     android:text="@string/tools_vertical_scrolling" />
 
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_horizontal"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_horizontal_scrolling"
+                    android:drawableStart="?attr/compdfkit_setting_icon_horizontal"
                     android:text="@string/tools_horizontal_scrolling" />
 
 
@@ -84,19 +86,19 @@
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_single_page"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_single_page"
+                    android:drawableStart="?attr/compdfkit_setting_icon_single_page"
                     android:text="@string/tools_single_page" />
 
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_double_page"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_double_page"
+                    android:drawableStart="?attr/compdfkit_setting_icon_double_page"
                     android:text="@string/tools_two_page" />
 
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_cover_double_page"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_page_cover"
+                    android:drawableStart="?attr/compdfkit_setting_icon_cover_double_page"
                     android:text="@string/tools_book_mode" />
 
             </RadioGroup>
@@ -118,7 +120,7 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/tools_ic_continuous"
+                    android:drawableStart="?attr/compdfkit_setting_icon_continuous_scroll"
                     android:drawablePadding="16dp"
                     android:text="@string/tools_continuous_scroll"
                     android:gravity="center_vertical"
@@ -149,7 +151,7 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/tools_ic_crop"
+                    android:drawableStart="?attr/compdfkit_setting_icon_crop"
                     android:drawablePadding="16dp"
                     android:text="@string/tools_crop"
                     android:gravity="center_vertical"
@@ -195,26 +197,26 @@
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_light_mode"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_theme_light"
+                    android:drawableStart="?attr/compdfkit_setting_icon_light_mode"
                     android:text="@string/tools_light_mode" />
 
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_dark_mode"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_theme_dark"
+                    android:drawableStart="?attr/compdfkit_setting_icon_dark_mode"
                     android:text="@string/tools_dark_mode" />
 
 
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_sepia_mode"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_theme_sepia"
+                    android:drawableStart="?attr/compdfkit_setting_icon_sepia_mode"
                     android:text="@string/tools_sepia_mode" />
 
                 <androidx.appcompat.widget.AppCompatRadioButton
                     android:id="@+id/r_btn_reseda_mode"
                     style="@style/tools_pdf_reader_mode_radio_button_style"
-                    android:drawableStart="@drawable/tools_ic_theme_reseda"
+                    android:drawableStart="?attr/compdfkit_setting_icon_reseda_mode"
                     android:text="@string/tools_reseda_mode" />
 
             </RadioGroup>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>

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

@@ -176,6 +176,8 @@
         <item name="switchStyle">@style/ComPDFKit.Theme.SwitchCompat</item>
         <item name="compdfkit_textColorPrimaryNoEnable">@color/tools_dark_icon_enable_color</item>
         <item name="compdfkit_tabLayoutStyle">@style/ComPDFKit.Theme.TabLayout</item>
+        <item name="isLightTheme">false</item>
+
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Light" tools:ignore="ResourceName">
@@ -193,6 +195,7 @@
         <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="isLightTheme">true</item>
 
     </style>
 
@@ -266,6 +269,45 @@
         <item name="android:thumb">@drawable/tools_seek_bar_thumb_drawable</item>
     </style>
 
+    <attr name="compdfkit_setting_icon_vertical" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_horizontal" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_single_page" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_double_page" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_cover_double_page" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_continuous_scroll" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_crop" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_light_mode" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_dark_mode" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_sepia_mode" format="reference" tools:ignore="ResourceName" />
+    <attr name="compdfkit_setting_icon_reseda_mode" format="reference" tools:ignore="ResourceName" />
+
+    <style name="ComPDFKit.Theme.BottomSheetDialog.Light.SettingsDialog"  tools:ignore="ResourceName" >
+        <item name="compdfkit_setting_icon_vertical">@drawable/tools_ic_vertical_scrolling</item>
+        <item name="compdfkit_setting_icon_horizontal">@drawable/tools_ic_horizontal_scrolling</item>
+        <item name="compdfkit_setting_icon_single_page">@drawable/tools_ic_single_page</item>
+        <item name="compdfkit_setting_icon_double_page">@drawable/tools_ic_double_page</item>
+        <item name="compdfkit_setting_icon_cover_double_page">@drawable/tools_ic_page_cover</item>
+        <item name="compdfkit_setting_icon_continuous_scroll">@drawable/tools_ic_continuous</item>
+        <item name="compdfkit_setting_icon_crop">@drawable/tools_ic_crop</item>
+        <item name="compdfkit_setting_icon_light_mode">@drawable/tools_ic_theme_light</item>
+        <item name="compdfkit_setting_icon_dark_mode">@drawable/tools_ic_theme_dark</item>
+        <item name="compdfkit_setting_icon_sepia_mode">@drawable/tools_ic_theme_sepia</item>
+        <item name="compdfkit_setting_icon_reseda_mode">@drawable/tools_ic_theme_reseda</item>
+    </style>
+
+    <style name="ComPDFKit.Theme.BottomSheetDialog.Dark.SettingsDialog"  tools:ignore="ResourceName" >
+        <item name="compdfkit_setting_icon_vertical">@drawable/tools_ic_vertical_scrolling_dark</item>
+        <item name="compdfkit_setting_icon_horizontal">@drawable/tools_ic_horizontal_scrolling_dark</item>
+        <item name="compdfkit_setting_icon_single_page">@drawable/tools_ic_single_page_dark</item>
+        <item name="compdfkit_setting_icon_double_page">@drawable/tools_ic_double_page_dark</item>
+        <item name="compdfkit_setting_icon_cover_double_page">@drawable/tools_ic_page_cover_dark</item>
+        <item name="compdfkit_setting_icon_continuous_scroll">@drawable/tools_ic_continuous_dark</item>
+        <item name="compdfkit_setting_icon_crop">@drawable/tools_ic_crop_dark</item>
+        <item name="compdfkit_setting_icon_light_mode">@drawable/tools_ic_theme_light_dark</item>
+        <item name="compdfkit_setting_icon_dark_mode">@drawable/tools_ic_theme_dark_dark</item>
+        <item name="compdfkit_setting_icon_sepia_mode">@drawable/tools_ic_theme_sepia_dark</item>
+        <item name="compdfkit_setting_icon_reseda_mode">@drawable/tools_ic_theme_reseda_dark</item>
 
+    </style>
 
 </resources>