Skip to content

[Android] Improve text field's default text color handling & fix Test case failure in PR 31327 #31366

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 1 commit into from
Aug 29, 2025
Merged

[Android] Improve text field's default text color handling & fix Test case failure in PR 31327 #31366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions src/Core/src/Platform/Android/EditTextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Android.Views.InputMethods;
using Android.Widget;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Maui.Graphics;
using static Android.Views.View;
using static Android.Widget.TextView;

Expand Down Expand Up @@ -47,13 +48,19 @@ public static void UpdateTextColor(this EditText editText, Graphics.Color textCo
else
{
// Fallback to system default color
var typedValue = new TypedValue();
if (OperatingSystem.IsAndroidVersionAtLeast(23) &&
editText.Context?.Theme is Resources.Theme theme &&
theme.ResolveAttribute(Android.Resource.Attribute.TextColorPrimary, typedValue, true) &&
editText.Resources?.GetColor(typedValue.ResourceId, theme) is Android.Graphics.Color color)
if (OperatingSystem.IsAndroidVersionAtLeast(23) && editText.Context?.Theme is Resources.Theme theme)
{
editText.SetTextColor(color);
using var ta = theme.ObtainStyledAttributes([Android.Resource.Attribute.TextColorPrimary]);
var cs = ta.GetColorStateList(0);

if (cs is not null)
{
int[] DisabledState = [-Android.Resource.Attribute.StateEnabled];
int[] EnabledState = [Android.Resource.Attribute.StateEnabled];
var state = editText.Enabled ? EnabledState : DisabledState;
var color = new Android.Graphics.Color(cs.GetColorForState(state, Colors.Black.ToPlatform()));
editText.SetTextColor(color);
}
}
}
}
Expand Down
Loading