From fc04805bc051f88b16b4f50bff2efc081dc1f387 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 10 Dec 2020 12:29:07 +0100
Subject: [PATCH 1/7] Disable future dates in date range picker

---
 .../ui/activitylog/list/ActivityLogListFragment.kt        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
index de77d4996aec..a180a7fbb8aa 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
@@ -10,6 +10,8 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.DateValidatorPointBackward
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_log_list_fragment.*
@@ -174,6 +176,12 @@ class ActivityLogListFragment : Fragment() {
     private fun showDateRangePicker(initialDateRange: DateRange?) {
         val picker = MaterialDatePicker.Builder
                 .dateRangePicker()
+                .setCalendarConstraints(
+                        CalendarConstraints.Builder()
+                                .setValidator(DateValidatorPointBackward.now())
+                                .setEnd(MaterialDatePicker.todayInUtcMilliseconds())
+                                .build()
+                )
                 .setSelection(initialDateRange)
                 .build()
         initDateRangePickerButtonClickListener(picker)

From c4cbe5092137ff8aac4144cc70f4dc117cab47c2 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 10 Dec 2020 12:33:42 +0100
Subject: [PATCH 2/7] Update calendar styles

---
 WordPress/src/main/res/values/styles.xml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index a6363b30fca2..9fc29fc19088 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -100,9 +100,6 @@
         <item name="materialCalendarTheme">@style/WordPress.MaterialCalendarTheme</item>
     </style>
 
-    <style name="WordPress.MaterialCalendarStyle" parent="Widget.MaterialComponents.MaterialCalendar">
-    </style>
-
     <style name="WordPress.MaterialCalendarFullscreenTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
         <item name="materialCalendarHeaderTitle">@style/WordPress.MaterialCalendarHeaderTitle</item>
         <item name="materialCalendarHeaderLayout">@style/WordPress.MaterialCalendarHeaderLayout</item>
@@ -110,10 +107,19 @@
         <item name="materialCalendarHeaderToggleButton">@style/WordPress.MaterialCalendarHeaderToggleButton</item>
         <item name="materialCalendarHeaderConfirmButton">@style/WordPress.MaterialCalendarHeaderConfirmButton</item>
         <item name="materialCalendarHeaderDivider">@style/WordPress.MaterialCalendarHeaderDivider</item>
+        <!--    Days of week header    -->
+        <item name="textAppearanceBody2">@style/WordPress.TextAppearance.MaterialCalendarDaysOfWeek</item>
+        <!-- Grid day items  -->
+        <item name="materialCalendarDay">@style/WordPress.MaterialCalendarDayTextView</item>
         <!-- Used to color the cancel button which doesn't use any overridable styles -->
         <item name="colorOnPrimary">?attr/colorOnSurface</item>
     </style>
 
+    <style name="WordPress.MaterialCalendarStyle" parent="Widget.MaterialComponents.MaterialCalendar.Fullscreen">
+        <!-- Grid selected day item  -->
+        <item name="daySelectedStyle">@style/WordPress.MaterialCalendarSelectedDay</item>
+    </style>
+
     <style name="WordPress.MaterialCalendarTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
     </style>
 
@@ -143,6 +149,18 @@
         <item name="android:background">?attr/colorOnSurface</item>
     </style>
 
+    <style name="WordPress.TextAppearance.MaterialCalendarDaysOfWeek" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:textSize">@dimen/text_sz_medium</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarDayTextView" parent="Widget.MaterialComponents.MaterialCalendar.DayTextView">
+        <item name="android:textSize">@dimen/text_sz_medium</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarSelectedDay" parent="Widget.MaterialComponents.MaterialCalendar.Day.Selected">
+        <item name="itemTextColor">?attr/colorOnSecondary</item>
+    </style>
+
     <style name="WordPress.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
         <item name="subtitleTextStyle">@style/WordPress.ActionMode.SubtitleTextStyle</item>
         <item name="titleTextStyle">@style/WordPress.ActionMode.TitleTextStyle</item>

From d31609f68c2c87cab157da31e15af4e0ff3146b2 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 10 Dec 2020 12:34:26 +0100
Subject: [PATCH 3/7] Fix WordPress.MaterialCalendarStyle

---
 WordPress/src/main/res/values/styles.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 9fc29fc19088..1641d4e4deb9 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -95,12 +95,13 @@
         <item name="layoutPickerBackground">@color/white</item>
 
         <!-- Material Date Range Picker -->
-        <item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
+        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
         <item name="materialCalendarFullscreenTheme">@style/WordPress.MaterialCalendarFullscreenTheme</item>
         <item name="materialCalendarTheme">@style/WordPress.MaterialCalendarTheme</item>
     </style>
 
     <style name="WordPress.MaterialCalendarFullscreenTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
+        <item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
         <item name="materialCalendarHeaderTitle">@style/WordPress.MaterialCalendarHeaderTitle</item>
         <item name="materialCalendarHeaderLayout">@style/WordPress.MaterialCalendarHeaderLayout</item>
         <item name="materialCalendarHeaderSelection">@style/WordPress.MaterialCalendarHeaderSelection</item>

From 3b32da9f688cef1dc641cda3a0a8d7e9c0597e8c Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 10 Dec 2020 12:35:21 +0100
Subject: [PATCH 4/7] Update header divider color

---
 WordPress/src/main/res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 1641d4e4deb9..2dc66a31ed07 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -147,7 +147,7 @@
 
     <style name="WordPress.MaterialCalendarHeaderDivider" parent="Widget.MaterialComponents.MaterialCalendar.HeaderDivider">
         <item name="android:visibility">visible</item>
-        <item name="android:background">?attr/colorOnSurface</item>
+        <item name="android:background">@color/divider</item>
     </style>
 
     <style name="WordPress.TextAppearance.MaterialCalendarDaysOfWeek" parent="TextAppearance.MaterialComponents.Body2">

From 11222402f6690bb8d181f2140378d49144a29362 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 10 Dec 2020 12:35:58 +0100
Subject: [PATCH 5/7] Update text appearance of selected dates

---
 WordPress/src/main/res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 2dc66a31ed07..24ef0dd13fc8 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -134,6 +134,7 @@
 
     <style name="WordPress.MaterialCalendarHeaderSelection" parent="Widget.MaterialComponents.MaterialCalendar.HeaderSelection.Fullscreen">
         <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
     </style>
 
     <style name="WordPress.MaterialCalendarHeaderToggleButton" parent="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton">

From 9be6009dcb44fcd69e7df3b7ac7f8f4e5656244f Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 10 Dec 2020 13:06:56 +0100
Subject: [PATCH 6/7] Use fullscreen date range picker on tablets

---
 .../android/ui/activitylog/list/ActivityLogListFragment.kt       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
index a180a7fbb8aa..bd04d2e6f5bc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
@@ -176,6 +176,7 @@ class ActivityLogListFragment : Fragment() {
     private fun showDateRangePicker(initialDateRange: DateRange?) {
         val picker = MaterialDatePicker.Builder
                 .dateRangePicker()
+                .setTheme(R.style.WordPress_MaterialCalendarFullscreenTheme)
                 .setCalendarConstraints(
                         CalendarConstraints.Builder()
                                 .setValidator(DateValidatorPointBackward.now())

From 8788064ce03cdadcfd4d6416b33a892c7c82c432 Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Wed, 16 Dec 2020 09:46:10 +0100
Subject: [PATCH 7/7] Update background color of the content in dark mode

---
 WordPress/src/main/res/values/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 93bbc8c2784b..b438d2907852 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -114,6 +114,7 @@
         <item name="materialCalendarDay">@style/WordPress.MaterialCalendarDayTextView</item>
         <!-- Used to color the cancel button which doesn't use any overridable styles -->
         <item name="colorOnPrimary">?attr/colorOnSurface</item>
+        <item name="android:background">?attr/colorSurface</item>
     </style>
 
     <style name="WordPress.MaterialCalendarStyle" parent="Widget.MaterialComponents.MaterialCalendar.Fullscreen">
@@ -135,6 +136,7 @@
     <style name="WordPress.MaterialCalendarHeaderSelection" parent="Widget.MaterialComponents.MaterialCalendar.HeaderSelection.Fullscreen">
         <item name="android:textColor">?attr/colorOnSurface</item>
         <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
+        <item name="android:background">@color/transparent</item>
     </style>
 
     <style name="WordPress.MaterialCalendarHeaderToggleButton" parent="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton">