Skip to content

Catch ObjectDisposedException in IconTintColorBehavior #2099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheCodeTraveler merged 4 commits into from
Aug 8, 2024
Merged

Catch ObjectDisposedException in IconTintColorBehavior #2099

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5ae41b
fix: catch ObjectDisposedException in IconTintColorBehavior
Kay-STL Aug 7, 2024
6e56ab2
Update src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/IconTint…
TheCodeTraveler Aug 8, 2024
69178b4
Update src/CommunityToolkit.Maui/Behaviors/PlatformBehaviors/IconTint…
TheCodeTraveler Aug 8, 2024
19c8fb9
Merge branch 'main' into fix/catchDisposed
TheCodeTraveler Aug 8, 2024
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
67 changes: 40 additions & 27 deletions ...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel;
using System.Diagnostics;
using Android.Graphics;
using Android.Widget;
using Microsoft.Maui.Platform;
Expand Down Expand Up @@ -44,22 +45,28 @@ static void ApplyTintColor(AndroidView? nativeView, Color? tintColor)
return;
}

switch (nativeView)
try
{
case ImageView image:
SetImageViewTintColor(image, tintColor);
break;
switch (nativeView)
{
case ImageView image:
SetImageViewTintColor(image, tintColor);
break;

case AndroidMaterialButton materialButton when tintColor is not null:
SetMaterialButtonTintColor(materialButton, tintColor);
break;
case AndroidMaterialButton materialButton when tintColor is not null:
SetMaterialButtonTintColor(materialButton, tintColor);
break;

case AndroidWidgetButton widgetButton:
SetWidgetButtonTintColor(widgetButton, tintColor);
break;
case AndroidWidgetButton widgetButton:
SetWidgetButtonTintColor(widgetButton, tintColor);
break;

default:
throw new NotSupportedException($"{nameof(IconTintColorBehavior)} only currently supports Android.Widget.Button and {nameof(ImageView)}.");
default:
throw new NotSupportedException($"{nameof(IconTintColorBehavior)} only currently supports Android.Widget.Button and {nameof(ImageView)}.");
}
}
catch (ObjectDisposedException)
{
}

static void SetImageViewTintColor(ImageView image, Color? color)
Expand Down Expand Up @@ -109,22 +116,28 @@ static void ClearTintColor(AndroidView? nativeView)
return;
}

switch (nativeView)
try
{
switch (nativeView)
{
case ImageView image:
image.ClearColorFilter();
break;

case AndroidMaterialButton mButton:
mButton.IconTint = null;
break;
case AndroidWidgetButton button:
foreach (var drawable in button.GetCompoundDrawables())
{
drawable.ClearColorFilter();
}

break;
}
}
catch (ObjectDisposedException)
{
case ImageView image:
image.ClearColorFilter();
break;

case AndroidMaterialButton mButton:
mButton.IconTint = null;
break;
case AndroidWidgetButton button:
foreach (var drawable in button.GetCompoundDrawables())
{
drawable.ClearColorFilter();
}

break;
}
}

Expand Down