Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Fix for ClearTintColor NullReferenceException on ImageButton related to PR #1836 #1857

Merged
merged 11 commits into from
May 18, 2022
Merged

Fix for ClearTintColor NullReferenceException on ImageButton related to PR #1836 #1857

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d0dfbf
Fix for Bug #934 (IconTintColorEffect does not work when the image is…
mike-rowley Mar 25, 2022
bc17c5a
Revised Fix for #934
mike-rowley Mar 26, 2022
df00d13
Update src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/IconTint…
mike-rowley Mar 26, 2022
13f0e20
Update src/CommunityToolkit/Xamarin.CommunityToolkit/Effects/IconTint…
mike-rowley Mar 26, 2022
7600df3
Revised Fix #2 for Bug #934
mike-rowley Mar 26, 2022
2786303
updated the sample
pictos Mar 27, 2022
f657078
improved variable name
pictos Mar 27, 2022
2d7022b
changed the null check object
pictos Mar 27, 2022
0dd0c52
Merge branch 'xamarin:main' into main
mike-rowley May 15, 2022
2e1d3e1
Update IconTintColorEffectRouter.ios.cs To Fix ClearTintColor Crash
mike-rowley May 15, 2022
f8c2578
Update IconTintColorEffectRouter.ios.cs To Fix ClearTintColor Crash
mike-rowley May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...tyToolkit/Xamarin.CommunityToolkit/Effects/IconTintColor/IconTintColorEffectRouter.ios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,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();
Expand Down Expand Up @@ -53,17 +53,17 @@ void ClearTintColor()
switch (Control)
{
case UIImageView imageView:
Element.PropertyChanged -= ImageViewTintColorPropertyChanged;
if (imageView.Image != null)
{
Element.PropertyChanged -= ImageViewTintColorPropertyChanged;
imageView.Image = imageView.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
}

break;
case UIButton button:
if (button.ImageView.Image != null)
Element.PropertyChanged -= ButtonTintColorPropertyChanged;
if (button.ImageView?.Image != null)
{
Element.PropertyChanged -= ButtonTintColorPropertyChanged;
var originalImage = button.CurrentImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
button.SetImage(originalImage, UIControlState.Normal);
}
Expand Down