Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ void ApplyChanges(NavigationPage navigationPage)
}

Color GetBarTextColor() => _currentNavigationPage?.BarTextColor;
Color GetIconColor() => (_currentPage != null) ? NavigationPage.GetIconColor(_currentPage) : null;
Color GetIconColor() => NavigationPage.GetIconColor(_currentPage) ?? NavigationPage.GetIconColor(_currentNavigationPage);

string GetTitle()
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue23563.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
Title="Issue23563"
x:Class="Maui.Controls.Sample.Issues.Issue23563">
<ContentPage.ToolbarItems>
<ToolbarItem Text="Menu option 1"
Priority="2"
Order="Secondary"/>
<ToolbarItem Text="Menu option 2"
Priority="3"
Order="Secondary"/>
<ToolbarItem Text="Menu option 3"
Priority="4"
Order="Secondary"/>
</ContentPage.ToolbarItems>
<Label AutomationId="Label"
Text="Hello, Maui!"/>
</ContentPage>

18 changes: 18 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue23563.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 23563, "Unable to set toolbar overflow menu color if not using shell", PlatformAffected.Android)]
public class Issue23563NavPage : NavigationPage
{
public Issue23563NavPage() : base(new Issue23563())
{
SetIconColor(this, Colors.Red);
}
}

public partial class Issue23563 : ContentPage
{
public Issue23563()
{
InitializeComponent();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#if ANDROID
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

namespace Microsoft.Maui.TestCases.Tests.Issues
{
public class Issue23563 : _IssuesUITest
{
public Issue23563(TestDevice testDevice) : base(testDevice)
{
}

public override string Issue => "Unable to set toolbar overflow menu color if not using shell";

[Test]
[Category(UITestCategories.Navigation)]
public void OverflowIconShouldBeRed()
{
App.WaitForElement("Label");
VerifyScreenshot();
}
}
}
#endif