Skip to content

[.NET 11] Fix Material3 failures in net 11 branch #37342

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
kubaflo merged 3 commits into from
Aug 13, 2026
Merged

[.NET 11] Fix Material3 failures in net 11 branch #37342

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf3eaa5
Fixed material3 test failure
Dhivya-SF4094 Aug 12, 2026
6c8e860
Updated ToolbarExtensions.cs
Dhivya-SF4094 Aug 12, 2026
a326350
Removed GetDefaultForegroundColor
Dhivya-SF4094 Aug 12, 2026
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
39 changes: 18 additions & 21 deletions src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,6 @@ public static void UpdateBarTextColor(this AToolbar nativeToolbar, Toolbar toolb
{
nativeToolbar.SetTitleTextColor(defaultTitleTextColor);
}
else if (GetDefaultForegroundColor() is { } defaultForegroundColor)
{
nativeToolbar.SetTitleTextColor(defaultForegroundColor.ToPlatform().ToArgb());
}

nativeToolbar.UpdateNavigationIconColor(toolbar);
nativeToolbar.UpdateOverflowIconColor(toolbar);
Expand Down Expand Up @@ -245,32 +241,28 @@ static void UpdateNavigationIconColor(this AToolbar nativeToolbar, Toolbar toolb
{
icon.Color = textColor.ToPlatform().ToArgb();
}
else if (GetDefaultForegroundColor() is { } defaultForegroundColor)
{
icon.Color = defaultForegroundColor.ToPlatform().ToArgb();
}
else if (GetDefaultNavigationIconColor(nativeToolbar) is int defaultNavigationIconColor)
{
icon.Color = defaultNavigationIconColor;
}
}
}

static Color? GetDefaultForegroundColor()
{
return Application.Current?.RequestedTheme switch
{
ApplicationModel.AppTheme.Light => Colors.Black,
ApplicationModel.AppTheme.Dark => Colors.White,
_ => null
};
}

static ColorStateList? GetDefaultTitleTextColor(AToolbar nativeToolbar)
{
var context = nativeToolbar.Context?.GetThemedContext();
return PlatformInterop.GetColorStateListForToolbarStyleableAttribute(context,
Resource.Attribute.toolbarStyle, Resource.Styleable.Toolbar_titleTextColor);
if (RuntimeFeature.IsMaterial3Enabled)
{
var colorContext = context is null
? null
: ColorStateList.ValueOf(new global::Android.Graphics.Color(context.GetThemeAttrColor(Resource.Attribute.colorOnSurface)));
Comment on lines +254 to +258
return colorContext;
}
else
{
return PlatformInterop.GetColorStateListForToolbarStyleableAttribute(context,
Resource.Attribute.toolbarStyle, Resource.Styleable.Toolbar_titleTextColor);
}
}

static int? GetDefaultNavigationIconColor(AToolbar nativeToolbar)
Expand All @@ -281,6 +273,11 @@ static void UpdateNavigationIconColor(this AToolbar nativeToolbar, Toolbar toolb
return null;
}

if (RuntimeFeature.IsMaterial3Enabled)
{
return context.GetThemeAttrColor(Resource.Attribute.colorOnSurface);
}

using var icon = new DrawerArrowDrawable(context);
return icon.Color;
}
Expand All @@ -292,7 +289,7 @@ static void UpdateOverflowIconColor(this AToolbar nativeToolbar, Toolbar toolbar
return;
}

var iconColor = toolbar.IconColor ?? toolbar.BarTextColor ?? GetDefaultForegroundColor();
var iconColor = toolbar.IconColor ?? toolbar.BarTextColor;
if (iconColor is null)
{
overflowIcon.ClearColorFilter();
Expand Down
Loading