Fixing crash in IconTintColorBehavior (#1883)

CommunityToolkit · May 27, 2024 · 61f2415 · 61f2415
1 parent e5b6776
commit 61f2415
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.android.cs b/...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.android.cs
@@ -11,21 +11,26 @@ namespace CommunityToolkit.Maui.Behaviors;
 
 public partial class IconTintColorBehavior
 {
+	AView? nativeView;
+
 	/// <inheritdoc/>
 	protected override void OnAttachedTo(View bindable, AView platformView)
 	{
 		base.OnAttachedTo(bindable, platformView);
+		nativeView = platformView;
 
-		ApplyTintColor(bindable, platformView);
+		ApplyTintColor();
 
 		bindable.PropertyChanged += OnElementPropertyChanged;
-		this.PropertyChanged += (s, e) =>
+		PropertyChanged += OnTintedImagePropertyChanged;
+	}
+
+	void OnTintedImagePropertyChanged(object? sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName == TintColorProperty.PropertyName)
 		{
-			if (e.PropertyName == TintColorProperty.PropertyName)
-			{
-				ApplyTintColor(bindable, platformView);
-			}
-		};
+			ApplyTintColor();
+		}
 	}
 
 	/// <inheritdoc/>
@@ -35,13 +40,19 @@ protected override void OnDetachedFrom(View bindable, AView platformView)
 
 		ClearTintColor(bindable, platformView);
 		bindable.PropertyChanged -= OnElementPropertyChanged;
+		PropertyChanged -= OnTintedImagePropertyChanged;
 	}
 
-	void ApplyTintColor(View element, AView control)
+	void ApplyTintColor()
 	{
 		var color = TintColor;
 
-		switch (control)
+		if (nativeView is null)
+		{
+			return;
+		}
+
+		switch (nativeView)
 		{
 			case ImageView image:
 				SetImageViewTintColor(image, color);
@@ -100,7 +111,7 @@ void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs args)
 			return;
 		}
 
-		ApplyTintColor(bindable, platformView);
+		ApplyTintColor();
 	}
 
 	void ClearTintColor(View element, AView control)