Skip to content
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

Jump to bottom

[Windows] Notify changes in CollectionView Layouts #13137

Merged
merged 9 commits into from
Mar 15, 2023
Merged

[Windows] Notify changes in CollectionView Layouts #13137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72ab9f2
Notify changes in CollectionView Layouts on Windows
jsuarezruiz Feb 6, 2023
6732f80
Update src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandle…
jsuarezruiz Feb 7, 2023
1e61ef2
Changes based on PR feedback
jsuarezruiz Feb 7, 2023
06c600b
Merge branch 'main' into fix-8387
jsuarezruiz Feb 8, 2023
99c6890
Merge branch 'main' into fix-8387
jsuarezruiz Feb 14, 2023
a8861a4
Merge branch 'main' into fix-8387
jsuarezruiz Feb 15, 2023
447f62e
Merge branch 'main' into fix-8387
jsuarezruiz Feb 20, 2023
63e8299
Merge branch 'main' into fix-8387
jsuarezruiz Mar 2, 2023
bf23411
Merge branch 'main' into fix-8387
jsuarezruiz Mar 13, 2023
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
58 changes: 57 additions & 1 deletion src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#nullable disable
using System;
using System.ComponentModel;
using Microsoft.Maui.Controls.Platform;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using WASDKApp = Microsoft.UI.Xaml.Application;
using WListView = Microsoft.UI.Xaml.Controls.ListView;
using WScrollMode = Microsoft.UI.Xaml.Controls.ScrollMode;
using WSetter = Microsoft.UI.Xaml.Setter;
using WStyle = Microsoft.UI.Xaml.Style;
Expand All @@ -17,6 +19,32 @@ public partial class StructuredItemsViewHandler<TItemsView> : ItemsViewHandler<T

protected override IItemsLayout Layout { get => ItemsView?.ItemsLayout; }

protected override void ConnectHandler(ListViewBase platformView)
{
base.ConnectHandler(platformView);

if (Layout != null)
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
Layout.PropertyChanged += LayoutPropertyChanged;
}

protected override void DisconnectHandler(ListViewBase platformView)
{
base.DisconnectHandler(platformView);

if (Layout != null)
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
Layout.PropertyChanged -= LayoutPropertyChanged;
}

void LayoutPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == GridItemsLayout.SpanProperty.PropertyName)
UpdateItemsLayoutSpan();
else if (e.PropertyName == GridItemsLayout.HorizontalItemSpacingProperty.PropertyName || e.PropertyName == GridItemsLayout.VerticalItemSpacingProperty.PropertyName)
UpdateItemsLayoutItemSpacing();
else if (e.PropertyName == LinearItemsLayout.ItemSpacingProperty.PropertyName)
UpdateItemsLayoutItemSpacing();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would look a lot nicer with a switch expression and the removal of the else clauses.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with that. In this case, just continued following the if-else approach used so far in Xamarin. https://github.com/xamarin/Xamarin.Forms/blob/caab66bcf9614aca0c0805d560a34e176d196e17/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs#L140

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing that was an old code and did not have switch statements, since we are dealing with new code, lets try to update or code base, right?

}

public static void MapHeaderTemplate(StructuredItemsViewHandler<TItemsView> handler, StructuredItemsView itemsView)
{
handler.UpdateHeader();
Expand Down Expand Up @@ -229,5 +257,33 @@ static WStyle GetHorizontalItemContainerStyle(LinearItemsLayout layout)

return style;
}

void UpdateItemsLayoutSpan()
{
if (ListViewBase is FormsGridView formsGridView)
{
formsGridView.Span = ((GridItemsLayout)Layout).Span;
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
}
}

void UpdateItemsLayoutItemSpacing()
{
if (ListViewBase is FormsGridView formsGridView)
{
formsGridView.ItemContainerStyle = GetItemContainerStyle((GridItemsLayout)Layout);
}
else
{
switch (ListViewBase)
{
case FormsListView formsListView:
formsListView.ItemContainerStyle = GetVerticalItemContainerStyle((LinearItemsLayout)Layout);
break;
case WListView listView:
listView.ItemContainerStyle = GetHorizontalItemContainerStyle((LinearItemsLayout)Layout);
break;
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
}
}
}
2 changes: 2 additions & 0 deletions src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ override Microsoft.Maui.Controls.ImageButton.IsEnabledCore.get -> bool
override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool
~Microsoft.Maui.Controls.WebView.UserAgent.get -> string
~Microsoft.Maui.Controls.WebView.UserAgent.set -> void
~override Microsoft.Maui.Controls.Handlers.Items.StructuredItemsViewHandler<TItemsView>.ConnectHandler(Microsoft.UI.Xaml.Controls.ListViewBase platformView) -> void
~override Microsoft.Maui.Controls.Handlers.Items.StructuredItemsViewHandler<TItemsView>.DisconnectHandler(Microsoft.UI.Xaml.Controls.ListViewBase platformView) -> void
~static readonly Microsoft.Maui.Controls.WebView.UserAgentProperty -> Microsoft.Maui.Controls.BindableProperty
*REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender, TArgs>(TSender sender, string message, TArgs args) -> void
*REMOVED*~static Microsoft.Maui.Controls.MessagingCenter.Send<TSender>(TSender sender, string message) -> void
Expand Down