From f7035d73c8cdf9b97369425cebbeafe80de7218c Mon Sep 17 00:00:00 2001
From: Mahdi Parastesh <fulcrum1378@gmail.com>
Date: Wed, 31 May 2023 18:12:19 +0330
Subject: [PATCH] 2023.05.31 - 1 (migrated to theme colours with material
 library)

---
 README.md                                     | 107 ------------------
 gradle.properties                             |   4 +-
 library/build.gradle                          |   1 +
 .../ir/mahdiparastesh/mcdtp/McdtpUtils.java   |  10 +-
 .../mcdtp/TextViewWithCircularIndicator.java  |  27 +----
 .../mcdtp/date/DatePickerController.java      |   2 -
 .../mcdtp/date/DatePickerDialog.java          |  68 -----------
 .../mahdiparastesh/mcdtp/date/MonthView.java  |  12 +-
 .../mcdtp/date/YearPickerView.java            |   1 -
 .../mcdtp/time/AmPmCirclesView.java           |  17 ++-
 .../mahdiparastesh/mcdtp/time/CircleView.java |   3 +-
 .../mcdtp/time/RadialSelectorView.java        |  13 ++-
 .../mcdtp/time/RadialTextsView.java           |   4 +-
 .../mcdtp/time/TimePickerController.java      |   2 -
 .../mcdtp/time/TimePickerDialog.java          |  73 +-----------
 .../mahdiparastesh/mcdtp/time/Timepoint.java  |   6 +-
 .../color-night/date_picker_year_selector.xml |   6 +
 .../main/res/color/date_picker_selector.xml   |   4 +-
 .../res/color/date_picker_year_selector.xml   |   6 +-
 .../res/layout-land/date_picker_dialog.xml    |   2 +-
 .../res/layout-land/date_picker_dialog_v2.xml |   2 +-
 .../date_picker_header_view_v2.xml            |   3 +-
 .../res/layout-land/time_header_label.xml     |   4 +-
 .../res/layout-land/time_picker_dialog.xml    |   5 +-
 .../res/layout-land/time_picker_dialog_v2.xml |   5 +-
 .../res/layout-land/time_title_view_v2.xml    |   4 +-
 .../date_picker_dialog.xml                    |   2 +-
 .../res/layout-sw600dp/date_picker_dialog.xml |   2 +-
 .../date_picker_dialog.xml                    |   2 +-
 .../layout/{done_button.xml => buttons.xml}   |   9 +-
 .../main/res/layout/date_picker_dialog.xml    |   2 +-
 .../main/res/layout/date_picker_dialog_v2.xml |   2 +-
 .../res/layout/date_picker_header_view.xml    |   4 +-
 .../res/layout/date_picker_header_view_v2.xml |   4 +-
 .../res/layout/date_picker_selected_date.xml  |   2 +-
 .../layout/date_picker_selected_date_v2.xml   |   2 +-
 .../src/main/res/layout/time_header_label.xml |   4 +-
 .../main/res/layout/time_picker_dialog.xml    |   3 +-
 .../main/res/layout/time_picker_dialog_v2.xml |   3 +-
 .../src/main/res/layout/time_title_view.xml   |   4 +-
 .../main/res/layout/time_title_view_v2.xml    |   4 +-
 .../main/res/layout/year_label_text_view.xml  |   4 +-
 library/src/main/res/values-night/colors.xml  |   4 +-
 .../src/main/res/values-sw600dp/dimens.xml    |   4 +-
 library/src/main/res/values/colors.xml        |   9 +-
 library/src/main/res/values/dimens.xml        |   4 +-
 library/src/main/res/values/styles.xml        |   4 +-
 sample/src/main/res/values-night/themes.xml   |  14 +++
 sample/src/main/res/values/themes.xml         |  29 ++++-
 49 files changed, 147 insertions(+), 365 deletions(-)
 create mode 100644 library/src/main/res/color-night/date_picker_year_selector.xml
 rename library/src/main/res/layout/{done_button.xml => buttons.xml} (76%)
 create mode 100644 sample/src/main/res/values-night/themes.xml

diff --git a/README.md b/README.md
index 90ada31..6c29bc2 100644
--- a/README.md
+++ b/README.md
@@ -85,62 +85,15 @@ You can set the layout version using the factory
 
 ```java
 dpd.setVersion(DatePickerDialog.Version.VERSION_2);
-```
-
-The pickers will be themed automatically based on the current theme where they are created, based on the
-current `colorAccent`. You can also theme the dialogs via the `setAccentColor(int color)` method. Alternatively, you can
-theme the pickers by overwriting the color resources `accent_color` and `accent_color_dark` in your project.
-
-```xml
-
-<color name="accent_color">#009688</color>
-<color name="accent_color_dark">#00796b</color>
-```
-
-The exact order in which colors are selected is as follows:
-
-1. `setAccentColor(int color)` in java code
-2. `android.R.attr.colorAccent` (if android 5.0+)
-3. `R.attr.colorAccent` (eg. when using AppCompat)
-4. `R.color.accent_color` and `R.color.accent_color_dark` if none of the others are set in your project
-
-The pickers also have a dark theme. This can be specified globablly using the `theme_dark` attribute in your theme
-or the `setThemeDark(boolean themeDark)` functions. The function calls overwrite the XML setting.
-
-```xml
-
-<item name="theme_dark">true</item>
-```
 
 ## Additional Options
 
-### [All] `setThemeDark(boolean themeDark)`
-
-The dialogs have a dark theme that can be set by calling
-
-```java
-dialog.setThemeDark(true);
-```
-
-### [All] `setAccentColor(String color)` and `setAccentColor(int color)`
-
-Set the accentColor to be used by the Dialog. The String version parses the color out using `Color.parseColor()`. The
-int version requires a ColorInt bytestring. It will explicitly set the color to fully opaque.
-
-### [All] `setOkColor()` and `setCancelColor()`
-
-Set the text color for the OK or Cancel button. Behaves similar to `setAccentColor()`
-
 ### [TimePickerDialog] `setTitle(String title)`
 
 Shows a title at the top of the `TimePickerDialog`
 
 ### [DatePickerDialog] `setTitle(String title)`
 
-Shows a title at the top of the `DatePickerDialog` instead of the day of the week
-
-### [All] `setOkText()` and `setCancelText()`
-
 Set a custom text for the dialog Ok and Cancel labels. Can take a resourceId of a String. Works in both the
 DatePickerDialog and TimePickerDialog
 
@@ -391,66 +344,6 @@ class MyDateRangeLimiter implements DateRangeLimiter {
 When you provide a custom `DateRangeLimiter` the built-in methods for setting the enabled / disabled dates will no
 longer work. It will need to be completely handled by your implementation.
 
-### Why do the OK and Cancel buttons have the accent color as a background when combined with the Material Components library
-
-[Material Components](https://github.com/material-components/material-components-android) replaces all instances
-of `Button` with an instance of `MaterialButton` when using one of its regular
-themes: https://github.com/material-components/material-components-android/blob/master/docs/getting-started.md#material-components-themes  
-The default version of `MaterialButton` uses `colorPrimary` as the background color. Because Material Components
-replaces the View replacer with their own implementation there is not much I can do to fix this from this library.
-
-There are a few workarounds:
-
-* Use one of the bridge themes, which do not replace the View Inflater
-* Overwrite the style of the mdtp buttons with one that inherits from Material Components text buttons, as
-  described [here](https://github.com/wdullaer/MaterialDateTimePicker/issues/523#issuecomment-477349333):
-    ```xml
-    <style name="ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog"/>
-    ```
-* Overwrite the View inflater again in your application theme by adding the following statement in your application
-  theme:
-    ```xml
-  <item name="viewInflaterClass">androidx.appcompat.app.AppCompatViewInflater</item>
-    ```
-  You will then need to explicitly use `MaterialButton` in your application rather than `Button`
-
-### Why are my callbacks lost when the device changes orientation?
-
-The simple solution is to dismiss the pickers when your activity is paused.
-
-```java
-tpd.dismissOnPause(true);
-```
-
-If you do wish to retain the pickers when an orientation change occurs, things become a bit more tricky.
-
-By default, when an orientation changes occurs android will destroy and recreate your entire `Activity`. Wherever
-possible this library will retain its state on an orientation change. The only notable exceptions are the different
-callbacks and listeners. These interfaces are often implemented on `Activities` or `Fragments`. Naively trying to retain
-them would cause memory leaks. Apart from explicitly requiring that the callback interfaces are implemented on
-an `Activity`, there is no safe way to properly retain the callbacks, that I'm aware off.
-
-This means that it is your responsibility to set the listeners in your `Activity`'s `onResume()` callback.
-
-```java
-@Override
-public void onResume() {
-  super.onResume();
-
-  DatePickerDialog dpd = (DatePickerDialog) getFragmentManager().findFragmentByTag("Datepickerdialog");
-  TimePickerDialog tpd = (TimePickerDialog) getFragmentManager().findFragmentByTag("TimepickerDialog");
-
-  if(tpd != null) tpd.setOnTimeSetListener(this);
-  if(dpd != null) dpd.setOnDateSetListener(this);
-}
-```
-
-## Potential Improvements
-
-* Landscape timepicker can use some improvement
-* Code cleanup: there is a bit too much spit and ductape in the tweaks I've done.
-* Document all options on both pickers
-
 ## License
 
     Copyright (c) 2015 Wouter Dullaert
diff --git a/gradle.properties b/gradle.properties
index 0f38814..185c84d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,5 +8,5 @@ org.gradle.unsafe.configuration-cache=false
 ANDROID_BUILD_MIN_SDK_VERSION=24
 ANDROID_BUILD_SDK_VERSION=33
 ANDROID_BUILD_TARGET_SDK_VERSION=33
-VERSION_CODE=5
-VERSION_NAME=2.5
+VERSION_CODE=6
+VERSION_NAME=2.7
diff --git a/library/build.gradle b/library/build.gradle
index 0bfa9b2..b31c1b0 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -31,6 +31,7 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'com.google.android.material:material:1.9.0'
 }
 
 afterEvaluate { // You only need to set the access token and execute "gradle publish"...
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/McdtpUtils.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/McdtpUtils.java
index db66ef5..939e2de 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/McdtpUtils.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/McdtpUtils.java
@@ -21,6 +21,8 @@
 import android.util.TypedValue;
 import android.view.View;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
@@ -64,7 +66,8 @@ public static ObjectAnimator getPulseAnimator(View labelToAnimate, float decreas
 
     @SuppressWarnings("unused")
     public static int dpToPx(float dp, Resources resources) {
-        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
+        float px = TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
         return (int) px;
     }
 
@@ -75,9 +78,10 @@ public static int darkenColor(int color) {
         return Color.HSVToColor(hsv);
     }
 
-    public static int getAccentColorFromThemeIfAvailable(Context context) {
+    @ColorInt
+    public static int themeColor(Context context, @AttrRes int res) {
         TypedValue typedValue = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorAccent, typedValue, true);
+        context.getTheme().resolveAttribute(res, typedValue, true);
         return typedValue.data;
     }
 
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/TextViewWithCircularIndicator.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/TextViewWithCircularIndicator.java
index 297414b..3262321 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/TextViewWithCircularIndicator.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/TextViewWithCircularIndicator.java
@@ -2,9 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
@@ -12,7 +10,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
-import androidx.core.content.ContextCompat;
 
 public class TextViewWithCircularIndicator extends AppCompatTextView {
 
@@ -20,46 +17,26 @@ public class TextViewWithCircularIndicator extends AppCompatTextView {
 
     final Paint mCirclePaint = new Paint();
 
-    private int mCircleColor;
     private final String mItemIsSelectedText;
 
     private boolean mDrawCircle;
 
     public TextViewWithCircularIndicator(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mCircleColor = ContextCompat.getColor(context, R.color.accent_color);
         mItemIsSelectedText = context.getResources().getString(R.string.item_is_selected);
-
         init();
     }
 
     private void init() {
         mCirclePaint.setFakeBoldText(true);
         mCirclePaint.setAntiAlias(true);
-        mCirclePaint.setColor(mCircleColor);
+        mCirclePaint.setColor(McdtpUtils.themeColor(getContext(),
+                com.google.android.material.R.attr.colorOnSurface));
         mCirclePaint.setTextAlign(Align.CENTER);
         mCirclePaint.setStyle(Style.FILL);
         mCirclePaint.setAlpha(SELECTED_CIRCLE_ALPHA);
     }
 
-    public void setAccentColor(int color) {
-        mCircleColor = color;
-        mCirclePaint.setColor(mCircleColor);
-        setTextColor(createTextColor(color));
-    }
-
-    private ColorStateList createTextColor(int accentColor) {
-        int[][] states = new int[][]{
-                new int[]{android.R.attr.state_pressed}, // pressed
-                new int[]{android.R.attr.state_selected}, // selected
-                new int[]{}
-        };
-        int[] colors = new int[]{
-                accentColor, Color.WHITE, McdtpUtils.night(getContext()) ? Color.WHITE : Color.BLACK
-        };
-        return new ColorStateList(states, colors);
-    }
-
     public void drawIndicator(boolean drawCircle) {
         mDrawCircle = drawCircle;
     }
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerController.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerController.java
index bee3301..cadcd71 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerController.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerController.java
@@ -20,8 +20,6 @@ public interface DatePickerController<CAL extends Calendar> extends FontCustomis
 
     MonthAdapter.CalendarDay<CAL> getSelectedDay();
 
-    int getAccentColor();
-
     boolean isHighlighted(int year, int month, int day);
 
     int getFirstDayOfWeek();
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerDialog.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerDialog.java
index 3b14146..0937f5a 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerDialog.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/DatePickerDialog.java
@@ -5,7 +5,6 @@
 import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.graphics.Typeface;
 import android.icu.text.DateFormatSymbols;
 import android.icu.util.Calendar;
@@ -26,7 +25,6 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.FontRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDialogFragment;
@@ -60,14 +58,11 @@ public enum ScrollOrientation {HORIZONTAL, VERTICAL}
     private static final String KEY_CURRENT_VIEW = "current_view";
     private static final String KEY_LIST_POSITION_OFFSET = "list_position_offset";
     private static final String KEY_HIGHLIGHTED_DAYS = "highlighted_days";
-    private static final String KEY_ACCENT = "accent";
     private static final String KEY_VIBRATE = "vibrate";
     private static final String KEY_DISMISS = "dismiss";
     private static final String KEY_AUTO_DISMISS = "auto_dismiss";
     private static final String KEY_DEFAULT_VIEW = "default_view";
     private static final String KEY_TITLE = "title";
-    private static final String KEY_OK_COLOR = "ok_color";
-    private static final String KEY_CANCEL_COLOR = "cancel_color";
     private static final String KEY_VERSION = "version";
     private static final String KEY_TIMEZONE = "timezone";
     private static final String KEY_DATERANGELIMITER = "daterangelimiter";
@@ -109,13 +104,10 @@ public enum ScrollOrientation {HORIZONTAL, VERTICAL}
     private int mWeekStart;
     private String mTitle;
     private HashSet<CAL> highlightedDays = new HashSet<>();
-    private Integer mAccentColor = null;
     private boolean mVibrate = true;
     private boolean mDismissOnPause = false;
     private boolean mAutoDismiss = false;
     private int mDefaultView = MONTH_AND_DAY_VIEW;
-    private Integer mOkColor = null;
-    private Integer mCancelColor = null;
     private Version mVersion = Version.VERSION_2;
     private ScrollOrientation mScrollOrientation;
     private DefaultDateRangeLimiter<CAL> mDefaultLimiter;
@@ -233,14 +225,11 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         }
         outState.putInt(KEY_LIST_POSITION, listPosition);
         outState.putSerializable(KEY_HIGHLIGHTED_DAYS, highlightedDays);
-        if (mAccentColor != null) outState.putInt(KEY_ACCENT, mAccentColor);
         outState.putBoolean(KEY_VIBRATE, mVibrate);
         outState.putBoolean(KEY_DISMISS, mDismissOnPause);
         outState.putBoolean(KEY_AUTO_DISMISS, mAutoDismiss);
         outState.putInt(KEY_DEFAULT_VIEW, mDefaultView);
         outState.putString(KEY_TITLE, mTitle);
-        if (mOkColor != null) outState.putInt(KEY_OK_COLOR, mOkColor);
-        if (mCancelColor != null) outState.putInt(KEY_CANCEL_COLOR, mCancelColor);
         outState.putSerializable(KEY_VERSION, mVersion);
         outState.putSerializable(KEY_SCROLL_ORIENTATION, mScrollOrientation);
         outState.putParcelable(KEY_DATERANGELIMITER, mDateRangeLimiter);
@@ -267,16 +256,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             listPosition = savedInstanceState.getInt(KEY_LIST_POSITION);
             listPositionOffset = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET);
             highlightedDays = (HashSet<CAL>) savedInstanceState.getSerializable(KEY_HIGHLIGHTED_DAYS);
-            if (savedInstanceState.containsKey(KEY_ACCENT))
-                mAccentColor = savedInstanceState.getInt(KEY_ACCENT);
             mVibrate = savedInstanceState.getBoolean(KEY_VIBRATE);
             mDismissOnPause = savedInstanceState.getBoolean(KEY_DISMISS);
             mAutoDismiss = savedInstanceState.getBoolean(KEY_AUTO_DISMISS);
             mTitle = savedInstanceState.getString(KEY_TITLE);
-            if (savedInstanceState.containsKey(KEY_OK_COLOR))
-                mOkColor = savedInstanceState.getInt(KEY_OK_COLOR);
-            if (savedInstanceState.containsKey(KEY_CANCEL_COLOR))
-                mCancelColor = savedInstanceState.getInt(KEY_CANCEL_COLOR);
             mVersion = (Version) savedInstanceState.getSerializable(KEY_VERSION);
             mScrollOrientation = (ScrollOrientation)
                     savedInstanceState.getSerializable(KEY_SCROLL_ORIENTATION);
@@ -344,7 +327,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             dismiss();
         });
         okButton.setTypeface(boldFont);
-        okButton.setText(android.R.string.ok);
 
         Button cancelButton = view.findViewById(R.id.cancel);
         cancelButton.setOnClickListener(v -> {
@@ -352,23 +334,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             if (getDialog() != null) getDialog().cancel();
         });
         cancelButton.setTypeface(boldFont);
-        cancelButton.setText(android.R.string.cancel);
         cancelButton.setVisibility(isCancelable() ? View.VISIBLE : View.GONE);
 
-        // If an accent color has not been set manually, get it from the context
-        if (mAccentColor == null)
-            mAccentColor = McdtpUtils.getAccentColorFromThemeIfAvailable(activity);
-        if (mDatePickerHeaderView != null)
-            mDatePickerHeaderView.setBackgroundColor(McdtpUtils.darkenColor(mAccentColor));
-        view.findViewById(R.id.day_picker_selected_date_layout).setBackgroundColor(mAccentColor);
-
-        // Buttons can have a different color
-        if (mOkColor == null) mOkColor = mAccentColor;
-        okButton.setTextColor(mOkColor);
-
-        if (mCancelColor == null) mCancelColor = mAccentColor;
-        cancelButton.setTextColor(mCancelColor);
-
         if (getDialog() == null)
             view.findViewById(R.id.done_background).setVisibility(View.GONE);
 
@@ -522,41 +489,6 @@ public void autoDismiss(boolean autoDismiss) {
         mAutoDismiss = autoDismiss;
     }
 
-    @SuppressWarnings("unused")
-    public void setAccentColor(String color) {
-        mAccentColor = Color.parseColor(color);
-    }
-
-    @SuppressWarnings("unused")
-    public void setAccentColor(@ColorInt int color) {
-        mAccentColor = Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    @SuppressWarnings("unused")
-    public void setOkColor(String color) {
-        mOkColor = Color.parseColor(color);
-    }
-
-    @SuppressWarnings("unused")
-    public void setOkColor(@ColorInt int color) {
-        mOkColor = Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    @SuppressWarnings("unused")
-    public void setCancelColor(String color) {
-        mCancelColor = Color.parseColor(color);
-    }
-
-    @SuppressWarnings("unused")
-    public void setCancelColor(@ColorInt int color) {
-        mCancelColor = Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    @Override
-    public int getAccentColor() {
-        return mAccentColor;
-    }
-
     @SuppressWarnings("unused")
     public void showYearPickerFirst(boolean yearPicker) {
         mDefaultView = yearPicker ? YEAR_VIEW : MONTH_AND_DAY_VIEW;
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/MonthView.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/MonthView.java
index 6d8dfc2..6690064 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/MonthView.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/MonthView.java
@@ -103,12 +103,16 @@ public MonthView(Context context, AttributeSet attr, DatePickerController<CAL> c
         mCalendar = McdtpUtils.createCalendar(
                 mController.getCalendarType(), mController.getTimeZone());
 
-        mDayTextColor = ContextCompat.getColor(context, R.color.date_picker_text_normal);
-        mMonthDayTextColor = ContextCompat.getColor(context, R.color.date_picker_month_day);
+        mDayTextColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorOnSurface);
+        mMonthDayTextColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorOnSurface);
         mDisabledDayTextColor = ContextCompat.getColor(context, R.color.date_picker_text_disabled);
         mHighlightedDayTextColor = ContextCompat.getColor(context, R.color.date_picker_text_highlighted);
-        mSelectedDayTextColor = ContextCompat.getColor(context, R.color.calendar_selected_day_text);
-        mTodayNumberColor = mController.getAccentColor();
+        mSelectedDayTextColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorOnPrimary);
+        mTodayNumberColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorPrimary);
 
         mStringBuilder = new StringBuilder(50);
 
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/YearPickerView.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/YearPickerView.java
index b39f2c1..6042f6f 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/date/YearPickerView.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/date/YearPickerView.java
@@ -113,7 +113,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
             else {
                 v = (TextViewWithCircularIndicator) LayoutInflater.from(parent.getContext())
                         .inflate(R.layout.year_label_text_view, parent, false);
-                v.setAccentColor(mController.getAccentColor());
                 v.setTypeface(McdtpUtils.normalFont(parent.getContext(), mController));
             }
             int year = mMinYear + position;
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/AmPmCirclesView.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/AmPmCirclesView.java
index 64f5d70..6ad44e3 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/AmPmCirclesView.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/AmPmCirclesView.java
@@ -59,17 +59,22 @@ public void initialize(Context context, Locale locale, TimePickerController cont
         mAmPmDisabledTextColor = ContextCompat.getColor(context, R.color.date_picker_text_disabled);
         if (McdtpUtils.night(context)) {
             mUnselectedColor = ContextCompat.getColor(context, R.color.circle_background_dark_theme);
-            mAmPmTextColor = ContextCompat.getColor(context, R.color.white);
+            mAmPmTextColor = McdtpUtils.themeColor(context,
+                    com.google.android.material.R.attr.colorOnSurface);
             mSelectedAlpha = SELECTED_ALPHA_THEME_DARK;
         } else {
-            mUnselectedColor = ContextCompat.getColor(context, R.color.white);
-            mAmPmTextColor = ContextCompat.getColor(context, R.color.ampm_text_color);
+            mUnselectedColor = ContextCompat.getColor(context, android.R.color.white);
+            mAmPmTextColor = McdtpUtils.themeColor(context,
+                    com.google.android.material.R.attr.colorOnSurface);
             mSelectedAlpha = SELECTED_ALPHA;
         }
 
-        mSelectedColor = controller.getAccentColor();
-        mTouchedColor = McdtpUtils.darkenColor(mSelectedColor);
-        mAmPmSelectedTextColor = ContextCompat.getColor(context, R.color.white);
+        mSelectedColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorPrimary);
+        mTouchedColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorPrimaryVariant);
+        mAmPmSelectedTextColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorOnPrimary);
 
         mPaint.setTypeface(McdtpUtils.normalFont(context, controller));
         mPaint.setAntiAlias(true);
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/CircleView.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/CircleView.java
index afbd42d..800f5b3 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/CircleView.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/CircleView.java
@@ -40,7 +40,8 @@ public void initialize(Context context, TimePickerController controller) {
 
         int colorRes = McdtpUtils.night(context) ? R.color.circle_background_dark_theme : R.color.circle_color;
         mCircleColor = ContextCompat.getColor(context, colorRes);
-        mDotColor = controller.getAccentColor();
+        mDotColor = McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorPrimary);
         mPaint.setAntiAlias(true);
 
         mIs24HourMode = controller.is24HourMode();
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialSelectorView.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialSelectorView.java
index c39579c..a571049 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialSelectorView.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialSelectorView.java
@@ -66,8 +66,9 @@ public RadialSelectorView(Context context) {
      * Initialize this selector with the state of the picker.
      *
      * @param context          Current context.
-     * @param controller       Structure containing the accentColor and the 24-hour mode, which will tell us
-     *                         whether the circle's center is moved up slightly to make room for the AM/PM circles.
+     * @param controller       Structure containing the accentColor and the 24-hour mode, which will
+     *                         tell us whether the circle's center is moved up slightly to make room
+     *                         for the AM/PM circles.
      * @param hasInnerCircle   Whether we have both an inner and an outer circle of numbers
      *                         that may be selected. Should be true for 24-hour mode in the hours circle.
      * @param disappearsOut    Whether the numbers' animation will have them disappearing out
@@ -82,8 +83,8 @@ public void initialize(Context context, TimePickerController controller, boolean
 
         Resources res = context.getResources();
 
-        int accentColor = controller.getAccentColor();
-        mPaint.setColor(accentColor);
+        mPaint.setColor(McdtpUtils.themeColor(context,
+                com.google.android.material.R.attr.colorPrimary));
         mPaint.setAntiAlias(true);
 
         mSelectionAlpha = McdtpUtils.night(context) ? SELECTED_ALPHA_THEME_DARK : SELECTED_ALPHA;
@@ -131,8 +132,8 @@ public void initialize(Context context, TimePickerController controller, boolean
      * @param isInnerCircle    Whether the selection should be in the inner circle or outer. Will be
      *                         ignored if hasInnerCircle was initialized to false.
      * @param forceDrawDot     Whether to force the dot in the center of the selection circle to be
-     *                         drawn. If false, the dot will be drawn only when the degrees is not a multiple of 30, i.e.
-     *                         the selection is not on a visible number.
+     *                         drawn. If false, the dot will be drawn only when the degrees is not a
+     *                         multiple of 30, i.e. the selection is not on a visible number.
      */
     public void setSelection(int selectionDegrees, boolean isInnerCircle, boolean forceDrawDot) {
         mSelectionDegrees = selectionDegrees;
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialTextsView.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialTextsView.java
index 87d14f2..a6ef973 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialTextsView.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/RadialTextsView.java
@@ -74,7 +74,7 @@ public void initialize(
         Resources res = context.getResources();
 
         // Set up the paint.
-        int textColorRes = McdtpUtils.night(context) ? R.color.white : R.color.numbers_text_color;
+        int textColorRes = McdtpUtils.night(context) ? android.R.color.white : R.color.numbers_text_color;
         mPaint.setColor(ContextCompat.getColor(context, textColorRes));
         mTypefaceNormal = McdtpUtils.normalFont(context, controller);
         //mTypefaceBold = McdtpUtils.boldFont(context, controller);
@@ -82,7 +82,7 @@ public void initialize(
         mPaint.setTextAlign(Align.CENTER);
 
         // Set up the selected paint
-        int selectedTextColor = ContextCompat.getColor(context, R.color.white);
+        int selectedTextColor = ContextCompat.getColor(context, android.R.color.white);
         mSelectedPaint.setColor(selectedTextColor);
         mSelectedPaint.setAntiAlias(true);
         mSelectedPaint.setTextAlign(Align.CENTER);
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerController.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerController.java
index bd96eca..cf10bcb 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerController.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerController.java
@@ -6,8 +6,6 @@ interface TimePickerController extends FontCustomiser {
 
     boolean is24HourMode();
 
-    int getAccentColor();
-
     TimePickerDialog.Version getVersion();
 
     void tryVibrate();
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerDialog.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerDialog.java
index 7191bde..ed48722 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerDialog.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/TimePickerDialog.java
@@ -6,7 +6,6 @@
 import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.graphics.Typeface;
 import android.icu.util.Calendar;
 import android.os.Bundle;
@@ -22,7 +21,6 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.FontRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
@@ -50,13 +48,10 @@ public enum Version {VERSION_1, VERSION_2}
     private static final String KEY_CURRENT_ITEM_SHOWING = "current_item_showing";
     private static final String KEY_IN_KB_MODE = "in_kb_mode";
     private static final String KEY_TYPED_TIMES = "typed_times";
-    private static final String KEY_ACCENT = "accent";
     private static final String KEY_VIBRATE = "vibrate";
     private static final String KEY_DISMISS = "dismiss";
     private static final String KEY_ENABLE_SECONDS = "enable_seconds";
     private static final String KEY_ENABLE_MINUTES = "enable_minutes";
-    private static final String KEY_OK_COLOR = "ok_color";
-    private static final String KEY_CANCEL_COLOR = "cancel_color";
     private static final String KEY_VERSION = "version";
     private static final String KEY_TIMEPOINT_LIMITER = "timepoint_limiter";
     private static final String KEY_LOCALE = "locale";
@@ -97,12 +92,9 @@ public enum Version {VERSION_1, VERSION_2}
     private Boolean mIs24HourMode = null;
     private String mTitle;
     private boolean mVibrate;
-    private Integer mAccentColor = null;
     private boolean mDismissOnPause;
     private boolean mEnableSeconds;
     private boolean mEnableMinutes;
-    private Integer mOkColor = null;
-    private Integer mCancelColor = null;
     private Version mVersion;
     private DefaultTimepointLimiter mDefaultLimiter = new DefaultTimepointLimiter();
     private TimepointLimiter mLimiter = mDefaultLimiter;
@@ -184,36 +176,6 @@ public String getTitle() {
         return mTitle;
     }
 
-    @SuppressWarnings("unused")
-    public void setAccentColor(String color) {
-        mAccentColor = Color.parseColor(color);
-    }
-
-    @SuppressWarnings("unused")
-    public void setAccentColor(@ColorInt int color) {
-        mAccentColor = Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    @SuppressWarnings("unused")
-    public void setOkColor(String color) {
-        mOkColor = Color.parseColor(color);
-    }
-
-    @SuppressWarnings("unused")
-    public void setOkColor(@ColorInt int color) {
-        mOkColor = Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    @SuppressWarnings("unused")
-    public void setCancelColor(String color) {
-        mCancelColor = Color.parseColor(color);
-    }
-
-    @SuppressWarnings("unused")
-    public void setCancelColor(@ColorInt int color) {
-        mCancelColor = Color.argb(255, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
     @Override
     public boolean is24HourMode() {
         return mIs24HourMode;
@@ -224,11 +186,6 @@ public void set24HourMode(boolean is24HourMode) {
         mIs24HourMode = is24HourMode;
     }
 
-    @Override
-    public int getAccentColor() {
-        return mAccentColor;
-    }
-
     @SuppressWarnings("unused")
     public void doVibrate(boolean vibrate) {
         mVibrate = vibrate;
@@ -452,17 +409,10 @@ public void onCreate(Bundle savedInstanceState) {
             mIs24HourMode = savedInstanceState.getBoolean(KEY_24_HOUR_MODE);
             mInKbMode = savedInstanceState.getBoolean(KEY_IN_KB_MODE);
             mTitle = savedInstanceState.getString(KEY_TITLE);
-            if (savedInstanceState.containsKey(KEY_ACCENT))
-                mAccentColor = savedInstanceState.getInt(KEY_ACCENT);
             mVibrate = savedInstanceState.getBoolean(KEY_VIBRATE);
             mDismissOnPause = savedInstanceState.getBoolean(KEY_DISMISS);
             mEnableSeconds = savedInstanceState.getBoolean(KEY_ENABLE_SECONDS);
             mEnableMinutes = savedInstanceState.getBoolean(KEY_ENABLE_MINUTES);
-            if (savedInstanceState.containsKey(KEY_OK_COLOR))
-                mOkColor = savedInstanceState.getInt(KEY_OK_COLOR);
-            if (mOkColor == Integer.MAX_VALUE) mOkColor = null;
-            if (savedInstanceState.containsKey(KEY_CANCEL_COLOR))
-                mCancelColor = savedInstanceState.getInt(KEY_CANCEL_COLOR);
             mVersion = (Version) savedInstanceState.getSerializable(KEY_VERSION);
             mLimiter = savedInstanceState.getParcelable(KEY_TIMEPOINT_LIMITER);
             mLocale = (Locale) savedInstanceState.getSerializable(KEY_LOCALE);
@@ -493,10 +443,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         KeyboardListener keyboardListener = new KeyboardListener();
         view.findViewById(R.id.time_picker_dialog).setOnKeyListener(keyboardListener);
 
-        // If an accent color has not been set manually, get it from the context
-        if (mAccentColor == null)
-            mAccentColor = McdtpUtils.getAccentColorFromThemeIfAvailable(requireActivity());
-
         Resources res = getResources();
         Context context = requireActivity();
         mHourPickerDescription = res.getString(R.string.hour_picker_description);
@@ -505,7 +451,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         mSelectMinutes = res.getString(R.string.select_minutes);
         mSecondPickerDescription = res.getString(R.string.second_picker_description);
         mSelectSeconds = res.getString(R.string.select_seconds);
-        mSelectedColor = ContextCompat.getColor(context, R.color.white);
+        mSelectedColor = ContextCompat.getColor(context, android.R.color.white);
         mUnselectedColor = ContextCompat.getColor(context, R.color.accent_color_focused);
 
         mHourView = view.findViewById(R.id.hours);
@@ -795,20 +741,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             timePickerHeader.setText(mTitle);
         }
 
-        // Set the theme at the end so that the initialize()s above don't counteract the theme.
-        timePickerHeader.setBackgroundColor(McdtpUtils.darkenColor(mAccentColor));
-        view.findViewById(R.id.time_display_background).setBackgroundColor(mAccentColor);
-        view.findViewById(R.id.time_display).setBackgroundColor(mAccentColor);
-
-        // Button text can have a different color
-        if (mOkColor == null) mOkColor = mAccentColor;
-        mOkButton.setTextColor(mOkColor);
-        if (mCancelColor == null) mCancelColor = mAccentColor;
-        mCancelButton.setTextColor(mCancelColor);
-
-        if (getDialog() == null) {
+        if (getDialog() == null)
             view.findViewById(R.id.done_background).setVisibility(View.GONE);
-        }
 
         int circleBackground = ContextCompat.getColor(context, R.color.circle_background);
         int lightGray = ContextCompat.getColor(context, R.color.light_gray);
@@ -893,13 +827,10 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
                 outState.putIntegerArrayList(KEY_TYPED_TIMES, mTypedTimes);
             }
             outState.putString(KEY_TITLE, mTitle);
-            if (mAccentColor != null) outState.putInt(KEY_ACCENT, mAccentColor);
             outState.putBoolean(KEY_VIBRATE, mVibrate);
             outState.putBoolean(KEY_DISMISS, mDismissOnPause);
             outState.putBoolean(KEY_ENABLE_SECONDS, mEnableSeconds);
             outState.putBoolean(KEY_ENABLE_MINUTES, mEnableMinutes);
-            if (mOkColor != null) outState.putInt(KEY_OK_COLOR, mOkColor);
-            if (mCancelColor != null) outState.putInt(KEY_CANCEL_COLOR, mCancelColor);
             outState.putSerializable(KEY_VERSION, mVersion);
             outState.putParcelable(KEY_TIMEPOINT_LIMITER, mLimiter);
             outState.putSerializable(KEY_LOCALE, mLocale);
diff --git a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/Timepoint.java b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/Timepoint.java
index 04493e1..fc232bd 100644
--- a/library/src/main/java/ir/mahdiparastesh/mcdtp/time/Timepoint.java
+++ b/library/src/main/java/ir/mahdiparastesh/mcdtp/time/Timepoint.java
@@ -10,10 +10,12 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-/** Simple utility class that represents a time in the day up to second precision
+/**
+ * Simple utility class that represents a time in the day up to second precision
  * The time input is expected to use 24 hour mode.
  * Fields are modulo'd into their correct ranges.
- * It does not handle timezones. */
+ * It does not handle timezones.
+ */
 @SuppressWarnings("WeakerAccess")
 public class Timepoint implements Parcelable, Comparable<Timepoint> {
     private int hour;
diff --git a/library/src/main/res/color-night/date_picker_year_selector.xml b/library/src/main/res/color-night/date_picker_year_selector.xml
new file mode 100644
index 0000000..35cf7d5
--- /dev/null
+++ b/library/src/main/res/color-night/date_picker_year_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/white" android:state_pressed="true" />
+    <item android:color="@android:color/white" android:state_selected="true" />
+    <item android:color="?colorOnSurface" android:state_pressed="false" android:state_selected="false" />
+</selector>
\ No newline at end of file
diff --git a/library/src/main/res/color/date_picker_selector.xml b/library/src/main/res/color/date_picker_selector.xml
index 3838efb..7efbb21 100644
--- a/library/src/main/res/color/date_picker_selector.xml
+++ b/library/src/main/res/color/date_picker_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_pressed="true" />
-    <item android:color="@color/white" android:state_pressed="false" android:state_selected="true" />
+    <item android:color="@android:color/white" android:state_pressed="true" />
+    <item android:color="@android:color/white" android:state_pressed="false" android:state_selected="true" />
     <item android:color="@color/accent_color_focused" android:state_pressed="false" android:state_selected="false" />
 </selector>
\ No newline at end of file
diff --git a/library/src/main/res/color/date_picker_year_selector.xml b/library/src/main/res/color/date_picker_year_selector.xml
index 6a501a8..3ef8906 100644
--- a/library/src/main/res/color/date_picker_year_selector.xml
+++ b/library/src/main/res/color/date_picker_year_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/accent_color" android:state_pressed="true" />
-    <item android:color="@color/white" android:state_selected="true" />
-    <item android:color="@color/date_picker_text_normal" android:state_pressed="false" android:state_selected="false" />
+    <item android:color="@android:color/black" android:state_pressed="true" />
+    <item android:color="@android:color/white" android:state_selected="true" />
+    <item android:color="?colorOnSurface" android:state_pressed="false" android:state_selected="false" />
 </selector>
\ No newline at end of file
diff --git a/library/src/main/res/layout-land/date_picker_dialog.xml b/library/src/main/res/layout-land/date_picker_dialog.xml
index 5481a94..e53e6e5 100644
--- a/library/src/main/res/layout-land/date_picker_dialog.xml
+++ b/library/src/main/res/layout-land/date_picker_dialog.xml
@@ -29,5 +29,5 @@
         <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
diff --git a/library/src/main/res/layout-land/date_picker_dialog_v2.xml b/library/src/main/res/layout-land/date_picker_dialog_v2.xml
index f05ce91..6e87511 100644
--- a/library/src/main/res/layout-land/date_picker_dialog_v2.xml
+++ b/library/src/main/res/layout-land/date_picker_dialog_v2.xml
@@ -20,7 +20,7 @@
         <include layout="@layout/date_picker_view_animator_v2" />
 
         <include
-            layout="@layout/done_button"
+            layout="@layout/buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="-32dp" />
diff --git a/library/src/main/res/layout-land/date_picker_header_view_v2.xml b/library/src/main/res/layout-land/date_picker_header_view_v2.xml
index 3ea4113..f0c9071 100644
--- a/library/src/main/res/layout-land/date_picker_header_view_v2.xml
+++ b/library/src/main/res/layout-land/date_picker_header_view_v2.xml
@@ -4,12 +4,13 @@
     android:id="@+id/date_picker_header"
     android:layout_width="@dimen/date_picker_title_height"
     android:layout_height="match_parent"
+    android:background="?colorPrimaryVariant"
     android:gravity="bottom|center"
     android:importantForAccessibility="no"
     android:includeFontPadding="false"
     android:maxLines="1"
     android:paddingTop="@dimen/date_picker_title_padding"
-    android:textColor="@color/white"
+    android:textColor="?colorOnPrimary"
     android:textSize="@dimen/date_picker_header_text_size"
     tools:text="Dialog Title"
     tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/library/src/main/res/layout-land/time_header_label.xml b/library/src/main/res/layout-land/time_header_label.xml
index aea1c29..3d6b672 100644
--- a/library/src/main/res/layout-land/time_header_label.xml
+++ b/library/src/main/res/layout-land/time_header_label.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-    android:background="@color/accent_color"
+    android:background="?colorPrimary"
     android:clipChildren="false"
     android:padding="16dp"
     tools:ignore="RtlHardcoded"
@@ -51,7 +51,7 @@
             android:background="@android:color/transparent"
             android:gravity="center_horizontal"
             android:text="@string/time_placeholder"
-            android:textColor="@color/white" />
+            android:textColor="@android:color/white" />
     </FrameLayout>
 
     <TextView
diff --git a/library/src/main/res/layout-land/time_picker_dialog.xml b/library/src/main/res/layout-land/time_picker_dialog.xml
index fc8495b..78a5783 100644
--- a/library/src/main/res/layout-land/time_picker_dialog.xml
+++ b/library/src/main/res/layout-land/time_picker_dialog.xml
@@ -29,8 +29,7 @@
             android:id="@+id/time_display_background"
             android:layout_width="@dimen/left_side_width"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:background="@color/accent_color">
+            android:layout_weight="1">
 
             <include
                 layout="@layout/time_header_label"
@@ -39,6 +38,6 @@
                 android:layout_gravity="center" />
         </FrameLayout>
 
-        <include layout="@layout/done_button" />
+        <include layout="@layout/buttons" />
     </LinearLayout>
 </LinearLayout>
diff --git a/library/src/main/res/layout-land/time_picker_dialog_v2.xml b/library/src/main/res/layout-land/time_picker_dialog_v2.xml
index 2d97be4..85a1104 100644
--- a/library/src/main/res/layout-land/time_picker_dialog_v2.xml
+++ b/library/src/main/res/layout-land/time_picker_dialog_v2.xml
@@ -13,8 +13,7 @@
     <FrameLayout
         android:id="@+id/time_display_background"
         android:layout_width="@dimen/date_picker_header_width"
-        android:layout_height="match_parent"
-        android:background="@color/accent_color">
+        android:layout_height="match_parent">
 
         <include
             layout="@layout/time_header_label"
@@ -39,7 +38,7 @@
             android:focusableInTouchMode="true" />
 
         <include
-            layout="@layout/done_button"
+            layout="@layout/buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="-16dp" />
diff --git a/library/src/main/res/layout-land/time_title_view_v2.xml b/library/src/main/res/layout-land/time_title_view_v2.xml
index 7749140..f23363d 100644
--- a/library/src/main/res/layout-land/time_title_view_v2.xml
+++ b/library/src/main/res/layout-land/time_title_view_v2.xml
@@ -4,13 +4,13 @@
     android:id="@+id/time_picker_header"
     android:layout_width="@dimen/date_picker_title_height"
     android:layout_height="match_parent"
-    android:background="@color/accent_color_dark"
+    android:background="?colorPrimaryVariant"
     android:gravity="bottom|center"
     android:includeFontPadding="false"
     android:maxLines="1"
     android:paddingTop="@dimen/date_picker_title_padding"
     android:textAllCaps="@bool/title_all_caps"
-    android:textColor="@color/white"
+    android:textColor="?colorOnPrimary"
     android:textSize="@dimen/time_picker_header_text_size"
     android:visibility="gone"
     tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/library/src/main/res/layout-sw600dp-land/date_picker_dialog.xml b/library/src/main/res/layout-sw600dp-land/date_picker_dialog.xml
index a91459c..0931cc0 100644
--- a/library/src/main/res/layout-sw600dp-land/date_picker_dialog.xml
+++ b/library/src/main/res/layout-sw600dp-land/date_picker_dialog.xml
@@ -26,5 +26,5 @@
         <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout-sw600dp/date_picker_dialog.xml b/library/src/main/res/layout-sw600dp/date_picker_dialog.xml
index c5a9a5d..32fa6d1 100644
--- a/library/src/main/res/layout-sw600dp/date_picker_dialog.xml
+++ b/library/src/main/res/layout-sw600dp/date_picker_dialog.xml
@@ -20,5 +20,5 @@
 
     <include layout="@layout/date_picker_view_animator" />
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout-w270dp-h560dp/date_picker_dialog.xml b/library/src/main/res/layout-w270dp-h560dp/date_picker_dialog.xml
index afa0a12..4b124e0 100644
--- a/library/src/main/res/layout-w270dp-h560dp/date_picker_dialog.xml
+++ b/library/src/main/res/layout-w270dp-h560dp/date_picker_dialog.xml
@@ -20,5 +20,5 @@
         <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/done_button.xml b/library/src/main/res/layout/buttons.xml
similarity index 76%
rename from library/src/main/res/layout/done_button.xml
rename to library/src/main/res/layout/buttons.xml
index 929937d..cbee8f4 100644
--- a/library/src/main/res/layout/done_button.xml
+++ b/library/src/main/res/layout/buttons.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:layout_gravity="center_vertical"
-    android:background="@android:color/transparent"
     android:gravity="end"
     android:orientation="horizontal"
     android:paddingBottom="8dp"
@@ -17,7 +16,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:text="@android:string/cancel" />
+        android:background="?buttonTint"
+        android:text="@android:string/cancel"
+        android:textColor="?colorOnSecondary" />
 
     <Button
         android:id="@+id/ok"
@@ -25,5 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:text="@android:string/ok" />
+        android:background="?buttonTint"
+        android:text="@android:string/ok"
+        android:textColor="?colorOnSecondary" />
 </LinearLayout>
diff --git a/library/src/main/res/layout/date_picker_dialog.xml b/library/src/main/res/layout/date_picker_dialog.xml
index 705e489..d29a5bf 100644
--- a/library/src/main/res/layout/date_picker_dialog.xml
+++ b/library/src/main/res/layout/date_picker_dialog.xml
@@ -19,5 +19,5 @@
         <include layout="@layout/date_picker_view_animator" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/date_picker_dialog_v2.xml b/library/src/main/res/layout/date_picker_dialog_v2.xml
index 6cc9823..e5af5d5 100644
--- a/library/src/main/res/layout/date_picker_dialog_v2.xml
+++ b/library/src/main/res/layout/date_picker_dialog_v2.xml
@@ -20,5 +20,5 @@
         <include layout="@layout/date_picker_view_animator_v2" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
diff --git a/library/src/main/res/layout/date_picker_header_view.xml b/library/src/main/res/layout/date_picker_header_view.xml
index b51517b..7192112 100644
--- a/library/src/main/res/layout/date_picker_header_view.xml
+++ b/library/src/main/res/layout/date_picker_header_view.xml
@@ -4,11 +4,11 @@
     android:id="@+id/date_picker_header"
     android:layout_width="match_parent"
     android:layout_height="@dimen/date_picker_title_height"
-    android:background="@color/calendar_header"
+    android:background="?colorPrimaryVariant"
     android:gravity="center"
     android:importantForAccessibility="no"
     android:includeFontPadding="false"
     android:textAllCaps="@bool/title_all_caps"
-    android:textColor="@color/white"
+    android:textColor="?colorOnPrimary"
     android:textSize="@dimen/date_picker_header_text_size"
     tools:viewBindingIgnore="true" />
diff --git a/library/src/main/res/layout/date_picker_header_view_v2.xml b/library/src/main/res/layout/date_picker_header_view_v2.xml
index 1a21662..123f7ff 100644
--- a/library/src/main/res/layout/date_picker_header_view_v2.xml
+++ b/library/src/main/res/layout/date_picker_header_view_v2.xml
@@ -5,11 +5,11 @@
     android:id="@+id/date_picker_header"
     android:layout_width="match_parent"
     android:layout_height="@dimen/date_picker_title_height"
-    android:background="@color/calendar_header"
+    android:background="?colorPrimaryVariant"
     android:gravity="center"
     android:importantForAccessibility="no"
     android:includeFontPadding="false"
-    android:textColor="@color/white"
+    android:textColor="?colorOnPrimary"
     android:textSize="@dimen/date_picker_header_text_size"
     tool:text="DIALOG TITLE"
     tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/library/src/main/res/layout/date_picker_selected_date.xml b/library/src/main/res/layout/date_picker_selected_date.xml
index 67af2df..0e5f18e 100644
--- a/library/src/main/res/layout/date_picker_selected_date.xml
+++ b/library/src/main/res/layout/date_picker_selected_date.xml
@@ -5,7 +5,7 @@
     android:layout_width="@dimen/date_picker_component_width"
     android:layout_height="@dimen/selected_date_height"
     android:layout_weight="1"
-    android:background="@color/accent_color"
+    android:background="?colorPrimary"
     android:gravity="center"
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
diff --git a/library/src/main/res/layout/date_picker_selected_date_v2.xml b/library/src/main/res/layout/date_picker_selected_date_v2.xml
index 2741752..82ce8f9 100644
--- a/library/src/main/res/layout/date_picker_selected_date_v2.xml
+++ b/library/src/main/res/layout/date_picker_selected_date_v2.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/date_picker_header_height"
     android:layout_weight="1"
-    android:background="@color/accent_color"
+    android:background="?colorPrimary"
     android:gravity="top"
     android:orientation="vertical"
     android:padding="16dp"
diff --git a/library/src/main/res/layout/time_header_label.xml b/library/src/main/res/layout/time_header_label.xml
index 09337e3..cc8011d 100644
--- a/library/src/main/res/layout/time_header_label.xml
+++ b/library/src/main/res/layout/time_header_label.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-    android:background="@color/accent_color"
+    android:background="?colorPrimary"
     android:clipChildren="false"
     tools:ignore="RtlHardcoded"
     tools:viewBindingIgnore="true">
@@ -50,7 +50,7 @@
             android:background="@android:color/transparent"
             android:gravity="center_horizontal"
             android:text="@string/time_placeholder"
-            android:textColor="@color/white" />
+            android:textColor="@android:color/white" />
     </FrameLayout>
 
     <TextView
diff --git a/library/src/main/res/layout/time_picker_dialog.xml b/library/src/main/res/layout/time_picker_dialog.xml
index 5f14c55..88bc456 100644
--- a/library/src/main/res/layout/time_picker_dialog.xml
+++ b/library/src/main/res/layout/time_picker_dialog.xml
@@ -13,7 +13,6 @@
         android:id="@+id/time_display_background"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/accent_color"
         android:orientation="vertical">
 
         <include layout="@layout/time_title_view" />
@@ -34,5 +33,5 @@
             android:focusableInTouchMode="true" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/time_picker_dialog_v2.xml b/library/src/main/res/layout/time_picker_dialog_v2.xml
index 29b0260..033283e 100644
--- a/library/src/main/res/layout/time_picker_dialog_v2.xml
+++ b/library/src/main/res/layout/time_picker_dialog_v2.xml
@@ -13,7 +13,6 @@
         android:id="@+id/time_display_background"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/accent_color"
         android:orientation="vertical">
 
         <include layout="@layout/time_title_view_v2" />
@@ -34,5 +33,5 @@
             android:focusableInTouchMode="true" />
     </LinearLayout>
 
-    <include layout="@layout/done_button" />
+    <include layout="@layout/buttons" />
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/time_title_view.xml b/library/src/main/res/layout/time_title_view.xml
index c453cd8..f20be1c 100644
--- a/library/src/main/res/layout/time_title_view.xml
+++ b/library/src/main/res/layout/time_title_view.xml
@@ -4,13 +4,13 @@
     android:id="@+id/time_picker_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/accent_color_dark"
+    android:background="?colorPrimaryVariant"
     android:gravity="center"
     android:includeFontPadding="false"
     android:padding="8dp"
     android:singleLine="true"
     android:textAllCaps="@bool/title_all_caps"
-    android:textColor="@color/white"
+    android:textColor="?colorOnPrimary"
     android:textSize="@dimen/time_picker_header_text_size"
     android:visibility="gone"
     tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/library/src/main/res/layout/time_title_view_v2.xml b/library/src/main/res/layout/time_title_view_v2.xml
index 9bafdfc..74708a5 100644
--- a/library/src/main/res/layout/time_title_view_v2.xml
+++ b/library/src/main/res/layout/time_title_view_v2.xml
@@ -4,13 +4,13 @@
     android:id="@+id/time_picker_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/accent_color_dark"
+    android:background="?colorPrimaryVariant"
     android:gravity="center"
     android:includeFontPadding="false"
     android:maxLines="1"
     android:padding="8dp"
     android:textAllCaps="@bool/title_all_caps"
-    android:textColor="@color/white"
+    android:textColor="?colorOnPrimary"
     android:textSize="@dimen/time_picker_header_text_size"
     android:visibility="gone"
     tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/library/src/main/res/layout/year_label_text_view.xml b/library/src/main/res/layout/year_label_text_view.xml
index 6e2297d..963c48a 100644
--- a/library/src/main/res/layout/year_label_text_view.xml
+++ b/library/src/main/res/layout/year_label_text_view.xml
@@ -8,5 +8,5 @@
     android:gravity="center"
     android:textColor="@color/date_picker_year_selector"
     android:textSize="@dimen/year_label_text_size"
-    tools:viewBindingIgnore="true"
-    tools:ignore="SpUsage" />
+    tools:ignore="SpUsage"
+    tools:viewBindingIgnore="true" />
diff --git a/library/src/main/res/values-night/colors.xml b/library/src/main/res/values-night/colors.xml
index d40ca63..5474853 100644
--- a/library/src/main/res/values-night/colors.xml
+++ b/library/src/main/res/values-night/colors.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="accent_color_dark">#444</color>
     <color name="date_picker_view_animator">@color/light_gray</color>
-    <color name="date_picker_text_normal">@color/white</color>
+    <color name="date_picker_text_normal">@android:color/white</color>
     <color name="date_picker_month_day">#b4b4b4</color>
     <color name="date_picker_text_disabled">#767676</color>
     <color name="date_picker_text_highlighted">@color/date_picker_text_normal</color>
-    <color name="calendar_selected_day_text">@color/accent_color</color>
 </resources>
\ No newline at end of file
diff --git a/library/src/main/res/values-sw600dp/dimens.xml b/library/src/main/res/values-sw600dp/dimens.xml
index 9443fa0..a16fd30 100644
--- a/library/src/main/res/values-sw600dp/dimens.xml
+++ b/library/src/main/res/values-sw600dp/dimens.xml
@@ -12,8 +12,8 @@
     <dimen name="selected_date_month_size">45dp</dimen>
     <dimen name="year_label_height">96dp</dimen>
     <dimen name="year_label_text_size">33dp</dimen>
-    <dimen name="date_picker_header_text_size">18dp</dimen>
-    <dimen name="time_picker_header_text_size">18dp</dimen>
+    <dimen name="date_picker_header_text_size">18sp</dimen>
+    <dimen name="time_picker_header_text_size">18sp</dimen>
 
     <dimen name="month_label_size">16sp</dimen>
     <dimen name="day_number_size">14sp</dimen>
diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
index 39357df..b6268f0 100644
--- a/library/src/main/res/values/colors.xml
+++ b/library/src/main/res/values/colors.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="white">#fff</color>
-    <color name="background_color">@color/white</color>
+    <color name="background_color">@android:color/white</color>
     <color name="circle_background">@color/background_color</color>
     <color name="circle_background_dark_theme">#525252</color><!-- don't move -->
     <color name="circle_color">#f5f5f5</color>
-    <color name="ampm_text_color">@color/numbers_text_color</color>
     <color name="numbers_text_color">#212121</color>
     <color name="translucent_black">#7f000000</color>
-    <color name="accent_color">#48D587</color>
     <color name="accent_color_focused">#76ffffff</color>
-    <color name="accent_color_dark">#004903</color>
     <color name="date_picker_text_normal">#212121</color>
     <color name="date_picker_text_highlighted">@color/date_picker_text_normal</color>
     <color name="date_picker_text_disabled">#CCC</color>
     <color name="date_picker_month_day">#767676</color>
-    <color name="calendar_header">@color/accent_color_dark</color>
     <color name="date_picker_view_animator">@android:color/white</color>
-    <color name="calendar_selected_day_text">@color/white</color>
-    <color name="button_color">@color/accent_color</color>
     <color name="light_gray">#424242</color>
 </resources>
\ No newline at end of file
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
index cc00504..5d1c0ef 100644
--- a/library/src/main/res/values/dimens.xml
+++ b/library/src/main/res/values/dimens.xml
@@ -67,8 +67,8 @@
     <dimen name="selected_date_year_size">25dp</dimen>
     <dimen name="selected_date_day_size">70dp</dimen>
     <dimen name="selected_date_month_size">25dp</dimen>
-    <dimen name="date_picker_header_text_size">12dp</dimen>
-    <dimen name="time_picker_header_text_size">12dp</dimen>
+    <dimen name="date_picker_header_text_size">12sp</dimen>
+    <dimen name="time_picker_header_text_size">12sp</dimen>
     <dimen name="month_label_size">14sp</dimen>
     <dimen name="day_number_size">12sp</dimen>
     <dimen name="year_label_height">64dp</dimen>
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index 123a844..2bd6dc2 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -15,7 +15,7 @@
     <style name="ampm_label">
         <item name="android:textSize">@dimen/ampm_label_size</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/ampm_text_color</item>
+        <item name="android:textColor">?colorOnSurface</item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -36,7 +36,7 @@
         <item name="android:minWidth">@dimen/material_button_minwidth</item>
         <item name="android:paddingLeft">@dimen/material_button_textpadding_horizontal</item>
         <item name="android:paddingRight">@dimen/material_button_textpadding_horizontal</item>
-        <item name="android:textColor">@color/button_color</item>
+        <item name="android:textColor">?colorOnSecondary</item>
         <item name="android:textAllCaps">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/sample/src/main/res/values-night/themes.xml b/sample/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..a90615e
--- /dev/null
+++ b/sample/src/main/res/values-night/themes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.MultiCalendarDTP" parent="Theme.Material3.DayNight">
+        <item name="colorPrimary">#FF6F00</item>
+        <item name="colorPrimaryVariant">#E36505</item>
+        <item name="colorOnPrimary">#FFF</item>
+        <item name="colorSecondary">#07CAAD</item>
+        <item name="colorOnSecondary">#ECF8F6</item>
+        <item name="colorSurface">#03715F</item>
+        <item name="colorOnSurface">#FFF</item>
+        <item name="buttonTint">@android:color/transparent</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml
index 2db2e32..002a79c 100644
--- a/sample/src/main/res/values/themes.xml
+++ b/sample/src/main/res/values/themes.xml
@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.MultiCalendarDTP" parent="Theme.AppCompat.DayNight" />
+    <!--
+      header:
+        background: ?colorPrimaryVariant
+        text: ?colorOnPrimary
+      selectedDateHeader:
+        background: ?colorPrimary
+        text: ?colorOnPrimary
+      main:
+        background: ?colorSurface
+        text: ?colorOnSurface
+      selectedDate + AmPm:
+        background: ?colorPrimary
+        text: ?colorOnPrimary
+      buttons:
+        background: ?buttonTint
+        text: ?colorOnSecondary
+    -->
+    <style name="Theme.MultiCalendarDTP" parent="Theme.Material3.DayNight">
+        <item name="colorPrimary">#FF6F00</item>
+        <item name="colorPrimaryVariant">#E36505</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorSecondary">#07CAAD</item>
+        <item name="colorOnSecondary">#03715F</item>
+        <item name="colorSurface">#ECF8F6</item>
+        <item name="colorOnSurface">#03715F</item>
+        <item name="buttonTint">@android:color/transparent</item>
+    </style>
 </resources>
\ No newline at end of file