Merge pull request #167 from CodebreakerApp/163-uno-windows-features

christiannagel · web-flow · commit 305796d272d7 · 2024-03-13T20:39:55.000-07:00
163 uno windows features
diff --git a/src/Codebreaker.Uno/CodebreakerUno.Tests/CodebreakerUno.Tests.csproj b/src/Codebreaker.Uno/CodebreakerUno.Tests/CodebreakerUno.Tests.csproj
@@ -10,7 +10,10 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="coverlet.collector">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="GitHubActionsTestLogger">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Codebreaker.Uno/CodebreakerUno/Views/Components/PegSelectionComponent.xaml.cs b/src/Codebreaker.Uno/CodebreakerUno/Views/Components/PegSelectionComponent.xaml.cs
@@ -1,7 +1,9 @@
 using Codebreaker.ViewModels;
 using CodeBreaker.Uno.Helpers;
 using CommunityToolkit.Mvvm.Messaging;
+#if WINDOWS10_0_17763_0_OR_GREATER
 using Microsoft.UI.Xaml.Media.Animation;
+#endif
 
 namespace CodeBreaker.Uno.Views.Components;
 
@@ -31,11 +33,13 @@ private static void OnViewModelChanged(DependencyObject dependencyObject, Depend
 
     public void Receive(GameMoveMessage message)
     {
+#if WINDOWS10_0_17763_0_OR_GREATER
         if (message.GameMoveValue is not GameMoveValue.Started)
             return;
 
         var animationService = ConnectedAnimationService.GetForCurrentView();
         this.FindItemsOfType<ComboBox>(this)
             .ForEach((i, comboBox) => animationService.PrepareToAnimate($"guess{i}", comboBox));
+#endif
     }
 }
diff --git a/src/Codebreaker.Uno/CodebreakerUno/Views/Pages/GamePage.xaml.cs b/src/Codebreaker.Uno/CodebreakerUno/Views/Pages/GamePage.xaml.cs
@@ -1,8 +1,10 @@
 using Codebreaker.ViewModels;
 using CodeBreaker.Uno.Helpers;
 using CommunityToolkit.Mvvm.Messaging;
+#if WINDOWS10_0_17763_0_OR_GREATER
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Shapes;
+#endif
 
 namespace CodeBreaker.Uno.Views.Pages;
 
@@ -28,6 +30,7 @@ public void Receive(GameMoveMessage message)
         if (message.GameMoveValue is not GameMoveValue.Completed)
             return;
 
+#if WINDOWS10_0_17763_0_OR_GREATER
         var selectionAndKeyPegs = message.SelectionAndKeyPegs ?? throw new InvalidOperationException();
         var animationService = ConnectedAnimationService.GetForCurrentView();
         animationService.DefaultDuration = TimeSpan.FromMilliseconds(500);
@@ -44,6 +47,7 @@ public void Receive(GameMoveMessage message)
                 animation.Configuration = new BasicConnectedAnimationConfiguration();
                 animation.TryStart(ellipse);
             });
+#endif
 
         // Scroll to bottom
         PegScrollViewer.UpdateLayout();
diff --git a/src/Codebreaker.Uno/CodebreakerUno/Views/Pages/ShellPage.xaml b/src/Codebreaker.Uno/CodebreakerUno/Views/Pages/ShellPage.xaml
@@ -8,37 +8,37 @@
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
     <Grid>
         <Grid x:Name="AppTitleBar"
-      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-      Canvas.ZIndex="1"
-      Height="{x:Bind NavigationViewControl.CompactPaneLength}"
-      IsHitTestVisible="True"
-      VerticalAlignment="Top">
+            Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+            Canvas.ZIndex="1"
+            Height="{x:Bind NavigationViewControl.CompactPaneLength}"
+            IsHitTestVisible="True"
+            VerticalAlignment="Top">
             <Image Source="/Assets/WindowIcon.png"
-          HorizontalAlignment="Left"
-          Width="16"
-          Height="16" />
+                HorizontalAlignment="Left"
+                Width="16"
+                Height="16" />
             <TextBlock x:Name="AppTitleBarText"
-          VerticalAlignment="Center"
-          TextWrapping="NoWrap"
-          Style="{StaticResource CaptionTextBlockStyle}"
-          Margin="5,0,0,0"/>
+                VerticalAlignment="Center"
+                TextWrapping="NoWrap"
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Margin="5,0,0,0"/>
         </Grid>
         <NavigationView
-      x:Name="NavigationViewControl"
-      Canvas.ZIndex="0"
-      IsBackButtonVisible="Visible"
-      IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
-      SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
-      IsSettingsVisible="True"
-      ExpandedModeThresholdWidth="1280"
-      AlwaysShowHeader="True"
-      DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
-      Header="{x:Bind ViewModel.Header, Mode=OneWay}">
+            x:Name="NavigationViewControl"
+            Canvas.ZIndex="0"
+            IsBackButtonVisible="Visible"
+            IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
+            SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
+            IsSettingsVisible="True"
+            ExpandedModeThresholdWidth="1280"
+            AlwaysShowHeader="True"
+            DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
+            Header="{x:Bind ViewModel.Header, Mode=OneWay}">
             <NavigationView.MenuItems>
                 <NavigationViewItem
-          Content="{cme:ResourceString Name=ShellPage_GameTab}"
-          ca:NavigationHelper.NavigateTo="GamePage"
-          ca:NavigationViewItemHelper.IconGlyph="&#xe7c3;" />
+                    Content="{cme:ResourceString Name=ShellPage_GameTab}"
+                    ca:NavigationHelper.NavigateTo="GamePage"
+                    ca:NavigationViewItemHelper.IconGlyph="&#xe7c3;" />
             </NavigationView.MenuItems>
             <NavigationView.HeaderTemplate>
                 <DataTemplate>
@@ -49,10 +49,10 @@
                         </Grid.RowDefinitions>
                         <components:InfoBarArea Grid.Row="0" Margin="-50,20,0,0" />
                         <TextBlock
-              Grid.Row="1"
-              Margin="-25,20,0,0"
-              Text="{Binding}"
-              Style="{ThemeResource TitleTextBlockStyle}" />
+                            Grid.Row="1"
+                            Margin="-25,20,0,0"
+                            Text="{Binding}"
+                            Style="{ThemeResource TitleTextBlockStyle}" />
                     </Grid>
                 </DataTemplate>
             </NavigationView.HeaderTemplate>
diff --git a/src/Codebreaker.Uno/CodebreakerUno/Views/Pages/ShellPage.xaml.cs b/src/Codebreaker.Uno/CodebreakerUno/Views/Pages/ShellPage.xaml.cs
@@ -13,7 +13,9 @@ public ShellPage(ShellViewModel viewModel)
         ViewModel.NavigationService.Frame = NavigationFrame;
         ViewModel.NavigationViewService.Initialize(NavigationViewControl);
 
+#if WINDOWS10_0_17763_0_OR_GREATER
         App.Current.MainWindow!.ExtendsContentIntoTitleBar = true;
+#endif
         AppTitleBarText.Text = "AppDisplayName".GetLocalized();
     }
 
diff --git a/src/Codebreaker.Uno/Directory.Packages.props b/src/Codebreaker.Uno/Directory.Packages.props
@@ -5,16 +5,16 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
     <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageVersion Include="NUnit" Version="4.0.1" />
+    <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.3" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
     <PackageVersion Include="SkiaSharp" Version="2.88.7" />
     <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
@@ -37,19 +37,19 @@
     <PackageVersion Include="Uno.Extensions.Serialization.Refit" Version="4.0.0" />
     <PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.7" />
     <PackageVersion Include="Uno.Resizetizer" Version="1.3.0" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.50" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.87" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.8" />
-    <PackageVersion Include="Uno.WinUI" Version="5.1.50" />
-    <PackageVersion Include="Uno.WinUI.Lottie" Version="5.1.50" />
-    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.1.50" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.1.50" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.1.50" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.1.50" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.50" />
-    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.2" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.11" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.11" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.11" />
+    <PackageVersion Include="Uno.WinUI" Version="5.1.87" />
+    <PackageVersion Include="Uno.WinUI.Lottie" Version="5.1.87" />
+    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.1.87" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.1.87" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.1.87" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.1.87" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.87" />
+    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
     <PackageVersion Include="Xamarin.UITest" Version="4.3.4" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`using Codebreaker.ViewModels;`
`2`	`2`	`using CodeBreaker.Uno.Helpers;`
`3`	`3`	`using CommunityToolkit.Mvvm.Messaging;`
	`4`	`+#if WINDOWS10_0_17763_0_OR_GREATER`
`4`	`5`	`using Microsoft.UI.Xaml.Media.Animation;`
	`6`	`+#endif`
`5`	`7`
`6`	`8`	`namespace CodeBreaker.Uno.Views.Components;`
`7`	`9`
`@@ -31,11 +33,13 @@ private static void OnViewModelChanged(DependencyObject dependencyObject, Depend`
`31`	`33`
`32`	`34`	`public void Receive(GameMoveMessage message)`
`33`	`35`	`{`
	`36`	`+#if WINDOWS10_0_17763_0_OR_GREATER`
`34`	`37`	`if (message.GameMoveValue is not GameMoveValue.Started)`
`35`	`38`	`return;`
`36`	`39`
`37`	`40`	`var animationService = ConnectedAnimationService.GetForCurrentView();`
`38`	`41`	`this.FindItemsOfType<ComboBox>(this)`
`39`	`42`	`.ForEach((i, comboBox) => animationService.PrepareToAnimate($"guess{i}", comboBox));`
	`43`	`+#endif`
`40`	`44`	`}`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ public ShellPage(ShellViewModel viewModel)`
`13`	`13`	`ViewModel.NavigationService.Frame = NavigationFrame;`
`14`	`14`	`ViewModel.NavigationViewService.Initialize(NavigationViewControl);`
`15`	`15`
	`16`	`+#if WINDOWS10_0_17763_0_OR_GREATER`
`16`	`17`	`App.Current.MainWindow!.ExtendsContentIntoTitleBar = true;`
	`18`	`+#endif`
`17`	`19`	`AppTitleBarText.Text = "AppDisplayName".GetLocalized();`
`18`	`20`	`}`
`19`	`21`