Skip to content

Update IconTintColorBehavior so it applies tint to Button image on Android and Windows like iOS and Mac Catalyst #2042

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 12 commits into from
Jul 23, 2024
Merged

Update IconTintColorBehavior so it applies tint to Button image on Android and Windows like iOS and Mac Catalyst #2042

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f8d4b5c
Apply tint to Button image on Android and Windows
mikeparker104 Jul 19, 2024
f4ef6b6
Update sample app to add a reproduction of the problem being fixed
mikeparker104 Jul 19, 2024
cfaf906
use pattern matching for null check
pictos Jul 19, 2024
f41aee3
Use curly braces with if statements
mikeparker104 Jul 19, 2024
0e88410
Try again to add curly brace for if statement
mikeparker104 Jul 19, 2024
1c073c2
Add interactive logic to new button
TheCodeTraveler Jul 23, 2024
7645cf9
Refactor logic
TheCodeTraveler Jul 23, 2024
d1cf399
`dotnet format`
TheCodeTraveler Jul 23, 2024
1cc00ba
Remove comment
TheCodeTraveler Jul 23, 2024
de960d9
Fix Button Height
TheCodeTraveler Jul 23, 2024
a7928f2
Update Windows Logic
TheCodeTraveler Jul 23, 2024
a914182
Merge branch 'main' into fix-2040
TheCodeTraveler Jul 23, 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
15 changes: 14 additions & 1 deletion samples/CommunityToolkit.Maui.Sample/Pages/Behaviors/IconTintColorBehaviorPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Grid
Padding="20"
ColumnDefinitions="*, *, *"
RowDefinitions="Auto, Auto, 60, Auto, 60, Auto, Auto, 60"
RowDefinitions="Auto, Auto, 60, Auto, 60, Auto, Auto, 60, Auto"
RowSpacing="20">

<Label
Expand Down Expand Up @@ -149,6 +149,19 @@
<mct:IconTintColorBehavior TintColor="Purple" />
</Image.Behaviors>
</Image>

<!-- Applies tint color to Button images in iOS and Mac Catalyst pending #2040 -->
<Button
Grid.Row="9"
Grid.ColumnSpan="3"
HorizontalOptions="Center"
VerticalOptions="End"
Text="Button with IconTintColorBehavior"
ImageSource="https://api.nuget.org/v3-flatcontainer/communitytoolkit.maui/9.0.1/icon">
<Button.Behaviors>
<mct:IconTintColorBehavior TintColor="Red" />
</Button.Behaviors>
</Button>
</Grid>
</ScrollView>
</pages:BasePage>
16 changes: 16 additions & 0 deletions ...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Android.Graphics;
using Android.Widget;
using Microsoft.Maui.Platform;
using MButton = Google.Android.Material.Button.MaterialButton;
using AButton = Android.Widget.Button;
using AView = Android.Views.View;
using Color = Microsoft.Maui.Graphics.Color;
Expand Down Expand Up @@ -78,6 +79,13 @@ static void SetImageViewTintColor(ImageView image, Color? color)

static void SetButtonTintColor(AButton button, Color? color)
{
if (button is MButton mButton && color is not null)
{
mButton.IconTintMode = PorterDuff.Mode.SrcIn;
mButton.IconTint = new Android.Content.Res.ColorStateList(new int[][] { Array.Empty<int>() }, new int[] { color.ToPlatform() });
return;
}

var drawables = button.GetCompoundDrawables().Where(d => d is not null);

if (color is null)
Expand Down Expand Up @@ -122,10 +130,18 @@ void ClearTintColor(View element, AView control)
image.ClearColorFilter();
break;
case AButton button:

if (button is MButton mButton)
{
mButton.IconTint = null;
break;
}

foreach (var drawable in button.GetCompoundDrawables())
{
drawable?.ClearColorFilter();
}

break;
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...tyToolkit.Maui/Behaviors/PlatformBehaviors/IconTintColor/IconTintColorBehavior.windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ protected override void OnDetachedFrom(View bindable, FrameworkElement platformV
static bool TryGetButtonImage(WButton button, [NotNullWhen(true)] out WImage? image)
{
image = button.Content as WImage;

if (image == null && button.Content is Microsoft.UI.Xaml.Controls.Panel panel)
Comment thread
pictos marked this conversation as resolved.
Outdated
image = panel.Children?.FirstOrDefault(i => i is WImage) as WImage;

return image is not null;
}

Expand Down