Revert "ToolbarItem behavior with ImageSource iOS - fix (#28833)" (#31112)

* Revert "ToolbarItem behavior with ImageSource iOS - fix (#28833)"

This reverts commit 5860fe6.

* Update src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue30818.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* - fix define on testing

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: PureWeen

src/Controls/src/Core/Compatibility/iOS/Extensions/ToolbarItemExtensions.cs

@@ -112,9 +112,7 @@ void UpdateIconAndStyle(ToolbarItem item)
 					}
 					item.IconImageSource.LoadImage(mauiContext, result =>
 					{
-						Image = item.IconImageSource is not FontImageSource
-							? result?.Value.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
-							: result?.Value;
+						Image = result?.Value;
 						Style = UIBarButtonItemStyle.Plain;
 					});
 				}

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

@@ -0,0 +1,100 @@
+using System.ComponentModel;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Entry = Microsoft.Maui.Controls.Entry;
+
+namespace Maui.Controls.Sample.Issues
+{
+
+	[Issue(IssueTracker.Github, 30818, "ToolbarItem color with custom BarTextColor not working", PlatformAffected.iOS)]
+	public class Issue30818 : NavigationPage
+	{
+
+		public Issue30818() : base(new MainPage())
+		{
+		}
+
+		class MainPage : ContentPage
+		{
+			public MainPage()
+			{
+				Title = "Main Page";
+
+				var toolBarItem = new ToolbarItem
+				{
+					Text = "Bank",
+					IconImageSource = "bank.png",
+					AutomationId = "BankToolbarItem",
+					Order = ToolbarItemOrder.Primary,
+					Priority = 0
+				};
+
+				// ToolbarItem with Bank.png icon
+				ToolbarItems.Add(toolBarItem);
+
+				var setRedButton = new Button
+				{
+					Text = "Set BarTextColor Red",
+					AutomationId = "SetRedButton"
+				};
+
+				var setGreenButton = new Button
+				{
+					Text = "Set BarTextColor Green",
+					AutomationId = "SetGreenButton"
+				};
+
+				var setResetButton = new Button
+				{
+					Text = "Reset BarTextColor",
+					AutomationId = "SetResetButton"
+				};
+
+				// There is a known issue with setting the BarTextColor on iOS from NULL to a color won't work
+				// This will get fixed in a followup issue
+				// https://github.com/dotnet/maui/issues/31111
+				setRedButton.Clicked += (_, __) =>
+				{
+					ToolbarItems.Remove(toolBarItem);
+					if (Parent is NavigationPage nav)
+					{
+						nav.BarTextColor = Microsoft.Maui.Graphics.Colors.Red;
+					}
+					ToolbarItems.Add(toolBarItem);
+				};
+
+				setGreenButton.Clicked += (_, __) =>
+				{
+					// https://github.com/dotnet/maui/issues/31111
+					ToolbarItems.Remove(toolBarItem);
+					if (Parent is NavigationPage nav)
+					{
+						nav.BarTextColor = Microsoft.Maui.Graphics.Colors.Green;
+					}
+					ToolbarItems.Add(toolBarItem);
+				};
+
+				setResetButton.Clicked += (_, __) =>
+				{
+					// https://github.com/dotnet/maui/issues/31111
+					ToolbarItems.Remove(toolBarItem);
+					if (Parent is NavigationPage nav)
+					{
+						nav.BarTextColor = null;
+					}
+					ToolbarItems.Add(toolBarItem);
+				};
+
+				Content = new StackLayout
+				{
+					Padding = 20,
+					Children =
+					{
+						setRedButton,
+						setGreenButton,
+						setResetButton
+					}
+				};
+			}
+		}
+	}
+}

src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ToolbarItemShouldBeCorrectlyRendered.png

@@ -1,4 +1,6 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS
+// https://github.com/dotnet/maui/issues/28822
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -20,4 +22,5 @@ public void ToolbarItemShouldBeCorrectlyRendered()
 			VerifyScreenshot();
 		}
 	}
-}
+}
+#endif

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28822.cs

@@ -0,0 +1,39 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue30818 : _IssuesUITest
+	{
+		public Issue30818(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ToolbarItem color with custom BarTextColor not working";
+
+		[Test]
+		[Category(UITestCategories.ToolbarItem)]
+		[Category(UITestCategories.Navigation)]
+		public void ToolbarItemColorWithCustomBarTextColorShouldWork()
+		{
+			App.WaitForElement("SetResetButton");
+			VerifyScreenshot();
+
+			// Wait for the page to load and toolbar item to be present
+			App.Tap("SetRedButton");
+			VerifyScreenshot("ToolbarItemColorWithCustomBarTextColorShouldWork_Red");
+			
+			// Set the BarTextColor to red
+			App.WaitForElement("SetGreenButton");
+			App.Tap("SetGreenButton");
+			VerifyScreenshot("ToolbarItemColorWithCustomBarTextColorShouldWork_Green");
+
+
+			App.Tap("SetResetButton");
+			VerifyScreenshot();
+		}
+	}
+}
+#endif