From acf9db6903725e1e26ab7a999e9550374d917e80 Mon Sep 17 00:00:00 2001
From: Michael Angelo Reyes <michaelangelo.reyes19@gmail.com>
Date: Thu, 20 Feb 2025 00:11:10 +0800
Subject: [PATCH] [23356] - [TripKitUI] update fragment_routing.xml to remove
 cursor color by setting textCursorDrawable to null - [TripKitUI] update
 fragment_tkui_date_time_picker_dialog.xml to set theme to make the calendar
 selector color generic - [TripKitUI] update styles.xml to add custom style
 for CalendarView

---
 .../res/layout/fragment_tkui_date_time_picker_dialog.xml    | 2 +-
 TripKitAndroidUI/src/main/res/values/styles.xml             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml
index 5e222c97..43db2c29 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml
@@ -150,13 +150,13 @@
 
                         <CalendarView
                             android:id="@+id/dpDate"
+                            android:theme="@style/Widget.CalendarView.Custom"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:datePickerMode="spinner"
                             android:background="@android:color/white"
                             android:spinnersShown="false"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:appCalendarSelectedTint="@{null}"
                             android:focusedMonthDateColor="@color/tripKitWarning"
                             />
 
diff --git a/TripKitAndroidUI/src/main/res/values/styles.xml b/TripKitAndroidUI/src/main/res/values/styles.xml
index 6e52900e..b48c4180 100644
--- a/TripKitAndroidUI/src/main/res/values/styles.xml
+++ b/TripKitAndroidUI/src/main/res/values/styles.xml
@@ -71,4 +71,10 @@
         <item name="android:windowIsFloating">false</item>
     </style>
 
+    <style name="Widget.CalendarView.Custom" parent="Theme.MaterialComponents.Light" >
+        <item name="android:focusedMonthDateColor">@color/description_text</item>
+        <item name="colorControlActivated">@color/description_text</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
+
 </resources>