From 5a3fa95d13a35bbdff78ed0a5a441c3a6833f3e4 Mon Sep 17 00:00:00 2001
From: alexzatsepin <az@mapswithme.com>
Date: Wed, 2 Sep 2020 12:47:18 +0300
Subject: [PATCH] [android] Changed surface color for material date picker in
 night theme to make the fonts in edit fields visible to user, i.e. their
 white

---
 android/res/values/colors.xml      |  2 ++
 android/res/values/styles.xml      | 10 ++++++++++
 android/res/values/themes-base.xml |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index a67aa126ad..142664b495 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -236,4 +236,6 @@
   <color name="city_color">#9B24B2</color>
   <color name="city_color_night">#9867FC</color>
   <color name="outdoor_color_night">#93BF39</color>
+
+  <color name="material_calendar_surface_dark">#929292</color>
 </resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 514aee0c25..3a3b8b549c 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -377,6 +377,16 @@
     <item name="chipBackgroundColor">?chipBackgroundColor</item>
   </style>
 
+  <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
+    parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
+    <item name="colorSurface">@color/material_calendar_surface_dark</item>
+  </style>
+
+  <style name="MwmWidget.MaterialCalendar.Theme.Dark"
+    parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
+    <item name="colorSurface">@color/material_calendar_surface_dark</item>
+  </style>
+
   <style name="TextAppearance" parent="MwmTextAppearance.Body3"/>
 
   <style name="TextAppearance.Small" parent="MwmTextAppearance.Body4"/>
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index b3d724ff01..b78a3ad26a 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -207,8 +207,8 @@
   <!-- Night theme -->
   <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
     <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
-    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
+    <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
     <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
     <item name="android:textViewStyle">@style/MwmWidget.TextView</item>