Fix for Bug #934 (IconTintColorEffect does not work when the image is… (#1836)

* Fix for Bug #934 (IconTintColorEffect does not work when the image is in Shared project as EmbeddeResource) * Revised Fix for #934 * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/IconTintColor/IconTintColorEffectRouter.ios.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * Update src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/IconTintColor/IconTintColorEffectRouter.ios.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * updated the sample * improved variable name * changed the null check object Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>

Author: mike-rowley

samples/XCT.Sample/Pages/Effects/IconTintColorEffectPage.xaml

@@ -37,16 +37,16 @@
  HorizontalTextAlignment="Center" />
 
  <Image
- Source="https://image.flaticon.com/icons/png/512/48/48639.png"
+ Source="https://raw.githubusercontent.com/xamarin/XamarinCommunityToolkit/main/samples/XCT.Sample.iOS/Resources/circle.png"
  Grid.Row="1" />
 
  <Image
- Source="https://image.flaticon.com/icons/png/512/48/48639.png"
+ Source="https://raw.githubusercontent.com/xamarin/XamarinCommunityToolkit/main/samples/XCT.Sample.iOS/Resources/circle.png"
  xct:IconTintColorEffect.TintColor="Red"
  Grid.Row="2" />
 
  <Image
- Source="https://image.flaticon.com/icons/png/512/48/48639.png"
+ Source="https://raw.githubusercontent.com/xamarin/XamarinCommunityToolkit/main/samples/XCT.Sample.iOS/Resources/circle.png"
  xct:IconTintColorEffect.TintColor="Green"
  Grid.Row="3" />
 
@@ -59,18 +59,18 @@
  Grid.Column="1"/>
 
  <ImageButton
- Source="https://image.flaticon.com/icons/png/512/48/48639.png"
+ Source="https://raw.githubusercontent.com/xamarin/XamarinCommunityToolkit/main/samples/XCT.Sample.iOS/Resources/circle.png"
  Grid.Row="1"
  Grid.Column="1" />
 
  <ImageButton
- Source="https://image.flaticon.com/icons/png/512/48/48639.png"
+ Source="https://raw.githubusercontent.com/xamarin/XamarinCommunityToolkit/main/samples/XCT.Sample.iOS/Resources/circle.png"
  xct:IconTintColorEffect.TintColor="Red"
  Grid.Row="2"
  Grid.Column="1" />
 
  <ImageButton
- Source="https://image.flaticon.com/icons/png/512/48/48639.png"
+ Source="https://raw.githubusercontent.com/xamarin/XamarinCommunityToolkit/main/samples/XCT.Sample.iOS/Resources/circle.png"
  xct:IconTintColorEffect.TintColor="Green"
  Grid.Row="3"
  Grid.Column="1" />

src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/IconTintColor/IconTintColorEffectRouter.ios.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using UIKit;
 using Xamarin.CommunityToolkit.Effects;
 using Xamarin.Forms;
@@ -22,8 +23,8 @@ protected override void OnElementPropertyChanged(PropertyChangedEventArgs args)
 base.OnElementPropertyChanged(args);
 
 if (!args.PropertyName.Equals(IconTintColorEffect.TintColorProperty.PropertyName) &&
-!args.PropertyName.Equals(Image.SourceProperty.PropertyName) &&
-!args.PropertyName.Equals(ImageButton.SourceProperty.PropertyName))
+ !args.PropertyName.Equals(Image.SourceProperty.PropertyName) &&
+ !args.PropertyName.Equals(ImageButton.SourceProperty.PropertyName))
 return;
 
 ApplyTintColor();
@@ -53,39 +54,78 @@ void ClearTintColor()
 {
 case UIImageView imageView:
 if (imageView.Image != null)
+{
+Element.PropertyChanged -= ImageViewTintColorPropertyChanged;
 imageView.Image = imageView.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+}
+
 break;
 case UIButton button:
-if (button.CurrentImage != null)
+if (button.ImageView.Image != null)
 {
+Element.PropertyChanged -= ButtonTintColorPropertyChanged;
 var originalImage = button.CurrentImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
 button.SetImage(originalImage, UIControlState.Normal);
 }
+
 break;
 }
 }
 
 void SetUIImageViewTintColor(UIImageView imageView, Color color)
 {
 if (imageView.Image == null)
-return;
+{
+Element.PropertyChanged += ImageViewTintColorPropertyChanged;
+}
+else
+{
+imageView.Image = imageView.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
+imageView.TintColor = color.ToUIColor();
+}
+}
 
-imageView.Image = imageView.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
-imageView.TintColor = color.ToUIColor();
+void ImageViewTintColorPropertyChanged(object sender, PropertyChangedEventArgs e)
+{
+if (e.PropertyName == Image.IsLoadingProperty.PropertyName)
+{
+var element = (Image)Element;
+
+if (!element.IsLoading)
+{
+ApplyTintColor();
+}
+}
 }
 
 void SetUIButtonTintColor(UIButton button, Color color)
 {
-if (button.CurrentImage == null)
-return;
+if (button.ImageView.Image == null)
+{
+Element.PropertyChanged += ButtonTintColorPropertyChanged;
+}
+else
+{
+var templatedImage = button.CurrentImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
 
-var templatedImage = button.CurrentImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
+button.SetImage(null, UIControlState.Normal);
 
-button.SetImage(null, UIControlState.Normal);
+button.TintColor = color.ToUIColor();
+button.ImageView.TintColor = color.ToUIColor();
+button.SetImage(templatedImage, UIControlState.Normal);
+}
+}
 
-button.TintColor = color.ToUIColor();
-button.ImageView.TintColor = color.ToUIColor();
-button.SetImage(templatedImage, UIControlState.Normal);
+void ButtonTintColorPropertyChanged(object sender, PropertyChangedEventArgs e)
+{
+if (e.PropertyName == ImageButton.IsLoadingProperty.PropertyName)
+{
+var element = (ImageButton)Element;
+if (!element.IsLoading)
+{
+ApplyTintColor();
+}
+}
 }
 }
 }