-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[iOS, macOS] Fixed Shell Flyout Icon is always black in iOS 26 #32997
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.
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
+78
−3
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2966466
Fixed Shell Flyout Icon is always black
Dhivya-SF4094 84ae25c
Added base images
Dhivya-SF4094 0e3f060
Updated fix for Runtime changes
Dhivya-SF4094 72d7e53
Updated snapshot for iOS
Dhivya-SF4094 fe6a622
Added snapshot for iOS
Dhivya-SF4094 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+30.8 KB
...s/TestCases.Android.Tests/snapshots/android/ShellFlyoutIconShouldNotBeBlack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 32867, "Shell Flyout Icon is always black", PlatformAffected.iOS)] | ||
| public class Issue32867 : Shell | ||
| { | ||
| public Issue32867() | ||
| { | ||
| // Create a simple ShellContent with a content page | ||
| var shellContent = new ShellContent | ||
| { | ||
| Title = "Home", | ||
|
|
||
| Content = new Issue32867Page() | ||
| }; | ||
| FlyoutBehavior = FlyoutBehavior.Flyout; | ||
| FlyoutIcon = "shopping_cart.png"; | ||
| Items.Add(shellContent); | ||
|
|
||
| // Set Shell ForegroundColor (affects FlyoutIcon tint) | ||
| Shell.SetForegroundColor(this, Colors.Red); | ||
| } | ||
| } | ||
| public class Issue32867Page : ContentPage | ||
| { | ||
| public Issue32867Page() | ||
| { | ||
| Content = new VerticalStackLayout | ||
| { | ||
| Padding = 20, | ||
| Spacing = 10, | ||
| Children = | ||
| { | ||
| new Label | ||
| { | ||
| Text = "The test passes if the Flyout icon appears in red (not black).", | ||
| AutomationId = "Issue32867Label" | ||
| }, | ||
|
|
||
| } | ||
| }; | ||
| } | ||
| } | ||
Binary file added
BIN
+14.4 KB
...ols/tests/TestCases.Mac.Tests/snapshots/mac/ShellFlyoutIconShouldNotBeBlack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32867.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #if TEST_FAILS_ON_WINDOWS // https://github.com/dotnet/maui/issues/26148 | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
|
||
| public class Issue32867 : _IssuesUITest | ||
| { | ||
| public Issue32867(TestDevice testDevice) : base(testDevice) | ||
| { | ||
| } | ||
| public override string Issue => "Shell Flyout Icon is always black"; | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.Shell)] | ||
| public void ShellFlyoutIconShouldNotBeBlack() | ||
| { | ||
| App.WaitForElement("Issue32867Label"); | ||
| VerifyScreenshot(); | ||
| } | ||
| } | ||
| #endif |
Binary file added
BIN
+72.8 KB
.../tests/TestCases.iOS.Tests/snapshots/ios-26/ShellFlyoutIconShouldNotBeBlack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+80 KB
...ols/tests/TestCases.iOS.Tests/snapshots/ios/ShellFlyoutIconShouldNotBeBlack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the UI Testing Guidelines, the PlatformAffected should be set based on actual platform limitations. The PR description mentions both iOS and macOS are affected by the same tint inheritance issue, but the [Issue] attribute only specifies
PlatformAffected.iOS. Consider whether this should bePlatformAffected.iOS | PlatformAffected.macOSsince the fix applies to both platforms (line 535 checks for bothIsIOSVersionAtLeast(26)andIsMacCatalystVersionAtLeast(26)).