Skip to content

[net7.0] Notify Button ImageSource changes correctly #11800

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
Redth merged 2 commits into from
Dec 1, 2022
Merged

[net7.0] Notify Button ImageSource changes correctly #11800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af2682b
Fix the issue
jsuarezruiz Nov 7, 2022
0b56f99
Added Device Tests
jsuarezruiz Nov 7, 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
4 changes: 3 additions & 1 deletion src/Controls/src/Core/HandlerImpl/Button/Button.Impl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Runtime.CompilerServices;
using System.Runtime.CompilerServices;
using Microsoft.Maui.Graphics;

namespace Microsoft.Maui.Controls
Expand All @@ -15,6 +15,8 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
Handler?.UpdateValue(nameof(IButtonStroke.StrokeColor));
else if (propertyName == BorderWidthProperty.PropertyName)
Handler?.UpdateValue(nameof(IButtonStroke.StrokeThickness));
else if (propertyName == ImageSourceProperty.PropertyName)
Handler?.UpdateValue(nameof(IImage.Source));
}

void IButton.Clicked()
Expand Down
27 changes: 26 additions & 1 deletion src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using Android.Text;
using AndroidX.AppCompat.Widget;
Expand Down Expand Up @@ -77,6 +77,31 @@ public async Task CharacterSpacingInitializesCorrectly()
Assert.Equal(expectedValue, values.PlatformViewValue, EmCoefficientPrecision);
}

[Theory]
[InlineData("red.png", "#FF0000")]
[InlineData("green.png", "#00FF00")]
public async Task ImageSourceUpdatesCorrectly(string filename, string colorHex)
{
var image = new ButtonStub
{
ImageSource = new FileImageSourceStub("black.png"),
};

// Update the Button Icon
image.ImageSource = new FileImageSourceStub(filename);

await InvokeOnMainThreadAsync(async () =>
{
var handler = CreateHandler(image);

bool imageLoaded = await Wait(() => ImageSourceLoaded(handler));

Assert.True(imageLoaded);
var expectedColor = Color.FromArgb(colorHex);
await handler.PlatformView.AssertContainsColor(expectedColor);
});
}

AppCompatButton GetNativeButton(ButtonHandler buttonHandler) =>
buttonHandler.PlatformView;

Expand Down