From 42862bfeafb42deb12575958e703443754166852 Mon Sep 17 00:00:00 2001 From: Vladislav Antonyuk Date: Sun, 12 May 2024 15:45:17 +0300 Subject: [PATCH] Fix maps, Windows StaggeredPanel --- MauiMaps/MauiProgram.cs | 1 + MauiStaggeredCollectionView/MainPage.xaml.cs | 9 ++++++--- .../MauiStaggeredCollectionView.csproj | 5 +++++ ...redItemsViewLayout.cs => StaggeredItemsViewLayout.cs} | 2 +- MauiStaggeredCollectionView/Platforms/Windows/App.xaml | 7 ++++++- .../Platforms/Windows/App.xaml.cs | 4 ---- ...redItemsViewLayout.cs => StaggeredItemsViewLayout.cs} | 2 +- MauiStaggeredCollectionView/README.mdpp | 8 +++++++- md/thankyou.mdpp | 2 +- 9 files changed, 28 insertions(+), 12 deletions(-) rename MauiStaggeredCollectionView/Platforms/MacCatalyst/{StagerredItemsViewLayout.cs => StaggeredItemsViewLayout.cs} (97%) rename MauiStaggeredCollectionView/Platforms/iOS/{StagerredItemsViewLayout.cs => StaggeredItemsViewLayout.cs} (97%) diff --git a/MauiMaps/MauiProgram.cs b/MauiMaps/MauiProgram.cs index e3b92168..9ffdb186 100644 --- a/MauiMaps/MauiProgram.cs +++ b/MauiMaps/MauiProgram.cs @@ -11,6 +11,7 @@ public static MauiApp CreateMauiApp() var builder = MauiApp.CreateBuilder(); builder.UseMauiApp().UseMauiMaps() .UseMauiCommunityToolkit() + .UseMauiMaps() .UseMauiCommunityToolkitMaps("YOUR_KEY"); // https://learn.microsoft.com/en-us/bingmaps/getting-started/bing-maps-dev-center-help/getting-a-bing-maps-key builder.RegisterAppServices() .RegisterViewModels() diff --git a/MauiStaggeredCollectionView/MainPage.xaml.cs b/MauiStaggeredCollectionView/MainPage.xaml.cs index e4fddce2..38707a21 100644 --- a/MauiStaggeredCollectionView/MainPage.xaml.cs +++ b/MauiStaggeredCollectionView/MainPage.xaml.cs @@ -68,7 +68,7 @@ protected override ItemsViewLayout SelectLayout() if (itemsLayout is StaggeredItemsLayout staggeredItemsLayout) { - return new StagerredItemsViewLayout(staggeredItemsLayout, ItemsView.ItemSizingStrategy); + return new StaggeredItemsViewLayout(staggeredItemsLayout, ItemsView.ItemSizingStrategy); } return base.SelectLayout(); @@ -78,9 +78,12 @@ protected override ItemsViewLayout SelectLayout() #if WINDOWS protected override Microsoft.UI.Xaml.Controls.ListViewBase SelectListViewBase() { - return this.VirtualView.ItemsLayout switch + return VirtualView.ItemsLayout switch { - StaggeredItemsLayout staggeredItemsLayout => new Microsoft.UI.Xaml.Controls.GridView() { }, + StaggeredItemsLayout staggeredItemsLayout => new Microsoft.UI.Xaml.Controls.GridView() + { + ItemsPanel = (Microsoft.UI.Xaml.Controls.ItemsPanelTemplate)Microsoft.UI.Xaml.Application.Current.Resources["StaggeredItemsPanel"] + }, _ => base.SelectListViewBase() }; } diff --git a/MauiStaggeredCollectionView/MauiStaggeredCollectionView.csproj b/MauiStaggeredCollectionView/MauiStaggeredCollectionView.csproj index 3350ee71..c8241fff 100644 --- a/MauiStaggeredCollectionView/MauiStaggeredCollectionView.csproj +++ b/MauiStaggeredCollectionView/MauiStaggeredCollectionView.csproj @@ -25,7 +25,12 @@ + + + + 7.1.2 + diff --git a/MauiStaggeredCollectionView/Platforms/MacCatalyst/StagerredItemsViewLayout.cs b/MauiStaggeredCollectionView/Platforms/MacCatalyst/StaggeredItemsViewLayout.cs similarity index 97% rename from MauiStaggeredCollectionView/Platforms/MacCatalyst/StagerredItemsViewLayout.cs rename to MauiStaggeredCollectionView/Platforms/MacCatalyst/StaggeredItemsViewLayout.cs index 852cf6ab..d054e15b 100644 --- a/MauiStaggeredCollectionView/Platforms/MacCatalyst/StagerredItemsViewLayout.cs +++ b/MauiStaggeredCollectionView/Platforms/MacCatalyst/StaggeredItemsViewLayout.cs @@ -5,7 +5,7 @@ using Microsoft.Maui.Controls.Handlers.Items; using UIKit; -public class StagerredItemsViewLayout(StaggeredItemsLayout itemsLayout, ItemSizingStrategy sizingStrategy) +public class StaggeredItemsViewLayout(StaggeredItemsLayout itemsLayout, ItemSizingStrategy sizingStrategy) : ItemsViewLayout(itemsLayout, sizingStrategy) { private readonly List cache = new(); diff --git a/MauiStaggeredCollectionView/Platforms/Windows/App.xaml b/MauiStaggeredCollectionView/Platforms/Windows/App.xaml index bce63e47..90a742f1 100644 --- a/MauiStaggeredCollectionView/Platforms/Windows/App.xaml +++ b/MauiStaggeredCollectionView/Platforms/Windows/App.xaml @@ -3,6 +3,11 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:maui="using:Microsoft.Maui" - xmlns:local="using:MauiStaggeredCollectionView.WinUI"> + xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"> + + + + + diff --git a/MauiStaggeredCollectionView/Platforms/Windows/App.xaml.cs b/MauiStaggeredCollectionView/Platforms/Windows/App.xaml.cs index ff1f5d6b..db46c17b 100644 --- a/MauiStaggeredCollectionView/Platforms/Windows/App.xaml.cs +++ b/MauiStaggeredCollectionView/Platforms/Windows/App.xaml.cs @@ -22,8 +22,4 @@ public App() protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); } -} - -namespace CommunityToolkit.WinUI.UI.Controls -{ } \ No newline at end of file diff --git a/MauiStaggeredCollectionView/Platforms/iOS/StagerredItemsViewLayout.cs b/MauiStaggeredCollectionView/Platforms/iOS/StaggeredItemsViewLayout.cs similarity index 97% rename from MauiStaggeredCollectionView/Platforms/iOS/StagerredItemsViewLayout.cs rename to MauiStaggeredCollectionView/Platforms/iOS/StaggeredItemsViewLayout.cs index 852cf6ab..d054e15b 100644 --- a/MauiStaggeredCollectionView/Platforms/iOS/StagerredItemsViewLayout.cs +++ b/MauiStaggeredCollectionView/Platforms/iOS/StaggeredItemsViewLayout.cs @@ -5,7 +5,7 @@ using Microsoft.Maui.Controls.Handlers.Items; using UIKit; -public class StagerredItemsViewLayout(StaggeredItemsLayout itemsLayout, ItemSizingStrategy sizingStrategy) +public class StaggeredItemsViewLayout(StaggeredItemsLayout itemsLayout, ItemSizingStrategy sizingStrategy) : ItemsViewLayout(itemsLayout, sizingStrategy) { private readonly List cache = new(); diff --git a/MauiStaggeredCollectionView/README.mdpp b/MauiStaggeredCollectionView/README.mdpp index 46e6ad49..52139c7c 100644 --- a/MauiStaggeredCollectionView/README.mdpp +++ b/MauiStaggeredCollectionView/README.mdpp @@ -6,6 +6,12 @@ Article: https://vladislavantonyuk.github.io/articles/.NET-MAUI-CollectionView-w ## Images -![Android](https://ik.imagekit.io/VladislavAntonyuk/vladislavantonyuk/articles/54/54.png) +![Android](https://ik.imagekit.io/VladislavAntonyuk/vladislavantonyuk/articles/54/android.png) + +![iOS](https://ik.imagekit.io/VladislavAntonyuk/vladislavantonyuk/articles/54/ios.png) + +![MacCatalyst](https://ik.imagekit.io/VladislavAntonyuk/vladislavantonyuk/articles/54/maccatalyst.png) + +![Windows](https://ik.imagekit.io/VladislavAntonyuk/vladislavantonyuk/articles/54/windows.png) !INCLUDE "./md/footer.mdpp" \ No newline at end of file diff --git a/md/thankyou.mdpp b/md/thankyou.mdpp index 43ae3130..1b8a70ad 100644 --- a/md/thankyou.mdpp +++ b/md/thankyou.mdpp @@ -1,3 +1,3 @@ ## Thank You -Special thanks to my friends and sponsors: @PeterFucci, Gerald Versluis (jfversluis), @renatolopes, Glen Herman, Olexii, Brady, Yury Michurin, VToegel, Aleksander Rokic, Jeffrey Williams, TimKyn, Standa Mikes, Aaron Schaefer, AIvanHeerden, 7 M O X D, gbrewer, Ryan, @janhjordie, erossiniuk, David, Sab. \ No newline at end of file +Special thanks to my friends and sponsors: @PeterFucci, Gerald Versluis (jfversluis), @renatolopes, Glen Herman, Olexii, Brady, Yury Michurin, VToegel, Aleksander Rokic, Jeffrey Williams, TimKyn, Standa Mikes, Aaron Schaefer, AIvanHeerden, 7 M O X D, gbrewer, Ryan, @janhjordie, erossiniuk, David, Sab, Andreas. \ No newline at end of file