PDFTool(Android) - CPDFDocumentFrament 主题适配 - 数字签名

ComPDFKit_Tools/src/main/assets/tools_default_configuration.json

@@ -257,6 +257,6 @@
     "pageSameWidth": true
   },
   "global" : {
-    "themeMode" : "dark"
+    "themeMode" : "light"
   }
 }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfformbar/adapter/CPDFFormToolListAdapter.java

@@ -24,6 +24,7 @@ import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;
 import com.compdfkit.tools.forms.pdfformbar.bean.CFormToolBean;
+import com.google.android.material.color.MaterialColors;
 
 import java.util.List;
 
@@ -41,7 +42,10 @@ public class CPDFFormToolListAdapter extends CBaseQuickAdapter<CFormToolBean, CB
     protected void onBindViewHolder(CBaseQuickViewHolder holder, int position, CFormToolBean item) {
         holder.setImageResource(R.id.iv_annot_type, item.getIconResId());
         CardView cardView = holder.getView(R.id.card_view);
-        cardView.setCardBackgroundColor(ContextCompat.getColor(holder.itemView.getContext(), item.isSelect() ? R.color.tools_annot_list_item_select_bg_color : R.color.tools_color_primary));
+        int selectColor = ContextCompat.getColor(holder.itemView.getContext(), R.color.tools_annot_list_item_select_bg_color);
+        int normalColor = MaterialColors.getColor(holder.itemView.getContext(), android.R.attr.colorPrimary,
+                ContextCompat.getColor(holder.itemView.getContext(), R.color.tools_color_primary));
+        cardView.setCardBackgroundColor(item.isSelect() ? selectColor : normalColor);
         refreshAnnotColor(holder, item);
         holder.setItemHorizontalMargin(list, 16, 0, 16);
     }
@@ -54,7 +58,10 @@ public class CPDFFormToolListAdapter extends CBaseQuickAdapter<CFormToolBean, CB
             for (Object payload : payloads) {
                 if (payload == REFRESH_ITEM) {
                     CardView cardView = holder.getView(R.id.card_view);
-                    cardView.setCardBackgroundColor(ContextCompat.getColor(holder.itemView.getContext(), item.isSelect() ? R.color.tools_annot_list_item_select_bg_color : R.color.tools_color_primary));
+                    int selectColor = ContextCompat.getColor(holder.itemView.getContext(), R.color.tools_annot_list_item_select_bg_color);
+                    int normalColor = MaterialColors.getColor(holder.itemView.getContext(), android.R.attr.colorPrimary,
+                            ContextCompat.getColor(holder.itemView.getContext(), R.color.tools_color_primary));
+                    cardView.setCardBackgroundColor(item.isSelect() ? selectColor : normalColor);
                     refreshAnnotColor(holder, item);
                 }
             }
@@ -67,7 +74,7 @@ public class CPDFFormToolListAdapter extends CBaseQuickAdapter<CFormToolBean, CB
         if (item.isSelect()) {
             holder.setImageTintList(R.id.iv_annot_type, ColorStateList.valueOf(ContextCompat.getColor(context, R.color.tools_annot_icon_select_color)));
         } else {
-            holder.setImageTintList(R.id.iv_annot_type, ColorStateList.valueOf(ContextCompat.getColor(context, R.color.tools_text_color_primary)));
+            holder.setImageTintList(R.id.iv_annot_type, ColorStateList.valueOf(MaterialColors.getColor(context, R.attr.colorOnPrimary, ContextCompat.getColor(context, R.color.tools_text_color_primary))));
         }
     }
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/forms/pdfproperties/option/select/CFormOptionSelectDialogFragment.java

@@ -56,7 +56,7 @@ public class CFormOptionSelectDialogFragment extends CBasicBottomSheetDialogFrag
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_TopCorners;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Transparent_Theme);
     }
 
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CImportCertificateDigitalDialog.java

@@ -115,7 +115,7 @@ public class CImportCertificateDigitalDialog extends CBasicBottomSheetDialogFrag
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_TopCorners;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Transparent_Theme);
     }
 
     @Override

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CPDFSelectDigitalSignatureDialog.java

@@ -31,7 +31,9 @@ import androidx.fragment.app.Fragment;
 
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.annotation.pdfproperties.pdfsignature.CAddSignatureActivity;
+import com.compdfkit.tools.common.pdf.CPDFApplyConfigUtil;
 import com.compdfkit.tools.common.utils.CFileUtils;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.signature.interfaces.COnSelectCertFileListener;
 
 public class CPDFSelectDigitalSignatureDialog extends DialogFragment implements View.OnClickListener {
@@ -77,6 +79,7 @@ public class CPDFSelectDigitalSignatureDialog extends DialogFragment implements
         intent.putExtra(CAddSignatureActivity.EXTRA_TITLE, getString(R.string.tools_customize_the_signature_appearance));
         intent.putExtra(CAddSignatureActivity.EXTRA_SCREEN_ORIENTATION, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         intent.putExtra(CAddSignatureActivity.EXTRA_HIDE_TYPEFACE, true);
+        intent.putExtra(CAddSignatureActivity.EXTRA_THEME_ID, CPDFApplyConfigUtil.getInstance().getThemeId());
         addSignatureLauncher.launch(intent);
     }
 
@@ -99,7 +102,7 @@ public class CPDFSelectDigitalSignatureDialog extends DialogFragment implements
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, R.style.tools_dialog_theme);
+        setStyle(STYLE_NO_TITLE, CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.dialogTheme));
     }
 
     @Nullable

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CSelectSignTypeDialog.java

@@ -22,6 +22,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
 import com.compdfkit.tools.R;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 
 public class CSelectSignTypeDialog extends DialogFragment implements View.OnClickListener {
 
@@ -46,7 +47,7 @@ public class CSelectSignTypeDialog extends DialogFragment implements View.OnClic
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, R.style.tools_dialog_theme);
+        setStyle(STYLE_NO_TITLE, CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.dialogTheme));
     }
 
     @Nullable

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/importcert/create/CreateCertificateDigitalDialog.java

@@ -29,6 +29,7 @@ import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.SwitchCompat;
 
 import com.compdfkit.core.signature.CPDFOwnerInfo;
 import com.compdfkit.core.signature.CPDFSignature;
@@ -40,6 +41,7 @@ import com.compdfkit.tools.common.utils.CToastUtil;
 import com.compdfkit.tools.common.utils.activitycontracts.CMultiplePermissionResultLauncher;
 import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
 import com.compdfkit.tools.common.utils.view.CEditText;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.common.views.directory.CFileDirectoryDialog;
 import com.compdfkit.tools.signature.CertificateDigitalDatas;
 import com.compdfkit.tools.signature.importcert.create.adapter.CountryReginSpinnerAdapter;
@@ -69,7 +71,7 @@ public class CreateCertificateDigitalDialog extends CBasicBottomSheetDialogFragm
 
     private AppCompatSpinner spinnerPurpose;
 
-    private Switch swSaveToFile;
+    private SwitchCompat swSaveToFile;
 
     private AppCompatButton btnOk;
 
@@ -110,7 +112,7 @@ public class CreateCertificateDigitalDialog extends CBasicBottomSheetDialogFragm
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_TopCorners;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Transparent_Theme);
     }
 
     @NonNull

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertDetailsDialog.java

@@ -58,7 +58,7 @@ public class CertDetailsDialog 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/signature/info/CertDetailsListAdapter.java

@@ -25,6 +25,7 @@ import com.compdfkit.tools.common.utils.adapter.CBaseQuickAdapter;
 import com.compdfkit.tools.common.utils.adapter.CBaseQuickViewHolder;
 import com.compdfkit.tools.common.utils.viewutils.CDimensUtils;
 import com.compdfkit.tools.signature.bean.CPDFOwnerItemData;
+import com.google.android.material.color.MaterialColors;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,7 +53,10 @@ public class CertDetailsListAdapter extends CBaseQuickAdapter<CPDFOwnerItemData,
         holder.setText(R.id.tv_item_title, item.getContent());
         ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) holder.getView(R.id.iv_item_arrow).getLayoutParams();
         layoutParams.setMarginStart(getLevelMargin(holder.itemView.getContext(), position +1));
-        holder.setBackgroundColor(R.id.cl_root, ContextCompat.getColor(holder.itemView.getContext(), position == 0 ? R.color.tools_reader_setting_head_bg_color : R.color.tools_color_background));
+        holder.setBackgroundColor(R.id.cl_root, MaterialColors.getColor(holder.itemView.getContext(), position == 0 ?
+                R.attr.compdfkit_HeadItem_BackgroundColor : android.R.attr.colorBackground,
+                ContextCompat.getColor(holder.itemView.getContext(), R.color.tools_color_background)));
+
         AppCompatTextView title = holder.getView(R.id.tv_item_title);
         title.setTypeface(position == 0 ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
         holder.setImageResource(R.id.iv_item_arrow, item.isExpanded() ? R.drawable.tools_ic_arrow_down : R.drawable.tools_ic_right);

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertDigitalSignAttributesDialog.java

@@ -64,11 +64,6 @@ public class CertDigitalSignAttributesDialog extends CBasicBottomSheetDialogFrag
         this.signature = signature;
     }
 
-    @Override
-    protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
-    }
-
     @Override
     protected boolean fullScreen() {
         return true;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/CertDigitalSignInfoDialog.java

@@ -29,6 +29,7 @@ import com.compdfkit.tools.common.basic.fragment.CBasicBottomSheetDialogFragment
 import com.compdfkit.tools.common.interfaces.COnDialogDismissListener;
 import com.compdfkit.tools.common.utils.date.CDateUtil;
 import com.compdfkit.tools.common.utils.threadpools.CThreadPoolUtils;
+import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 import com.compdfkit.tools.signature.CertificateDigitalDatas;
 import com.compdfkit.tools.signature.bean.CPDFSignatureStatusInfo;
 
@@ -71,7 +72,7 @@ public class CertDigitalSignInfoDialog extends CBasicBottomSheetDialogFragment i
 
     @Override
     protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle_TopCorners;
+        return CViewUtils.getThemeAttrResourceId(getContext().getTheme(), R.attr.compdfkit_BottomSheetDialog_Transparent_Theme);
     }
 
     @Override

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/info/signlist/CPDFCertDigitalSignListDialog.java

@@ -54,11 +54,6 @@ public class CPDFCertDigitalSignListDialog extends CBasicBottomSheetDialogFragme
         return fragment;
     }
 
-    @Override
-    protected int getStyle() {
-        return R.style.Tools_Base_Theme_BasicBottomSheetDialogStyle;
-    }
-
     @Override
     protected boolean fullScreen() {
         return true;

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/preview/CDigitalSignStylePreviewDialog.java

@@ -123,7 +123,7 @@ public class CDigitalSignStylePreviewDialog extends CBasicBottomSheetDialogFragm
 
     @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/signature/preview/view/CSignStylePositionView.java

@@ -18,6 +18,7 @@ import android.widget.Switch;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SwitchCompat;
 
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.interfaces.COnTextChangedListener;
@@ -27,7 +28,7 @@ import com.compdfkit.tools.common.utils.viewutils.CViewUtils;
 
 public class CSignStylePositionView extends FrameLayout {
 
-    private Switch swPosition;
+    private SwitchCompat swPosition;
 
     private CEditText etPosition;
 

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/signature/preview/view/CSignStyleReasonView.java

@@ -20,12 +20,13 @@ import android.widget.Switch;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SwitchCompat;
 
 import com.compdfkit.tools.R;
 
 public class CSignStyleReasonView extends FrameLayout {
 
-    private Switch swReason;
+    private SwitchCompat swReason;
 
     private RadioGroup rgReason;
 

ComPDFKit_Tools/src/main/res/color/tools_annotation_format_align_color.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent" android:state_checked="true"/>
-    <item android:color="?android:attr/colorControlHighlight"/>
-</selector>

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_directory_item_title_color" android:state_selected="true"/>
     <item android:color="?android:attr/textColorPrimary"/>
 </selector>

ComPDFKit_Tools/src/main/res/color/tools_signature_iv_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_color_primary" android:state_selected="true"/>
-    <item android:color="@color/tools_color_accent"/>
+    <item android:color="?attr/colorPrimary" android:state_selected="true"/>
+    <item android:color="?android:attr/textColorPrimary"/>
 </selector>

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

@@ -3,7 +3,7 @@
 
     <item>
         <shape>
-            <stroke android:color="@color/tools_control_line_color" android:width="1dp"/>
+            <stroke android:color="?attr/dividerColor" android:width="1dp"/>
         </shape>
     </item>
 </selector>

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

@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item >
         <shape >
-            <solid android:color="@color/tools_text_color_primary_inverse"/>
-            <stroke android:color="@color/tools_error" android:width="2dp"/>
+            <solid android:color="?android:attr/textColorPrimaryInverse"/>
+            <stroke android:color="?attr/colorError" android:width="2dp"/>
         </shape>
     </item>
 </selector>

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

@@ -4,12 +4,15 @@
         <shape>
 
             <stroke android:width="2dp" android:color="?attr/colorAccent" />
+            <solid android:color="?attr/colorOnSecondary"/>
         </shape>
     </item>
     <item>
         <shape>
 
             <stroke android:width="1px" android:color="?attr/dividerColor" />
+            <solid android:color="?attr/colorOnSecondary"/>
+            
         </shape>
     </item>
 </selector>

ComPDFKit_Tools/src/main/res/drawable/tools_context_menu_window.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_color_background"/>
+    <solid android:color="?android:attr/colorBackground"/>
     <corners android:radius="@dimen/reader_context_menu_text_box_radius"/>
 </shape>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/tools_ic_format_align_center" android:state_checked="true"/>
-    <item android:drawable="@drawable/tools_ic_format_align_center"/>
-</selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/tools_ic_format_align_left" android:state_checked="true"/>
-    <item android:drawable="@drawable/tools_ic_format_align_left"/>
-</selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/tools_ic_format_align_right" android:state_checked="true"/>
-    <item android:drawable="@drawable/tools_ic_format_align_right"/>
-</selector>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="@color/tools_color_accent"
+<vector android:height="24dp" android:tint="?attr/colorAccent"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/tools_annotation_format_align_color" android:pathData="M7,15v2h10v-2L7,15zM3,21h18v-2L3,19v2zM3,13h18v-2L3,11v2zM7,7v2h10L17,7L7,7zM3,3v2h18L21,3L3,3z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/tools_annotation_format_align_color" android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/tools_annotation_format_align_color" android:pathData="M3,21h18v-2L3,19v2zM9,17h12v-2L9,15v2zM3,13h18v-2L3,11v2zM9,9h12L21,7L9,7v2zM3,3v2h18L21,3L3,3z"/>
-</vector>

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

@@ -11,7 +11,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
-            <solid android:color="@color/tools_color_primary" />
+            <solid android:color="?attr/colorPrimary" />
         </shape>
     </item>
 

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

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

ComPDFKit_Tools/src/main/res/drawable/tools_thumbnail_item_page_tv_bg_select.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_color_accent"/>
+    <solid android:color="?attr/colorAccent"/>
     <corners android:radius="2dp"/>
 </shape>

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

@@ -3,13 +3,13 @@
 
     <item android:state_enabled="false">
         <shape>
-            <solid android:color="#DDE9FF" />
+            <solid android:color="@color/tools_annot_list_item_select_bg_color" />
         </shape>
     </item>
 
     <item>
         <shape>
-            <solid android:color="@color/tools_color_accent" />
+            <solid android:color="?attr/colorAccent" />
         </shape>
     </item>
 

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/back"
     android:layout_width="60dp"
     android:layout_height="30dp"
     android:foregroundGravity="center"
+    app:tint="?attr/colorOnPrimary"
     android:src="@drawable/tools_ic_back" />
 

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

@@ -4,6 +4,6 @@
     style="@style/tools_context_menu_item_style"
     android:minWidth="50dp"
     android:gravity="center"
-    android:textColor="@color/tools_text_color_primary"
+    android:textColor="?android:attr/textColorPrimary"
     android:text="@string/contextmenu_copy" />
 

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

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Tools_Base_Theme"
     android:layout_width="wrap_content"
     android:orientation="horizontal"
     android:id="@+id/ll_menu"
     android:gravity="center_vertical"
     android:layout_height="?android:attr/actionBarSize"
-    android:layout_gravity="center_vertical"
-    android:theme="@style/Tools_Base_Theme">
+    android:layout_gravity="center_vertical">
 
 <!--    <androidx.appcompat.widget.AppCompatImageView-->
 <!--        android:id="@+id/iv_tool_bar_thumbnail"-->

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

@@ -2,6 +2,8 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -62,7 +64,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/tools_ic_edit_left_rotate"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -72,7 +74,7 @@
                 android:layout_marginStart="8dp"
                 android:gravity="center_vertical"
                 android:text="@string/tools_edit_image_property_rotate_left"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintBottom_toBottomOf="@id/iv_left_rotate"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_chainStyle="spread"
@@ -104,7 +106,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/tools_ic_edit_right_rotate"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_right_rotate"
@@ -113,7 +115,7 @@
                 android:layout_marginStart="8dp"
                 android:gravity="center_vertical"
                 android:text="@string/tools_edit_image_property_rotate_right"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintBottom_toBottomOf="@id/iv_right_rotate"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_chainStyle="spread"
@@ -218,7 +220,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/tools_ic_edit_replace"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_replace"
@@ -227,7 +229,7 @@
                 android:layout_marginStart="4dp"
                 android:foreground="@drawable/tools_common_btn_rectangle_ripple"
                 android:text="@string/tools_edit_image_property_replace"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="13sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -260,9 +262,8 @@
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-
                 app:srcCompat="@drawable/tools_ic_edit_export"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?android:attr/textColorPrimary" />
 
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -271,7 +272,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
                 android:text="@string/tools_edit_image_property_export"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="13sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -304,7 +305,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/tools_ic_edit_crop"
-                app:tint="@color/tools_text_color_primary" />
+                app:tint="?attr/colorOnPrimary" />
 
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -315,7 +316,7 @@
                 android:layout_marginStart="4dp"
                 android:gravity="center_vertical"
                 android:text="@string/tools_edit_image_property_crop"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="13sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:clickable="true"
     android:focusable="true"
-    android:background="@color/tools_color_primary"
+    android:background="?attr/colorPrimary"
     tools:layout_height="?android:attr/actionBarSize">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -24,7 +24,6 @@
             android:id="@+id/iv_edit_text"
             style="@style/tools_annotation_tool_bar_item_iv_style"
             android:layout_marginHorizontal="12dp"
-
             android:background="@drawable/tools_edit_properties_icon_btn_corner_status_bg"
             android:padding="3dp"
             app:layout_constraintTop_toTopOf="parent"
@@ -58,7 +57,7 @@
         android:id="@+id/ll_tools"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@color/tools_color_primary"
+        android:background="?attr/colorPrimary"
         android:gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -75,7 +74,7 @@
             android:layout_width="1dp"
             android:layout_height="20dp"
             android:layout_marginStart="4dp"
-            android:background="@color/tools_control_line_color"
+            android:background="?attr/dividerColor"
             />
 
 

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

@@ -6,7 +6,7 @@
     android:clickable="true"
     android:focusable="true"
     android:layout_height="?android:attr/actionBarSize"
-    android:background="@color/tools_color_primary"
+    android:background="?attr/colorPrimary"
     android:elevation="4dp">
 
     <androidx.recyclerview.widget.RecyclerView
@@ -25,7 +25,7 @@
         android:id="@+id/ll_form_attr"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@color/tools_color_primary"
+        android:background="?attr/colorPrimary"
         android:gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -41,7 +41,7 @@
             android:layout_width="1dp"
             android:layout_height="20dp"
             android:layout_marginStart="4dp"
-            android:background="@color/tools_control_line_color"
+            android:background="?attr/dividerColor"
             />
 
     </LinearLayout>

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    tools:background="?android:attr/colorBackground"
     android:layout_marginHorizontal="16dp">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -12,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         tools:text="@tools:sample/first_names"
-        android:textColor="@color/tools_text_color_disable"
+        android:textAppearance="?attr/textAppearanceSubtitle2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -25,7 +26,7 @@
         android:visibility="gone"
         app:layout_constraintBaseline_toBaselineOf="@id/tv_title"
         app:layout_constraintStart_toEndOf="@id/tv_title"
-        android:textColor="@color/tools_error"
+        android:textColor="?attr/colorError"
         app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -36,12 +37,12 @@
         android:layout_marginTop="8dp"
         android:background="@drawable/tools_bg_import_certificate_digital_id_item"
         android:ellipsize="end"
-        android:textColorHint="@color/tools_text_color_secondary"
+        android:textColorHint="?attr/hintTextColor"
         android:paddingHorizontal="8dp"
         android:singleLine="true"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="14sp"
-        app:drawableTint="@color/tools_text_color_primary"
+        app:drawableTint="?attr/colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_title"

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

@@ -1,8 +1,10 @@
 <?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">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_rootView"
@@ -23,29 +25,29 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
+            android:title="@string/tools_line_color"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/text_field_view"
-            android:title="@string/tools_line_color" />
+            app:layout_constraintTop_toBottomOf="@id/text_field_view" />
 
 
         <com.compdfkit.tools.common.views.pdfproperties.colorlist.ColorListView
             android:id="@+id/background_color_list_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:title="@string/tools_background_color"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/border_color_list_view"
-            android:title="@string/tools_background_color" />
+            app:layout_constraintTop_toBottomOf="@id/border_color_list_view" />
 
         <com.compdfkit.tools.common.views.pdfproperties.colorlist.ColorListView
             android:id="@+id/check_color_list_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:title="@string/tools_check_color"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/background_color_list_view"
-            android:title="@string/tools_check_color" />
+            app:layout_constraintTop_toBottomOf="@id/background_color_list_view" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -64,7 +66,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="0dp"
                 android:text="@string/tools_button_style"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -89,7 +91,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@id/iv_check_style_arrow"
                     app:srcCompat="@drawable/tools_ic_check_box_check"
-                    app:tint="@color/tools_text_color_primary" />
+                    app:tint="?attr/colorOnPrimary" />
 
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -102,7 +104,7 @@
                     app:layout_constraintStart_toEndOf="@id/iv_check_box"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/tools_ic_grey_arrow"
-                    app:tint="@color/tools_text_color_primary" />
+                    app:tint="?attr/colorOnPrimary" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -25,7 +25,7 @@
         app:layout_constraintStart_toEndOf="@id/iv_check_box_status"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_check_box_check"
-        app:tint="@color/tools_text_color_primary" />
+        app:tint="?android:attr/textColorPrimary" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
         android:layout_marginStart="8dp"
         android:id="@+id/tv_check_box"
         tools:text="Check"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,6 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="wrap_content">
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="match_parent">
 
     <com.compdfkit.tools.common.views.CToolBar
@@ -33,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="40dp"
-        android:backgroundTint="@color/tools_color_accent"
+        android:backgroundTint="?attr/colorAccent"
         android:src="@drawable/tools_ic_add"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -5,7 +5,7 @@
     android:id="@+id/cl_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/tools_color_background"
+    android:background="?android:attr/colorBackground"
     android:foreground="@drawable/tools_common_btn_rectangle_ripple">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -16,6 +16,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:padding="4dp"
+        app:tint="?attr/colorOnPrimary"
         android:background="@drawable/tools_common_btn_corner_ripple"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_drag" />
@@ -27,7 +28,7 @@
         android:layout_marginVertical="16dp"
         android:layout_marginStart="16dp"
         android:maxLines="1"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/iv_more"
@@ -47,13 +48,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tools_ic_more_vertical"
-        app:tint="@color/tools_on_primary" />
+        app:tint="?attr/colorOnPrimary" />
 
 
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/tools_control_line_color"
+        android:background="?attr/dividerColor"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -26,7 +26,7 @@
         android:layout_marginStart="8dp"
         android:id="@+id/tv_check_box"
         tools:text="@tools:sample/cities"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?attr/colorOnPrimary"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="44dp"
-        android:background="@color/tools_style_content_bg"
+        android:background="?attr/compdfkit_PDFStyleDialog_ContentColor"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:paddingBottom="16dp"

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:background="?android:attr/colorBackground"
     tools:layout_height="48dp">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -23,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        style="?attr/switchStyle"
+        android:checked="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -23,8 +23,8 @@
         android:background="@drawable/tools_style_text_stamp_edit_text_bg"
         android:paddingHorizontal="8dp"
         android:paddingVertical="6dp"
-        android:textColor="@color/tools_text_color_primary"
-        android:textColorHint="@color/tools_text_color_hint"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textColorHint="?android:attr/textColorHint"
         android:textSize="13sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -2,6 +2,8 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -143,9 +145,10 @@
             android:gravity="top|start"
             android:padding="4dp"
             android:scrollbars="vertical"
-            android:textColor="@color/tools_text_color_primary"
-            android:textColorHint="@color/tools_text_color_hint"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textColorHint="?android:attr/textColorHint"
             android:textSize="13sp"
+            tools:text="ComPDFKit"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_default_value" />

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="match_parent">
 
     <com.compdfkit.tools.common.views.CToolBar
@@ -18,6 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:visibility="invisible"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tool_bar"
         tools:listitem="@layout/tools_sign_cert_digital_sign_list_item" />
@@ -27,6 +29,7 @@
         android:id="@+id/progress_bar"
         android:layout_width="50dp"
         android:layout_height="50dp"
+
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
+    tools:background="?android:attr/colorBackground"
     android:layout_marginTop="16dp"
-
     android:background="@drawable/tools_style_signature_list_item_bg"
     android:foreground="@drawable/tools_common_btn_rectangle_ripple">
 
@@ -36,7 +36,7 @@
         android:layout_marginTop="4dp"
         android:lineSpacingMultiplier="1.2"
         android:text="@string/tools_signed_by"
-        android:textColor="@color/tools_on_primary"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/iv_icon"
@@ -49,7 +49,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="40dp"
         android:lineSpacingMultiplier="1.2"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBaseline_toBaselineOf="@id/tv_sign_common_name_title"
         app:layout_constraintEnd_toEndOf="parent"
@@ -64,7 +64,7 @@
         android:layout_marginTop="4dp"
         android:lineSpacingMultiplier="1.2"
         android:text="@string/tools_date_"
-        android:textColor="@color/tools_on_primary"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="@id/tv_sign_common_name_title"
@@ -77,7 +77,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="40dp"
         android:lineSpacingMultiplier="1.2"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBaseline_toBaselineOf="@id/tv_sign_date_title"
         app:layout_constraintEnd_toEndOf="parent"
@@ -93,7 +93,7 @@
         android:layout_marginTop="4dp"
         android:lineSpacingMultiplier="1.2"
         android:text="@string/tools_status"
-        android:textColor="@color/tools_on_primary"
+        android:textColor="?attr/colorOnPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="@id/tv_sign_common_name_title"
@@ -107,7 +107,7 @@
         android:layout_marginEnd="40dp"
         android:layout_marginBottom="16dp"
         android:lineSpacingMultiplier="1.2"
-        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"
@@ -115,7 +115,7 @@
         app:layout_constraintStart_toEndOf="@id/barrier"
         app:layout_constraintTop_toTopOf="@id/tv_sign_status_title"
         app:layout_constraintVertical_bias="0"
-        tools:text="@string/tools_sign_is_valid_info" />
+        tools:text="ComPDFKit" />
 
 
     <androidx.appcompat.widget.AppCompatImageView

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

@@ -13,7 +13,7 @@
         android:text="@string/tools_version"
         android:textStyle="bold"
         android:textSize="16sp"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="16dp"
         app:layout_constraintHorizontal_bias="0"

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

@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:text="@string/tools_version"
         android:textStyle="bold"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="16dp"
         app:layout_constraintEnd_toEndOf="@id/guide"
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="24dp"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         android:layout_marginEnd="16dp"
         app:layout_constraintBaseline_toBaselineOf="@id/tv_attr_title"

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

@@ -2,6 +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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="wrap_content"
     android:layout_marginVertical="16dp">
 
@@ -12,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:text="@string/tools_cert_is_trusted_to"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintHorizontal_bias="0"
@@ -32,7 +34,7 @@
         android:paddingStart="8dp"
         android:text="@string/tools_trusted_1"
         app:layout_constrainedWidth="true"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +48,7 @@
         android:layout_marginStart="24dp"
         android:focusable="false"
         android:layout_marginTop="8dp"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         android:clickable="false"
         android:button="@drawable/tools_ic_cert_trusted_checkbox_radio"
         android:paddingStart="8dp"
@@ -70,7 +72,7 @@
         android:gravity="center"
         android:text="@string/tools_add_to_trusted_cert"
         android:textAllCaps="false"
-        android:textColor="@color/tools_color_accent"
+        android:textColor="?attr/colorAccent"
         android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -21,7 +21,7 @@
         app:srcCompat="@drawable/tools_ic_right"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintHorizontal_bias="0"
-        app:tint="@color/tools_text_color_primary"
+        app:tint="?attr/colorOnPrimary"
         app:layout_constraintEnd_toStartOf="@id/tv_item_title"
         tools:visibility="visible" />
 
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:paddingVertical="8dp"
-        android:textColor="@color/tools_text_color_secondary"
+        android:textColor="?android:attr/textColorSecondary"
         android:textSize="14sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -28,12 +28,12 @@
                 android:id="@+id/tv_sign_message"
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
-                android:background="@color/tools_reader_setting_head_bg_color"
+                android:background="?attr/compdfkit_HeadItem_BackgroundColor"
                 android:gravity="center_vertical"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:text="@string/tools_annot_signature"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="12sp"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -51,7 +51,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_signer"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_sign_message" />
 
@@ -62,7 +62,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:gravity="end"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBaseline_toBaselineOf="@id/tv_sign_founder_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -85,7 +85,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_signing_time"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/view_line" />
 
@@ -96,7 +96,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBaseline_toBaselineOf="@id/tv_date_of_sign_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -110,12 +110,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="28dp"
                 android:layout_marginTop="16dp"
-                android:background="@color/tools_reader_setting_head_bg_color"
+                android:background="?attr/compdfkit_HeadItem_BackgroundColor"
                 android:gravity="center_vertical"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:text="@string/tools_cert_auth_statement"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="12sp"
                 app:layout_constraintTop_toBottomOf="@id/tv_date_of_sign_title" />
 
@@ -126,7 +126,7 @@
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="16dp"
                 app:layout_constrainedWidth="true"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent"
@@ -145,7 +145,7 @@
                 android:gravity="center"
                 android:text="@string/tools_view_cert"
                 android:textAllCaps="false"
-                android:textColor="@color/tools_color_accent"
+                android:textColor="?attr/colorAccent"
                 android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"

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

@@ -2,6 +2,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="?android:attr/colorBackground"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -15,11 +17,11 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
-            android:background="@color/tools_reader_setting_head_bg_color"
+            android:background="?attr/compdfkit_HeadItem_BackgroundColor"
             android:lineSpacingMultiplier="1.25"
             android:padding="16dp"
             android:text="@string/tools_create_certificate_digital_id_desc"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -75,7 +77,7 @@
                 android:layout_marginStart="16dp"
                 android:paddingTop="16dp"
                 android:text="@string/tools_country_region"
-                android:textColor="@color/tools_text_color_disable"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintEnd_toEndOf="parent"
 
                 app:layout_constraintHorizontal_bias="0"
@@ -89,7 +91,7 @@
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="8dp"
                 android:background="@drawable/tools_bg_import_certificate_digital_id_item"
-                android:dropDownSelector="@color/tools_color_primary"
+                android:dropDownSelector="?attr/colorPrimary"
                 android:foreground="@drawable/tools_common_btn_rectangle_ripple"
                 android:paddingHorizontal="16dp"
                 android:paddingStart="0dp"
@@ -107,7 +109,7 @@
                 android:layout_marginStart="16dp"
                 android:paddingTop="16dp"
                 android:text="@string/tools_purpose"
-                android:textColor="@color/tools_text_color_disable"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -120,7 +122,7 @@
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="8dp"
                 android:background="@drawable/tools_bg_import_certificate_digital_id_item"
-                android:dropDownSelector="@color/tools_color_primary"
+                android:dropDownSelector="?attr/colorPrimary"
                 android:foreground="@drawable/tools_common_btn_rectangle_ripple"
                 android:paddingHorizontal="16dp"
                 android:paddingStart="0dp"
@@ -140,16 +142,17 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="24dp"
             android:text="@string/tools_save_to_file"
-            android:textColor="@color/tools_text_color_disable"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_content" />
 
-        <Switch
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/sw_save_to_file"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:checked="true"
+            android:theme="@style/Tools_MySwitch"
             app:layout_constraintBottom_toBottomOf="@id/tv_save_to_file"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_save_to_file" />

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

@@ -2,6 +2,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="?android:attr/colorBackground"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -16,11 +18,11 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
-            android:background="@color/tools_reader_setting_head_bg_color"
+            android:background="?attr/compdfkit_HeadItem_BackgroundColor"
             android:lineSpacingMultiplier="1.25"
             android:padding="16dp"
             android:text="@string/tools_certificate_digital_id_save_info"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -52,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools_save_location"
-                android:textColor="@color/tools_text_color_disable"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintStart_toStartOf="@id/tv_save_desc" />
 
 
@@ -67,7 +69,7 @@
                 android:gravity="center_vertical"
                 android:paddingHorizontal="8dp"
                 android:singleLine="true"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -102,7 +104,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:text="@string/tools_confirm_password_error"
-            android:textColor="@color/tools_error"
+            android:textColor="?attr/colorError"
             android:visibility="gone"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -9,6 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/tools_dialog_layout_width"
         android:layout_height="wrap_content"
+        tools:background="?android:attr/colorBackground"
         android:paddingTop="24dp"
         android:paddingBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -22,7 +23,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:layout_marginHorizontal="24dp"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             android:textSize="16sp"
             app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/rb_import_digital_sign"
                 android:checked="true"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:text="@string/tools_use_a_digital_id_from_a_file"
                 />
 
@@ -55,7 +56,7 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/rb_new_digital_sign"
                 android:layout_marginTop="8dp"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:text="@string/tools_create_a_new_digital_id"
                 />
 

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

@@ -29,11 +29,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="16dp"
-                android:background="@color/tools_reader_setting_head_bg_color"
+                android:background="?attr/compdfkit_HeadItem_BackgroundColor"
                 android:lineSpacingMultiplier="1.25"
                 android:padding="16dp"
                 android:text="@string/tools_import_digital_desc"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textSize="12sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +46,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_certificate_file"
-                android:textColor="@color/tools_text_color_disable"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_import_desc" />
 
@@ -70,9 +70,9 @@
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:maxLines="1"
-                    android:textColor="@color/tools_text_color_primary"
+                    android:textColor="?android:attr/textColorPrimary"
                     android:textSize="14sp"
-                    app:drawableTint="@color/tools_text_color_primary"
+                    app:drawableTint="?attr/colorOnPrimary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -89,7 +89,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/tools_password"
-                android:textColor="@color/tools_text_color_disable"
+                android:textAppearance="?attr/textAppearanceSubtitle2"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/cl_certificate" />
 
@@ -111,10 +111,10 @@
                     android:inputType="textPassword"
                     android:maxLines="1"
                     android:paddingHorizontal="8dp"
-                    android:textColor="@color/tools_text_color_primary"
+                    android:textColor="?android:attr/textColorPrimary"
                     android:textSize="14sp"
                     android:hint="@string/tools_enter_the_password_of_the_cert_file"
-                    app:drawableTint="@color/tools_text_color_primary"
+                    app:drawableTint="?attr/colorOnPrimary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/tools_invalid_password"
-                android:textColor="@color/tools_error"
+                android:textColor="?attr/colorError"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="@id/cl_certificate_password"
                 app:layout_constraintTop_toBottomOf="@id/cl_certificate_password"

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    tools:background="?android:attr/colorBackground"
     android:layout_gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -22,7 +23,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:layout_marginHorizontal="24dp"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             android:textSize="16sp"
             app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/rb_electronic_signature"
                 android:checked="true"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:text="@string/tools_sign_with_electronic_signatures"
                 />
 
@@ -55,7 +56,7 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/rb_digital_signature"
                 android:layout_marginTop="8dp"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 android:text="@string/tools_sign_with_digital_signatures"
                 />
 

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/tools_style_content_bg">
+    android:background="?attr/compdfkit_PDFStyleDialog_ContentColor">
 
     <com.compdfkit.tools.common.views.CToolBar
         android:id="@+id/tool_bar"
@@ -25,7 +25,7 @@
             android:background="@drawable/tools_properties_signature_add_sign"
             android:minWidth="70dp"
             android:text="@string/tools_save"
-            android:textColor="@color/tools_color_accent"
+            android:textColor="?attr/colorAccent"
             android:textSize="16sp" />
 
     </com.compdfkit.tools.common.views.CToolBar>

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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:id="@+id/sl_main"
     android:layout_width="match_parent"
+    tools:background="?android:attr/colorBackground"
     android:layout_height="wrap_content">
 
 
@@ -25,12 +27,12 @@
             android:layout_width="match_parent"
             android:layout_height="28dp"
             android:layout_marginTop="16dp"
-            android:background="@color/tools_reader_setting_head_bg_color"
+            android:background="?attr/compdfkit_HeadItem_BackgroundColor"
             android:gravity="center_vertical"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/tools_text_properties"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="12sp"
             app:layout_constraintTop_toBottomOf="@id/digital_sign_preview" />
 
@@ -44,9 +46,9 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/tools_annot_align_type"
-            android:textColor="@color/tools_text_color_primary"
-            app:layout_constraintTop_toBottomOf="@id/tv_text_signature" />
-
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintTop_toBottomOf="@id/tv_text_signature"
+            tools:layout_editor_absoluteX="0dp" />
 
         <LinearLayout
             android:id="@+id/ll_alignment_type"
@@ -98,7 +100,7 @@
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:text="@string/tools_location"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -113,8 +115,8 @@
                 android:gravity="center_vertical|end"
                 android:maxLines="2"
                 android:text="@string/tools_close"
-                android:textColor="@color/tools_text_color_primary"
-                app:drawableTint="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
+                app:drawableTint="?attr/colorOnPrimary"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -139,7 +141,7 @@
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:text="@string/tools_reason"
-                android:textColor="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -152,8 +154,8 @@
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical|end"
                 android:text="@string/tools_close"
-                android:textColor="@color/tools_text_color_primary"
-                app:drawableTint="@color/tools_text_color_primary"
+                android:textColor="?android:attr/textColorPrimary"
+                app:drawableTint="?attr/colorOnPrimary"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -168,12 +170,12 @@
             android:id="@+id/tv_optional_reasons"
             android:layout_width="match_parent"
             android:layout_height="28dp"
-            android:background="@color/tools_reader_setting_head_bg_color"
+            android:background="?attr/compdfkit_HeadItem_BackgroundColor"
             android:gravity="center_vertical"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/tools_include_text"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="12sp"
             app:layout_constraintTop_toBottomOf="@id/cl_reason" />
 
@@ -186,7 +188,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_optional_reasons"
-
             />
 
         <androidx.appcompat.widget.AppCompatCheckBox
@@ -198,7 +199,7 @@
             android:gravity="center_vertical"
             android:paddingStart="8dp"
             android:text="@string/tools_field_name"
-            android:textColor="@color/tools_text_color_primary" />
+            android:textColor="?android:attr/textColorPrimary" />
 
         <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/cb_date"
@@ -209,7 +210,7 @@
             android:gravity="center_vertical"
             android:paddingStart="8dp"
             android:text="@string/tools_date"
-            android:textColor="@color/tools_text_color_primary" />
+            android:textColor="?android:attr/textColorPrimary" />
 
         <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/cb_logo"
@@ -220,7 +221,7 @@
             android:gravity="center_vertical"
             android:paddingStart="8dp"
             android:text="@string/tools_logo"
-            android:textColor="@color/tools_text_color_primary" />
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/cb_distinguishable_name"
@@ -230,7 +231,7 @@
             android:gravity="center_vertical"
             android:paddingStart="8dp"
             android:text="@string/tools_distinguishable_name"
-            android:textColor="@color/tools_text_color_primary" />
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/cb_compdfkit_version"
@@ -240,7 +241,7 @@
             android:gravity="center_vertical"
             android:paddingStart="8dp"
             android:text="@string/tools_compdfkit_versions"
-            android:textColor="@color/tools_text_color_primary" />
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/cb_tab"
@@ -251,7 +252,7 @@
             android:gravity="center_vertical"
             android:paddingStart="8dp"
             android:text="@string/tools_tab"
-            android:textColor="@color/tools_text_color_primary" />
+            android:textColor="?android:attr/textColorPrimary"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

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

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true"
+    tools:background="?android:attr/colorBackground"
     android:focusable="true"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -14,16 +15,17 @@
         android:gravity="center_vertical"
         android:paddingStart="16dp"
         android:text="@string/tools_location"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Switch
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/sw_position"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:checked="false"
+        android:theme="@style/Tools_MySwitch"
         app:layout_constraintBottom_toBottomOf="@id/tv_reason_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_reason_title" />
@@ -34,7 +36,7 @@
         android:layout_height="28dp"
         android:visibility="gone"
         tools:visibility="visible"
-        android:background="@color/tools_reader_setting_head_bg_color"
+        android:background="?attr/compdfkit_HeadItem_BackgroundColor"
         app:layout_constraintTop_toBottomOf="@id/tv_reason_title" />
 
 

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:background="?android:attr/colorBackground"
     android:clickable="true"
     android:focusable="true">
 
@@ -14,16 +15,17 @@
         android:gravity="center_vertical"
         android:paddingStart="16dp"
         android:text="@string/tools_reason"
-        android:textColor="@color/tools_text_color_primary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Switch
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/sw_reason"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:checked="false"
+        android:theme="@style/Tools_MySwitch"
         app:layout_constraintBottom_toBottomOf="@id/tv_reason_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_reason_title" />
@@ -33,7 +35,7 @@
         android:id="@+id/view_line"
         android:layout_width="match_parent"
         android:layout_height="28dp"
-        android:background="@color/tools_reader_setting_head_bg_color"
+        android:background="?attr/compdfkit_HeadItem_BackgroundColor"
         android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@id/tv_reason_title"
         tools:visibility="visible" />
@@ -43,7 +45,7 @@
         android:id="@+id/rg_reason"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/tools_color_background"
+        android:background="?android:attr/colorBackground"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/actionBarSize"
-    android:background="@color/tools_color_primary">
+    android:background="?attr/colorPrimary">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_add_digital_signature"
@@ -26,7 +26,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/tools_text_color_primary" />
+            app:tint="@color/tools_signature_iv_status_color" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_add"
@@ -34,7 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="@string/tools_add_a_signature_field"
-            android:textColor="@color/tools_text_color_primary"
+            android:textColor="@color/tools_signature_iv_status_color"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/iv_add"
@@ -63,7 +63,7 @@
             app:layout_constraintBottom_toBottomOf="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_verify"
@@ -71,7 +71,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="@string/tools_verify_signatures"
-            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_toEndOf="@id/iv_verify"

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

@@ -143,7 +143,7 @@
     </style>
 
     <style name="tools_context_menu_item_style" parent="ContextMenuItemTheme">
-        <item name="android:textColor">@color/tools_text_color_primary</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:background">@drawable/tools_common_btn_corner_ripple</item>
     </style>
 

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

@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Tools_Base_Theme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/tools_color_primary</item>
-        <item name="android:colorAccent">@color/tools_color_accent</item>
-        <item name="colorAccent">@color/tools_color_accent</item>
-        <item name="colorOnPrimary">@color/tools_on_primary</item>
-        <item name="colorPrimaryContainer">@color/tools_primary_container</item>
-        <item name="colorSecondary">@color/tools_secondary</item>
-        <item name="android:textColorPrimary">@color/tools_text_color_primary</item>
-        <item name="android:textColorSecondary">@color/tools_text_color_secondary</item>
-        <item name="android:textColorHint">@color/tools_text_color_hint</item>
-        <item name="colorError">@color/tools_error</item>
-        <item name="android:colorBackground">@color/tools_color_background</item>
-        <item name="android:statusBarColor">@color/tools_color_primary</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
-        <item name="textAppearanceSubtitle1">@style/ToolsTextAppearanceSubtitle1</item>
-        <item name="textAppearanceButton">@style/ToolsAppTextAppearance.Button</item>
-        <item name="colorControlActivated">@color/tools_color_accent</item>
-    </style>
 
     <style name="ToolsTextAppearanceSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="android:textColor">@color/tools_subtitle_1_color</item>
@@ -29,37 +11,8 @@
         <item name="android:textColor">@color/tools_color_accent</item>
     </style>
 
-    <style name="Tools_Base_Theme.BasicBottomSheetDialogStyle" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
-        <item name="colorPrimary">@color/tools_color_primary</item>
-        <item name="android:colorAccent">@color/tools_color_accent</item>
-        <item name="colorAccent">@color/tools_color_accent</item>
-        <item name="colorOnPrimary">@color/tools_on_primary</item>
-        <item name="colorPrimaryContainer">@color/tools_primary_container</item>
-        <item name="colorSecondary">@color/tools_secondary</item>
-        <item name="android:textColorPrimary">@color/tools_text_color_primary</item>
-        <item name="android:textColorSecondary">@color/tools_text_color_secondary</item>
-        <item name="colorError">@color/tools_error</item>
-        <item name="android:colorBackground">@color/tools_color_background</item>
-        <item name="android:statusBarColor">@color/tools_color_primary</item>
-        <item name="android:isLightTheme" tools:targetApi="q">true</item>
-        <item name="textAppearanceSubtitle1">@style/ToolsTextAppearanceSubtitle1</item>
-        <item name="textAppearanceButton">@style/ToolsAppTextAppearance.Button</item>
-        <item name="bottomSheetStyle">@style/tools_basic_bottom_sheet_style</item>
+    <style name="Tools_MySwitch" parent="Theme.MaterialComponents.NoActionBar.Bridge">
         <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_dark_color_accent</item>
-    </style>
-
-    <style name="Tools_Base_Theme.BasicBottomSheetDialogStyle.TopCorners">
-        <item name="bottomSheetStyle">@style/tools_transparent_bottom_sheet_style</item>
-    </style>
-
-    <style name="Tools_Base_Theme.BasicBottomSheetDialogStyle.FillScreen">
-        <item name="bottomSheetStyle">@style/tools_basic_bottom_sheet_style.fillscreen</item>
     </style>
 
 
@@ -91,15 +44,15 @@
         <item name="textAppearanceSubtitle1">@style/ToolsTextAppearanceSubtitle1</item>
         <item name="textAppearanceButton">@style/ToolsAppTextAppearance.Button</item>
         <item name="colorControlActivated">@color/tools_color_accent</item>
+        <item name="android:colorControlActivated">@color/tools_color_accent</item>
         <item name="seekBarStyle">@style/ComPDFKit.Theme.SeekBar</item>
         <item name="colorOnSecondary">@color/tools_on_secondary</item>
         <item name="isLightTheme">true</item>
         <item name="compdfkit_tabLayoutStyle">@style/ComPDFKit.Theme.TabLayout</item>
         <item name="switchStyle">@style/ComPDFKit.Theme.SwitchCompat</item>
+        <item name="dialogTheme">@style/ComPDFKit.Theme.Dialog</item>
     </style>
 
-
-
     <style name="ComPDFKit.Theme.TextAppearance.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" tools:ignore="ResourceName">
         <item name="android:lineSpacingExtra">5sp</item>
     </style>
@@ -176,6 +129,9 @@
         <item name="isLightTheme">false</item>
         <item name="android:statusBarColor">@color/tools_dark_color_primary</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:colorControlActivated">@color/tools_dark_color_accent</item>
+        <item name="colorControlActivated">@color/tools_dark_color_accent</item>
+        <item name="dialogTheme">@style/ComPDFKit.Theme.Dialog.Dark</item>
 
     </style>
 
@@ -189,6 +145,8 @@
         <item name="colorOnSecondary">@color/tools_on_secondary</item>
         <item name="dialogTheme">@style/ComPDFKit.Theme.Dialog</item>
         <item name="compdfkit_textColorPrimaryNoEnable">@color/tools_icon_enable_color</item>
+        <item name="android:colorControlActivated">@color/tools_color_accent</item>
+        <item name="colorControlActivated">@color/tools_color_accent</item>
 
     </style>
 
@@ -202,6 +160,7 @@
         <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="android: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>
@@ -215,7 +174,6 @@
         <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>
-
     </style>
 
     <style name="ComPDFKit.Theme.BottomSheetDialog.Light" tools:ignore="ResourceName">