Revert "chore: revert main command icon work"

This reverts commit ac55ce3.
unoplatform · Feb 15, 2024 · d9cb72f · d9cb72f
1 parent ac55ce3
commit d9cb72f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBarNavigationItemRenderer.iOS.cs b/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBarNavigationItemRenderer.iOS.cs
@@ -169,11 +169,7 @@ protected override void Render()
 						backItem.BackButtonTitle = mainCommand.Content as string ?? mainCommand.Label;
 					}
 
-					var mainCommandIcon = mainCommand.Icon is BitmapIcon bitmapIcon
-						? ImageHelper.FromUri(bitmapIcon.UriSource)?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
-						: null;
-
-					if (mainCommandIcon is { } icon && string.IsNullOrEmpty(_backItem?.BackButtonTitle))
+					if (mainCommand.Icon is { } icon && string.IsNullOrEmpty(_backItem?.BackButtonTitle))
 					{
 						native.LeftBarButtonItem = mainCommand.GetOrAddDefaultRenderer().Native;
 					}

diff --git a/src/Uno.Toolkit.UITest/Controls/NavigationBar/Given_NavigationBar.cs b/src/Uno.Toolkit.UITest/Controls/NavigationBar/Given_NavigationBar.cs
@@ -57,7 +57,7 @@ public void NavBar_Can_Close_From_First_Page()
 			App.WaitForElementWithMessage("M3Page1NavBar");
 
 			PlatformHelpers.On(
-				iOS: () => App.FastTap("CloseIcon"),
+				iOS: () => App.FastTap("M3_NavBar_Close_Button"),
 				Android: () => App.FastTap(q => q.Marked("M3Page1NavBar").Descendant("AppCompatImageButton"))
 			);
 			;