Fix maps, Windows StaggeredPanel

VladislavAntonyuk · May 12, 2024 · 42862bf · 42862bf
1 parent af4cdb7
commit 42862bf
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 12 deletions.
diff --git a/MauiMaps/MauiProgram.cs b/MauiMaps/MauiProgram.cs
@@ -11,6 +11,7 @@ public static MauiApp CreateMauiApp()
 		var builder = MauiApp.CreateBuilder();
 		builder.UseMauiApp<App>().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
@@ -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
@@ -25,7 +25,12 @@
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
 		<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
+	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041.0'">
+	  <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives">
+	    <Version>7.1.2</Version>
+	  </PackageReference>
 	</ItemGroup>
 
 </Project>
diff --git a/...s/MacCatalyst/StagerredItemsViewLayout.cs → ...s/MacCatalyst/StaggeredItemsViewLayout.cs b/...s/MacCatalyst/StagerredItemsViewLayout.cs → ...s/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<UICollectionViewLayoutAttributes> cache = new();

diff --git 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">
 
+	<maui:MauiWinUIApplication.Resources>
+		<ItemsPanelTemplate x:Name="StaggeredItemsPanel">
+			<controls:StaggeredPanel />
+		</ItemsPanelTemplate>
+	</maui:MauiWinUIApplication.Resources>
 </maui:MauiWinUIApplication>
diff --git 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
-{
 }
diff --git a/...Platforms/iOS/StagerredItemsViewLayout.cs → ...Platforms/iOS/StaggeredItemsViewLayout.cs b/...Platforms/iOS/StagerredItemsViewLayout.cs → ...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<UICollectionViewLayoutAttributes> cache = new();

diff --git 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"
diff --git 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.
+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.