Improvements & snapshots

dotnet · Feb 5, 2025 · 6412c62 · 6412c62
1 parent 7f13e21
commit 6412c62
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/...s/TestCases.Android.Tests/snapshots/android/FontImageSourceShouldHonorColor.png b/...s/TestCases.Android.Tests/snapshots/android/FontImageSourceShouldHonorColor.png
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27377.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27377.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if ANDROID || IOS
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -21,4 +22,5 @@ public void FontImageSourceShouldHonorColor()
 			VerifyScreenshot();
 		}
 	}
-}
+}
+#endif
diff --git a/...ols/tests/TestCases.iOS.Tests/snapshots/ios/FontImageSourceShouldHonorColor.png b/...ols/tests/TestCases.iOS.Tests/snapshots/ios/FontImageSourceShouldHonorColor.png
diff --git a/src/Core/src/Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.iOS.cs b/src/Core/src/Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.iOS.cs
@@ -118,11 +118,19 @@ public override void SetImageSource(UIImage? platformImage)
 
 					try
 					{
-						button.SetImage(resizedImage.ImageWithRenderingMode(UIImageRenderingMode.Automatic), UIControlState.Normal);
-						var tintColor = item.GetTextColor();
-
-						if (tintColor != null)
-							button.TintColor = tintColor.ToPlatform();
+						if (item.Source is IFontImageSource fontImageSource && fontImageSource.Color != null)
+						{
+							button.SetImage(resizedImage.ImageWithRenderingMode(UIImageRenderingMode.Automatic), UIControlState.Normal);
+						}
+						else
+						{
+							button.SetImage(resizedImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), UIControlState.Normal);
+
+							var tintColor = item.GetTextColor();
+
+							if (tintColor != null)
+								button.TintColor = tintColor.ToPlatform();
+						}
 					}
 					catch (Exception)
 					{