August 25th, 2025 Candidate #31327

jfversluis · 2025-08-25T12:37:11Z

Copilot

Pull Request Overview

This PR introduces improvements for AOT/trimming compatibility, enhanced gesture handling, UI bug fixes, and expanded test coverage. The changes focus on Windows platform gesture management, CarouselView initialization, navigation stack management, and platform-specific color handling optimizations.

Adds AOT compatibility configuration to multiple project files and enables unsafe blocks where needed
Refactors Windows gesture event handling to use modern C# pattern matching and improves finger tracking
Fixes theme change handling for input controls and optimizes color management on iOS/Android platforms

Reviewed Changes

Copilot reviewed 58 out of 78 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
Multiple `.csproj` files	Add `IsAotCompatible` and `AllowUnsafeBlocks` properties for AOT/trimming support
Multiple Windows platform classes	Convert to `partial` classes for source generator compatibility
`GesturePlatformManager.Windows.cs`	Refactor gesture handling with pattern matching and improved finger tracking
Various iOS/Android platform files	Optimize color handling and theme change responsiveness
Test case files	Add new UI test cases and update existing CarouselView test
`NavigationPage.Legacy.cs`	Fix navigation stack update timing for proper event firing

Copilot · 2025-08-25T12:38:17Z

src/Core/src/Platform/Android/EditTextExtensions.cs

+				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)
+				{
+					editText.SetTextColor(color);
+				}
 			}
 		}



The fallback color logic is duplicated between UpdateTextColor and UpdatePlaceholderColor methods. Consider extracting this into a shared helper method to reduce code duplication.

Suggested change

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)

{

editText.SetTextColor(color);

}

}

}

var fallbackColor = GetFallbackColor(editText, Android.Resource.Attribute.TextColorPrimary);

if (fallbackColor is not null)

{

editText.SetTextColor(fallbackColor.Value);

}

}

}

// Shared helper for fallback color logic

private static Android.Graphics.Color? GetFallbackColor(EditText editText, int attribute)

{

var typedValue = new TypedValue();

if (OperatingSystem.IsAndroidVersionAtLeast(23) &&

editText.Context?.Theme is Resources.Theme theme &&

theme.ResolveAttribute(attribute, typedValue, true) &&

editText.Resources?.GetColor(typedValue.ResourceId, theme) is Android.Graphics.Color color)

{

return color;

}

return null;

}

Copilot · 2025-08-25T12:38:17Z

src/Controls/tests/TestCases.HostApp/Issues/Issue6101.cs

+
+
+
+
+
+
+
+


The file contains excessive blank lines at the end (lines 60-65). These should be removed for cleaner code formatting.

Suggested change

sheiksyedm · 2025-08-26T15:09:35Z

@kubaflo can you please look at these CI failures due to your PR changes?

kubaflo · 2025-08-27T12:00:51Z

@kubaflo can you please look at these CI failures due to your PR changes?

#31366
#31358

#31358) I have addressed the UI test image failure in this PR (#31327) by updating and re-saving the necessary UI test image. I've verified the failure, and the snapshot had to be uploaded. It is correct, as the default placeholder color should be white in the dark theme

#31346) ## Description I have addressed the UI test image failures in this PR (#31327) by updating and re-saving the necessary UI test images. #### TestCases: - LinearGradientShouldHaveTheSameTopColorAsBackground - BackgroundFrameResizesFastAndCorrectly

> [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! ### Issue Details In the failed test `AppDoesntCrashWhenSettingNewTitleViewOnExistingPage`, the TitleView was updated in the OnAppearing method. When popping the page using PopAsync, the OnAppearing event is triggered twice with my fix, whereas previously it was triggered only once: once from [FireAppearing](https://github.com/dotnet/maui/blob/b2c3452f68298f407ca18f8fe9e0f8841e7c9cad/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs#L67) and once from [CurrentPageChanged](https://github.com/dotnet/maui/blob/b2c3452f68298f407ca18f8fe9e0f8841e7c9cad/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs#L70). This additional trigger causes the title to mismatch the expected value, resulting in the test failure. ### Root Cause The fix moves FireAppearing to after RemoveFromInnerChildren(page), but at that point InternalChildren.Last() has already changed. Currently, StackDepth - 2 is calculated based on the original stack depth. Once the popped page is removed from stack, accessing InternalChildren[StackDepth - 2] is not valid. ### Description of Change Remove the page first, then use InternalChildren.Last(); directly to get the correct page that should appear. Regressed PR: #28666 Fixes AppDoesntCrashWhenSettingNewTitleViewOnExistingPage test failure in PR: #31327 ### Screenshots <img width="540" height="300" alt="image" src="https://github.com/user-attachments/assets/9dfaed05-0b66-489b-9b81-9a285088cc96" /> <img width="540" height="300" alt="image" src="https://github.com/user-attachments/assets/81626605-6567-4a30-b183-d26513d5f60c" /> <img width="540" height="300" alt="image" src="https://github.com/user-attachments/assets/260ca192-4baa-45e2-9991-8abcdadb2961" />

… case failure in PR 31327 (#31366) ### Description of Change Refactored fallback logic to use ObtainStyledAttributes and ColorStateList for determining the system default text color. This ensures correct color selection based on the enabled state of EditText, improving consistency with system themes. This also addresses the UI test image failure in this PR (#31327)

sheiksyedm · 2025-09-02T11:23:27Z

@kubaflo Still, this test failed. Can you look at this?

kubaflo · 2025-09-02T23:01:50Z

@kubaflo Still, this test failed. Can you look at this?

Sure! Thanks for letting me know about this failure. Here's the pr fixing it: #31460

… August 25th, 2025 Candidate) (#31460) Introduces an internal UpdateTextColor method to TimePickerExtensions for updating the text color of MauiTimePicker based on the ITimePicker's TextColor property. Fixes #31327 (comment)

PureWeen · 2025-09-04T21:24:07Z

/rebase

PureWeen · 2025-09-05T20:44:05Z

/rebase

…28666) * Fixed - 28414 : iOS] Popping a page includes in the NavigationStack when the OnAppearing method is called * updated NavigationPage.Legacy.cs * Updated NavigationPage.Legacy.cs

Corrects the color attribute assignment in AttributedStringExtensions for iOS to prevent crashes when setting CharacterSpacing on buttons. Adds new test cases and UI tests to verify the fix for issue #31238.

* Mark projects IsAotCompatible and AllowUnsafeBlocks * Make Windows Platform classes partial * Mark PlatformGraphicsView partial * Mark SkiaGraphicsView partial

…ed returning false in a modally pushed page causes stack overflow - fix (#28812) * Update ModalNavigationManager.Android.cs [Android] ModalNavigationManager * Update ModalNavigationManager.Android.cs * Remove unused back propagation logic in Android modal manager Eliminated the preventBackPropagation variable and related event handler code from ModalNavigationManager.Android.cs, simplifying the OnBackPressed lifecycle event handling.

… theme change

…navigation

Refactored fallback logic to use ObtainStyledAttributes and ColorStateList for determining the system default text color. This ensures correct color selection based on the enabled state of EditText, improving consistency with system themes.

Introduces an internal UpdateTextColor method to TimePickerExtensions for updating the text color of MauiTimePicker based on the ITimePicker's TextColor property.

Updates the UpdateTextColor method to restore the default theme primary text color when no custom color is set, instead of passing null. This ensures consistent appearance on Android API 23+.

PureWeen · 2025-09-05T21:42:57Z

#31507

jfversluis assigned sheiksyedm Aug 25, 2025

Copilot AI review requested due to automatic review settings August 25, 2025 12:37

jfversluis requested a review from a team as a code owner August 25, 2025 12:37

jfversluis requested review from StephaneDelcroix and mattleibow August 25, 2025 12:37

Copilot AI reviewed Aug 25, 2025

View reviewed changes

HarishKumarSF4517 mentioned this pull request Aug 26, 2025

[Testing] Fixed Test case failure in PR 31327 - [2025/08/25] Candidate #31346

Merged

This was referenced Aug 26, 2025

[Testing] Fixed Test case failure in PR 31327 - [2025/08/25] Candidate #31358

Merged

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

Merged

Vignesh-SF3580 mentioned this pull request Aug 28, 2025

Fixed Test case failure in PR 31327 #31378

Merged

kubaflo mentioned this pull request Sep 2, 2025

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

Merged

github-actions bot force-pushed the inflight/candidate branch from 6a0a18b to c51fae4 Compare September 4, 2025 21:24

kubaflo and others added 7 commits September 5, 2025 20:45

CGContext gradient color

06aaa89

[iOS] Fixed NavigationStack not updating when OnAppearing is invoked (#…

0169635

…28666) * Fixed - 28414 : iOS] Popping a page includes in the NavigationStack when the OnAppearing method is called * updated NavigationPage.Legacy.cs * Updated NavigationPage.Legacy.cs

Fix iOS button crash with CharacterSpacing

3e48a76

Corrects the color attribute assignment in AttributedStringExtensions for iOS to prevent crashes when setting CharacterSpacing on buttons. Adds new test cases and UI tests to verify the fix for issue #31238.

General nativeAOT support improvements (#31228)

35e0300

* Mark projects IsAotCompatible and AllowUnsafeBlocks * Make Windows Platform classes partial * Mark PlatformGraphicsView partial * Mark SkiaGraphicsView partial

Use pattern matching for GesturePlatformManager

8456150

Remove unnecessary guards in GesturePlatformManager

04a1822

kubaflo and others added 25 commits September 5, 2025 20:45

Update SearchBarExtensions.cs

9259735

Added a UI Test

ed85047

Update Issue30597.cs

35b84f3

Update SearchBarExtensions.cs

77621e7

Added snapshots

cdb04a2

[Android] Editor and Entry don't update placeholder and text color on…

e0edf1d

… theme change

Added a UI Test

565413a

CR changes

e1d206d

Added snapshots

cd164f4

[Windows] Fix for image clipping not working

fa8f79c

Updated Test Sample with different geometries

1eb3c2c

Updated SnapShots

6a1c610

Fixed the issue of picker displaying issue when using PushModalAsync …

926f5f2

…navigation

Added UI the test case.

9aed7ff

Added the outputs for android and iOS platform

267fcdf

Updated the fix and added the output images

d3284b2

Updated the code changes.

0ffb616

Updated the output image

893efab

Update PlaceholderColorShouldChange.png

ecce1df

Resaved Image

e412475

Update NavigationPage.Legacy.cs

4b9f596

Add UpdateTextColor extension for TimePicker

dc52197

Introduces an internal UpdateTextColor method to TimePickerExtensions for updating the text color of MauiTimePicker based on the ITimePicker's TextColor property.

Restore default text color in TimePicker on Android

fac899d

Updates the UpdateTextColor method to restore the default theme primary text color when no custom color is set, instead of passing null. This ensures consistent appearance on Android API 23+.

Update src/Core/src/Platform/Android/TimePickerExtensions.cs

87d3993

github-actions bot force-pushed the inflight/candidate branch from c51fae4 to 87d3993 Compare September 5, 2025 20:45

PureWeen closed this Sep 5, 2025

PureWeen deleted the inflight/candidate branch September 8, 2025 20:18

github-actions bot locked and limited conversation to collaborators Oct 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

August 25th, 2025 Candidate #31327

August 25th, 2025 Candidate #31327

Uh oh!

jfversluis commented Aug 25, 2025 •

edited by PureWeen

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Aug 25, 2025

Uh oh!

Copilot AI Aug 25, 2025

Uh oh!

sheiksyedm commented Aug 26, 2025

Uh oh!

kubaflo commented Aug 27, 2025

Uh oh!

sheiksyedm commented Sep 2, 2025

Uh oh!

kubaflo commented Sep 2, 2025

Uh oh!

PureWeen commented Sep 4, 2025

Uh oh!

PureWeen commented Sep 5, 2025

Uh oh!

PureWeen commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

August 25th, 2025 Candidate #31327

August 25th, 2025 Candidate #31327

Uh oh!

Conversation

jfversluis commented Aug 25, 2025 • edited by PureWeen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Aug 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 25, 2025

Choose a reason for hiding this comment

Uh oh!

sheiksyedm commented Aug 26, 2025

Uh oh!

kubaflo commented Aug 27, 2025

Uh oh!

sheiksyedm commented Sep 2, 2025

Uh oh!

kubaflo commented Sep 2, 2025

Uh oh!

PureWeen commented Sep 4, 2025

Uh oh!

PureWeen commented Sep 5, 2025

Uh oh!

PureWeen commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

jfversluis commented Aug 25, 2025 •

edited by PureWeen

Loading