Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

[CollectionView] UWP- Updating the ItemsLayout type should refresh the layout #10316

Closed
wants to merge 11 commits into from
Closed

[CollectionView] UWP- Updating the ItemsLayout type should refresh the layout #10316

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
731b2fc
detectplatform fixed using Windows.System.Profile.AnalyticsInfo.Versi…
Feb 9, 2019
c373c19
Update Xamarin.Forms.Platform.UAP/Forms.cs
Mar 13, 2019
18ff80a
Update Xamarin.Forms.Platform.UAP/Forms.cs
Mar 13, 2019
955bc3e
Merge pull request #1 from xamarin/master
EmilAlipiev Apr 7, 2020
91696fc
Issue 5354 fixed for UWP
Apr 13, 2020
b66c9c9
Merge pull request #2 from xamarin/master
EmilAlipiev May 13, 2020
00a8527
fix [CollectionView] Updating the ItemsLayout type should refresh the…
May 27, 2020
b1033ba
Merge branch 'master' into master
rmarinho Jun 1, 2020
cb77488
UWP ActivityIndicatorRenderer replaced FormsProgressBar with Progre…
Jun 4, 2020
6d446c6
Merge branch 'master' of https://github.com/EmilAlipiev/Xamarin.Forms
Jun 4, 2020
0a9b614
Merge branch 'master' into master
rmarinho Jun 4, 2020
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
26 changes: 26 additions & 0 deletions Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
{
UpdateVerticalScrollBarVisibility();
}
else if (changedProperty.Is(StructuredItemsView.ItemsLayoutProperty))
{
UpdateLayoutManager();
}
else if (changedProperty.IsOneOf(Xamarin.Forms.ItemsView.EmptyViewProperty,
Xamarin.Forms.ItemsView.EmptyViewTemplateProperty))
{
Expand Down Expand Up @@ -157,6 +161,27 @@ void ItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
UpdateEmptyViewVisibility();
}

protected virtual void UpdateLayoutManager()
{
if (Element == null || ListViewBase == null)
{
return;
}


ListViewBase = SelectListViewBase();
ListViewBase.IsSynchronizedWithCurrentItem = false;

SetNativeControl(ListViewBase);

UpdateItemTemplate();
UpdateItemsSource();
UpdateVerticalScrollBarVisibility();
UpdateHorizontalScrollBarVisibility();
UpdateEmptyView();

}

protected virtual void UpdateItemTemplate()
{
if (Element == null || ListViewBase == null)
Expand Down Expand Up @@ -188,6 +213,7 @@ protected virtual void SetUpNewElement(ItemsView newElement)

FindScrollViewer(ListViewBase);

//newElement.PropertyChanged += LayoutPropertyChanged;
Layout.PropertyChanged += LayoutPropertyChanged;

SetNativeControl(ListViewBase);
Expand Down
19 changes: 19 additions & 0 deletions Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,25 @@ protected override void HandleLayoutPropertyChanged(PropertyChangedEventArgs pro
break;
}
}
else if (property.Is(StructuredItemsView.ItemsLayoutProperty))
Copy link
Contributor

Choose a reason for hiding this comment

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

Changing the ItemsLayout used, switch between FormsListView and FormsGridView with the appropriate container in ItemsViewRenderer.cs, this block is not necessary.

{
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;
}
}
}
}

static ListViewBase CreateGridView(GridItemsLayout gridItemsLayout)
Expand Down