Skip to content

Added UpdateTextColor extension for TimePicker (fixed test failure in August 25th, 2025 Candidate) #31460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfversluis merged 3 commits into from
Sep 4, 2025
Merged

Added UpdateTextColor extension for TimePicker (fixed test failure in August 25th, 2025 Candidate) #31460

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b9fdbd
Add UpdateTextColor extension for TimePicker
kubaflo Sep 2, 2025
c1311e5
Restore default text color in TimePicker on Android
kubaflo Sep 3, 2025
9fa40e5
Update src/Core/src/Platform/Android/TimePickerExtensions.cs
jfversluis Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/Core/src/Platform/Android/TimePickerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace Microsoft.Maui.Platform
using System;
using Android.Content.Res;

namespace Microsoft.Maui.Platform
{
public static class TimePickerExtensions
{
Expand All @@ -19,5 +22,25 @@ internal static void SetTime(this MauiTimePicker mauiTimePicker, ITimePicker tim

mauiTimePicker.Text = time.ToFormattedString(format);
}

// TODO: Make it public in Net10
internal static void UpdateTextColor(this MauiTimePicker platformTimePicker, ITimePicker timePicker)
{
var textColor = timePicker.TextColor;

if (textColor is not null && PlatformInterop.CreateEditTextColorStateList(platformTimePicker.TextColors, textColor.ToPlatform()) is ColorStateList c)
{
platformTimePicker.SetTextColor(c);
}
else if (OperatingSystem.IsAndroidVersionAtLeast(23) && platformTimePicker.Context?.Theme is Resources.Theme theme)
{
// Restore to default (theme primary text color) instead of passing null
using var ta = theme.ObtainStyledAttributes([Android.Resource.Attribute.TextColorPrimary]);
if (ta.GetColorStateList(0) is ColorStateList cs)
{
platformTimePicker.SetTextColor(cs);
}
}
}
}
}