Updated sample projects to include Community Toolkit controls. Reverted change for grouped UI (doesn't work with Uno)

jamesmcroft · jamesmcroft · commit 3b03d958a347 · 2021-08-31T16:33:15.000+01:00
diff --git a/samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj b/samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj
@@ -66,6 +66,9 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
       <Version>5.0.2</Version>
     </PackageReference>
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
+      <Version>7.0.0</Version>
+    </PackageReference>
     <PackageReference Include="Uno.UI" Version="3.9.7" />
     <PackageReference Include="Uno.UI.RemoteControl" Version="3.9.7" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
diff --git a/samples/MADE.Samples/MADE.Samples.Shared/Features/Home/Pages/MainPage.xaml b/samples/MADE.Samples/MADE.Samples.Shared/Features/Home/Pages/MainPage.xaml
@@ -2,6 +2,7 @@
     x:Class="MADE.Samples.Features.Home.Pages.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:MADE.Samples.Features.Samples.Data"
     xmlns:extensions="using:MADE.UI.Extensions"
@@ -10,35 +11,19 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
 
-    <pages:MvvmPage.Resources>
-        <ResourceDictionary>
-            <CollectionViewSource
-                x:Key="SamplesSource"
-                IsSourceGrouped="True"
-                ItemsPath="Samples"
-                Source="{x:Bind ViewModel.Samples}" />
-        </ResourceDictionary>
-    </pages:MvvmPage.Resources>
-
     <Grid Padding="12">
-        <GridView
+        <controls:AdaptiveGridView
             extensions:ListViewBaseExtensions.ItemClickCommand="{x:Bind ViewModel.NavigateToSampleCommand}"
+            DesiredWidth="400"
             IsItemClickEnabled="true"
-            ItemsSource="{Binding Source={StaticResource SamplesSource}}"
-            SelectionMode="None">
-            <GridView.GroupStyle>
-                <GroupStyle HidesIfEmpty="True">
-                    <GroupStyle.HeaderTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding Name}" />
-                        </DataTemplate>
-                    </GroupStyle.HeaderTemplate>
-                </GroupStyle>
-            </GridView.GroupStyle>
-            <GridView.ItemTemplate>
+            ItemsSource="{x:Bind ViewModel.Samples}"
+            OneRowModeEnabled="False"
+            SelectionMode="None"
+            StretchContentForSingleRow="False">
+            <controls:AdaptiveGridView.ItemTemplate>
                 <DataTemplate x:DataType="data:Sample">
                     <StackPanel Padding="12" Background="Transparent">
-                        <Grid Height="160">
+                        <Grid>
                             <Border>
                                 <Image Source="{Binding IconPath}" />
                             </Border>
@@ -66,7 +51,7 @@
                         </Grid>
                     </StackPanel>
                 </DataTemplate>
-            </GridView.ItemTemplate>
-        </GridView>
+            </controls:AdaptiveGridView.ItemTemplate>
+        </controls:AdaptiveGridView>
     </Grid>
 </pages:MvvmPage>
diff --git a/samples/MADE.Samples/MADE.Samples.Shared/Features/Home/ViewModels/MainPageViewModel.cs b/samples/MADE.Samples/MADE.Samples.Shared/Features/Home/ViewModels/MainPageViewModel.cs
@@ -1,6 +1,7 @@
 namespace MADE.Samples.Features.Home.ViewModels
 {
     using System.Collections.Generic;
+    using System.Linq;
     using System.Windows.Input;
     using CommunityToolkit.Mvvm.Input;
     using CommunityToolkit.Mvvm.Messaging;
@@ -18,7 +19,7 @@ public MainPageViewModel(INavigationService navigationService, IMessenger messen
 
         public ICommand NavigateToSampleCommand => new RelayCommand<Sample>(this.NavigateToSample);
 
-        public ICollection<SampleGroup> Samples { get; } = new List<SampleGroup>
+        public ICollection<SampleGroup> SampleGroups { get; } = new List<SampleGroup>
         {
             new SampleGroup
             {
@@ -34,6 +35,8 @@ public MainPageViewModel(INavigationService navigationService, IMessenger messen
             }
         };
 
+        public ICollection<Sample> Samples => SampleGroups.SelectMany(x => x.Samples).ToList();
+
         private void NavigateToSample(Sample sample)
         {
             this.NavigationService.NavigateTo(sample.Page);
diff --git a/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj b/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj
@@ -16,8 +16,9 @@
 			-->
       <Version>6.2.11</Version>
     </PackageReference>
-    <PackageReference Include="Uno.Core" Version="2.4.0" />
-    <PackageReference Include="Uno.UI" Version="3.9.7" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
+      <Version>7.0.2</Version>
+    </PackageReference>
   </ItemGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,7 +30,7 @@
     <AssemblyName>MADE.Samples</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj b/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj
@@ -39,6 +39,7 @@
     <!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
     <PackageReference Include="CommunityToolkit.Mvvm" Version="7.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.0.0" />
     <PackageReference Include="Uno.UI.WebAssembly" Version="3.9.7" />
     <PackageReference Include="Uno.UI.RemoteControl" Version="3.9.7" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.Wasm.Bootstrap" Version="2.1.0" />
diff --git a/samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj b/samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj
@@ -121,6 +121,9 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
       <Version>5.0.2</Version>
     </PackageReference>
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
+      <Version>7.0.0</Version>
+    </PackageReference>
     <PackageReference Include="Uno.UI" Version="3.9.7" />
     <PackageReference Include="Uno.UI.RemoteControl" Version="3.9.7" Condition="'$(Configuration)'=='Debug'" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace MADE.Samples.Features.Home.ViewModels`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+ using System.Linq;`
`4`	`5`	`using System.Windows.Input;`
`5`	`6`	`using CommunityToolkit.Mvvm.Input;`
`6`	`7`	`using CommunityToolkit.Mvvm.Messaging;`
`@@ -18,7 +19,7 @@ public MainPageViewModel(INavigationService navigationService, IMessenger messen`
`18`	`19`
`19`	`20`	`public ICommand NavigateToSampleCommand => new RelayCommand<Sample>(this.NavigateToSample);`
`20`	`21`
`21`		`- public ICollection<SampleGroup> Samples { get; } = new List<SampleGroup>`
	`22`	`+ public ICollection<SampleGroup> SampleGroups { get; } = new List<SampleGroup>`
`22`	`23`	`{`
`23`	`24`	`new SampleGroup`
`24`	`25`	`{`
`@@ -34,6 +35,8 @@ public MainPageViewModel(INavigationService navigationService, IMessenger messen`
`34`	`35`	`}`
`35`	`36`	`};`
`36`	`37`
	`38`	`+ public ICollection<Sample> Samples => SampleGroups.SelectMany(x => x.Samples).ToList();`
	`39`	`+`
`37`	`40`	`private void NavigateToSample(Sample sample)`
`38`	`41`	`{`
`39`	`42`	`this.NavigationService.NavigateTo(sample.Page);`