From b0e0feb29a174ea5075636c027a0ba3ba2f8484b Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Tue, 19 Apr 2022 22:36:12 +0200
Subject: [PATCH] OK cancel button color

---
 .../androidaps/activities/HistoryBrowseActivity.kt  |  1 +
 .../general/automation/elements/InputDateTime.kt    |  8 +++++---
 .../androidaps/dialogs/DialogFragmentWithDate.kt    |  2 ++
 core/src/main/res/values-night/styles.xml           | 13 +++++++++++++
 core/src/main/res/values/styles.xml                 | 11 +++++++++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
index 8f64cb226b..ab12179b23 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -151,6 +151,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         binding.date.setOnClickListener {
             MaterialDatePicker.Builder.datePicker()
                 .setSelection(dateUtil.timeStampToUtcDateMilis(overviewData.fromTime))
+                .setTheme(R.style.DatePicker)
                 .build()
                 .apply {
                     addOnPositiveButtonClickListener { selection ->
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
index 861cf8a194..d63cf0452c 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.content.Context
 import android.graphics.Typeface
 import android.text.format.DateFormat
+import android.view.ContextThemeWrapper
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import android.view.ContextThemeWrapper
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.timepicker.MaterialTimePicker
@@ -39,6 +39,7 @@ class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUt
                         setOnClickListener {
                             getFragmentManager(root.context)?.let { fm ->
                                 MaterialDatePicker.Builder.datePicker()
+                                    .setTheme(R.style.DatePicker)
                                     .setSelection(dateUtil.timeStampToUtcDateMilis(value))
                                     .build()
                                     .apply {
@@ -60,6 +61,7 @@ class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUt
                                 val cal = Calendar.getInstance().apply { timeInMillis = value }
                                 val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H
                                 val timePicker = MaterialTimePicker.Builder()
+                                    .setTheme(R.style.TimePicker)
                                     .setTimeFormat(clockFormat)
                                     .setHour(cal.get(Calendar.HOUR_OF_DAY))
                                     .setMinute(cal.get(Calendar.MINUTE))
@@ -78,9 +80,9 @@ class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUt
 
     private fun getFragmentManager(context: Context?): FragmentManager? {
         return when (context) {
-            is AppCompatActivity   -> context.supportFragmentManager
+            is AppCompatActivity -> context.supportFragmentManager
             is ContextThemeWrapper -> getFragmentManager(context.baseContext)
-            else                   -> null
+            else -> null
         }
     }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
index 7a56579093..a7bff8e52b 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
@@ -83,6 +83,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
         eventDateView?.setOnClickListener {
             val selection = dateUtil.timeStampToUtcDateMilis(eventTime)
             MaterialDatePicker.Builder.datePicker()
+                .setTheme(R.style.DatePicker)
                 .setSelection(selection)
                 .build()
                 .apply {
@@ -105,6 +106,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
                 .setTimeFormat(clockFormat)
                 .setHour(cal.get(Calendar.HOUR_OF_DAY))
                 .setMinute(cal.get(Calendar.MINUTE))
+                .setTheme(R.style.TimePicker)
                 .build()
             timePicker.addOnPositiveButtonClickListener {
                 // Randomize seconds to prevent creating record of the same time, if user choose time manually
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 3cec089184..1fd1f28909 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -239,6 +239,8 @@
         <item name="separatorColor">@color/sphere_plastic_grey</item>
         <item name="isCompletedColor">@color/isCompleted</item>
         <item name="isNotCompletedColor">@color/isNotCompleted</item>
+        <item name="materialCalendarStyle">@style/DatePicker</item>
+        <item name="materialTimePickerStyle">@style/DatePicker</item>
     </style>
 
     <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
@@ -269,6 +271,17 @@
         <item name="dialogTitleBackground">@color/dialog_title_background</item>
     </style>
 
+    <!-- Style for Material Date Picker -->
+    <style name="DatePicker" parent="@style/ThemeOverlay.MaterialComponents.MaterialCalendar">
+        <item name="buttonBarPositiveButtonStyle">@style/PickerTextButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/PickerTextButton</item>
+    </style>
+
+    <!-- Style for Material Time Picker -->
+    <style name="TimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
+        <item name="buttonStyle">@style/PickerTextButton</item>
+    </style>
+
     <!--    Buttons from MaterialDateTimePicker, Dialogs ...    -->
     <dimen name="material_button_height">48dp</dimen>
     <dimen name="material_button_text_size">14sp</dimen>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 37c3b389f9..931a501a40 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -272,6 +272,17 @@
         <item name="dialogTitleBackground">@color/dialog_title_background</item>
     </style>
 
+    <!-- Style for Material Date Picker -->
+    <style name="DatePicker" parent="@style/ThemeOverlay.MaterialComponents.MaterialCalendar">
+        <item name="buttonBarPositiveButtonStyle">@style/PickerTextButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/PickerTextButton</item>
+    </style>
+
+    <!-- Style for Material Time Picker -->
+    <style name="TimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
+        <item name="buttonStyle">@style/PickerTextButton</item>
+    </style>
+
     <!--    Buttons from MaterialDateTimePicker, Dialogs ...    -->
     <dimen name="material_button_height">48dp</dimen>
     <dimen name="material_button_text_size">14sp</dimen>