Skip to content

Allow Button.ImageSource to be updated on Android, iOS and macOS #11008

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

Closed
espenrl wants to merge 2 commits into from
Closed

Allow Button.ImageSource to be updated on Android, iOS and macOS #11008

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
da49cb0
Allow Button.ImageSource to be updated on Android, iOS and macOS
espenrl Oct 23, 2022
791d13e
Merge branch 'main' into allow-button-imagesource-update-on-android-ios
rmarinho Nov 22, 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
8 changes: 8 additions & 0 deletions src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,14 @@
Style="{StaticResource Headline}"/>
<local:CustomButton
Text="Custom Button" />
<Switch x:Name="ToggleImage" />
<Button ImageSource="settings.png">
<Button.Triggers>
<DataTrigger TargetType="Button" Binding="{Binding IsToggled, Source={x:Reference Name=ToggleImage}}" Value="True">
<Setter Property="ImageSource" Value="books.png" />
</DataTrigger>
</Button.Triggers>
</Button>
</VerticalStackLayout>
</ScrollView>
</views:BasePage.Content>
Expand Down
6 changes: 6 additions & 0 deletions src/Controls/src/Core/HandlerImpl/Button/Button.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ public static void MapText(IButtonHandler handler, Button button)
public static void MapText(ButtonHandler handler, Button button) =>
MapText((IButtonHandler)handler, button);

public static void MapImageSource(IButtonHandler handler, Button button)
{
ButtonHandler.MapImageSource(handler, button);
button.Handler?.UpdateValue(nameof(Button.ContentLayout));
}

public static void MapLineBreakMode(IButtonHandler handler, Button button)
{
handler.PlatformView?.UpdateLineBreakMode(button);
Expand Down
7 changes: 7 additions & 0 deletions src/Controls/src/Core/HandlerImpl/Button/Button.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@ public partial class Button
public static IPropertyMapper<IButton, ButtonHandler> ControlsButtonMapper = new PropertyMapper<Button, ButtonHandler>(ButtonHandler.Mapper)
{
[nameof(ContentLayout)] = MapContentLayout,
#if ANDROID
[nameof(ImageSource)] = MapImageSource,
#endif
#if IOS
[nameof(Padding)] = MapPadding,
[nameof(ImageSource)] = MapImageSource,
#endif
#if MACCATALYST
[nameof(ImageSource)] = MapImageSource,
#endif
#if WINDOWS
[nameof(IText.Text)] = MapText,
Expand Down
6 changes: 6 additions & 0 deletions src/Controls/src/Core/HandlerImpl/Button/Button.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ protected override Size ArrangeOverride(Rect bounds)
public static void MapText(ButtonHandler handler, Button button) =>
MapText((IButtonHandler)handler, button);

public static void MapImageSource(IButtonHandler handler, Button button)
{
ButtonHandler.MapImageSource(handler, button);
button.Handler?.UpdateValue(nameof(Button.ContentLayout));
}

public static void MapLineBreakMode(IButtonHandler handler, Button button)
{
handler.PlatformView?.UpdateLineBreakMode(button);
Expand Down
1 change: 1 addition & 0 deletions src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,5 @@ static readonly Microsoft.Maui.Controls.TapGestureRecognizer.ButtonsProperty ->
*REMOVED*Microsoft.Maui.Controls.TapGestureRecognizer.Tapped -> System.EventHandler?
Microsoft.Maui.Controls.ILayoutManagerFactory
~Microsoft.Maui.Controls.ILayoutManagerFactory.CreateLayoutManager(Microsoft.Maui.Controls.Layout layout) -> Microsoft.Maui.Layouts.ILayoutManager
~static Microsoft.Maui.Controls.Button.MapImageSource(Microsoft.Maui.Handlers.IButtonHandler handler, Microsoft.Maui.Controls.Button button) -> void
*REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
1 change: 1 addition & 0 deletions src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,5 @@ static readonly Microsoft.Maui.Controls.TapGestureRecognizer.ButtonsProperty ->
*REMOVED*Microsoft.Maui.Controls.TapGestureRecognizer.Tapped -> System.EventHandler?
Microsoft.Maui.Controls.ILayoutManagerFactory
~Microsoft.Maui.Controls.ILayoutManagerFactory.CreateLayoutManager(Microsoft.Maui.Controls.Layout layout) -> Microsoft.Maui.Layouts.ILayoutManager
~static Microsoft.Maui.Controls.Button.MapImageSource(Microsoft.Maui.Handlers.IButtonHandler handler, Microsoft.Maui.Controls.Button button) -> void
*REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
1 change: 1 addition & 0 deletions src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,5 @@ static readonly Microsoft.Maui.Controls.TapGestureRecognizer.ButtonsProperty ->
*REMOVED*Microsoft.Maui.Controls.TapGestureRecognizer.Tapped -> System.EventHandler?
Microsoft.Maui.Controls.ILayoutManagerFactory
~Microsoft.Maui.Controls.ILayoutManagerFactory.CreateLayoutManager(Microsoft.Maui.Controls.Layout layout) -> Microsoft.Maui.Layouts.ILayoutManager
~static Microsoft.Maui.Controls.Button.MapImageSource(Microsoft.Maui.Handlers.IButtonHandler handler, Microsoft.Maui.Controls.Button button) -> void
*REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size