Merge pull request #184 from CodebreakerApp/183-winui-cancel-game-feature

183 winui cancel game feature

Author: christiannagel

src/Codebreaker.WinUI/Codebreaker.WinUI.csproj

@@ -49,19 +49,19 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="3.6.0-beta.34" />
+    <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="3.7.0-beta.40" />
     <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.59.0" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="WinUIEx" Version="2.3.3" />
+    <PackageReference Include="WinUIEx" Version="2.3.4" />
   </ItemGroup>
   <ItemGroup>
     <Page Update="Views\Templates\CodeBreakerTemplates.xaml">

src/Codebreaker.WinUI/Converters/GameStatusToVisibilityConverter.cs

@@ -30,20 +30,20 @@ void Callback(object sender, RoutedEventArgs args)
         page.Unloaded += Callback;
     }
 
-    public static IEnumerable<T> FindItemsOfType<T>(this DependencyObject dependencyObject, DependencyObject obj)
+    public static IEnumerable<T> FindChildrenRecursively<T>(this DependencyObject dependencyObject)
         where T : DependencyObject
     {
-        for (int i = 0; i < VisualTreeHelper.GetChildrenCount(obj); i++)
+        for (int i = 0; i < VisualTreeHelper.GetChildrenCount(dependencyObject); i++)
         {
-            DependencyObject child = VisualTreeHelper.GetChild(obj, i);
+            DependencyObject child = VisualTreeHelper.GetChild(dependencyObject, i);
 
             if (child is null)
                 yield break;
 
             if (child is T item)
                 yield return item;
 
-            foreach (T childOfChild in dependencyObject.FindItemsOfType<T>(child))
+            foreach (T childOfChild in child.FindChildrenRecursively<T>())
                 yield return childOfChild;
         }
     }

src/Codebreaker.WinUI/Helpers/PageExtensions.cs

@@ -10,7 +10,6 @@
     xmlns:cme="using:CodeBreaker.WinUI.CustomMarkupExtensions"
     mc:Ignorable="d">
     <UserControl.Resources>
-        <converter:GameStatusToVisibilityConverter x:Key="GameStatusToVisibilityConverter" />
         <animations:ImplicitAnimationSet x:Key="EntranceAnimation">
             <animations:OpacityAnimation Duration="0:0:2" From="0" To="1" />
             <animations:TranslationAnimation Duration="0:0:1" From="0,-300,0" To="0" />

src/Codebreaker.WinUI/Views/Components/GameResultDisplay.xaml

@@ -1,12 +1,17 @@
 using Codebreaker.ViewModels;
-using System.ComponentModel;
+using Codebreaker.ViewModels.Messages;
+using CommunityToolkit.Mvvm.Messaging;
 
 namespace CodeBreaker.WinUI.Views.Components;
 
-public sealed partial class GameResultDisplay : UserControl
+public sealed partial class GameResultDisplay : UserControl,
+    IRecipient<GameEndedMessage>,
+    IRecipient<GameStartedMessage>
 {
     public GameResultDisplay()
     {
+        WeakReferenceMessenger.Default.RegisterAll(this);
+        WeakReferenceMessenger.Default.UnregisterAllOnUnloaded(this);
         InitializeComponent();
         this.GoToState("Default", false);
     }
@@ -18,25 +23,11 @@ public GamePageViewModel ViewModel
     }
 
     public static readonly DependencyProperty ViewModelProperty =
-        DependencyProperty.Register(nameof(ViewModel), typeof(GamePageViewModel), typeof(GameResultDisplay), new PropertyMetadata(null, OnViewModelChanged));
+        DependencyProperty.Register(nameof(ViewModel), typeof(GamePageViewModel), typeof(GameResultDisplay), new PropertyMetadata(null));
 
-    private static void OnViewModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        var @this = (GameResultDisplay)d;
-        @this.ViewModel.PropertyChanged += @this.OnViewModelPropertyChanged;
-    }
+    public void Receive(GameEndedMessage message) =>
+        this.GoToState(message.IsVictory ? "Won" : "Lost");
 
-    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs args)
-    {
-        if (args.PropertyName != nameof(GamePageViewModel.GameStatus))
-            return;
-
-        var stateName = ViewModel.GameStatus switch
-        {
-            GameMode.Won => "Won",
-            GameMode.Lost => "Lost",
-            _ => "Default"
-        };
-        this.GoToState(stateName);
-    }
+    public void Receive(GameStartedMessage message) =>
+        this.GoToState("Default");
 }

src/Codebreaker.WinUI/Views/Components/GameResultDisplay.xaml.cs

@@ -7,24 +7,25 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vmComponents="using:Codebreaker.ViewModels.Components"
+    xmlns:models="using:Codebreaker.ViewModels.Models"
     xmlns:toolkitConverters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:cme="using:CodeBreaker.WinUI.CustomMarkupExtensions"
     mc:Ignorable="d"
     x:Name="ThisControl">
 
     <UserControl.Resources>
         <toolkitConverters:BoolToVisibilityConverter x:Key="BoolToVisibility" />
-        <DataTemplate x:Key="SelectColorTemplate">
+        <DataTemplate x:Key="SelectColorTemplate" x:DataType="x:String">
             <Grid>
-                <Ellipse Fill="{Binding Mode=OneWay, Converter={StaticResource ColorConverter}}" Width="60" Height="60" />
+                <Ellipse Fill="{x:Bind Mode=OneWay, Converter={StaticResource ColorConverter}}" Width="60" Height="60" />
             </Grid>
         </DataTemplate>
-        <DataTemplate x:Key="SelectColorItemTemplate" x:DataType="vmComponents:SelectedFieldViewModel">
+        <DataTemplate x:Key="SelectColorItemTemplate" x:DataType="models:Field">
             <ComboBox
                 Margin="04" Width="112"
                 Height="92"
-                ItemsSource="{Binding ElementName=ThisControl, Path=DataContext.Game.FieldValues[colors], Mode=OneWay}"
-                SelectedItem="{x:Bind Path=Value, Mode=TwoWay}"
+                ItemsSource="{x:Bind PossibleColors, Mode=OneTime}"
+                SelectedItem="{x:Bind Color, Mode=TwoWay}"
                 ItemTemplate="{StaticResource SelectColorTemplate}"
                 PlaceholderText="❓" HorizontalContentAlignment="Center" FontSize="40" />
         </DataTemplate>
@@ -37,18 +38,18 @@
         </Grid.ColumnDefinitions>
         <ItemsControl
             Grid.Column="0"
-            ItemsSource="{x:Bind Path=ViewModel.Fields, Mode=OneWay}"
+            ItemsSource="{x:Bind Path=ViewModel.SelectedFields, Mode=OneWay}"
             ItemTemplate="{StaticResource SelectColorItemTemplate}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
                     <StackPanel Orientation="Horizontal" Margin="15,0,15,10" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
         </ItemsControl>
-        <Button Command="{x:Bind ViewModel.SetMoveCommand, Mode=OneTime}" Grid.Column="1" Margin="4" VerticalAlignment="Top" Height="92" Width="100">
+        <Button Command="{x:Bind ViewModel.MakeMoveCommand, Mode=OneTime}" Grid.Column="1" Margin="4" VerticalAlignment="Top" Height="92" Width="100">
             <StackPanel Orientation="Vertical" Spacing="5">
-                <SymbolIcon Symbol="Send" Visibility="{x:Bind ViewModel.SetMoveCommand.IsRunning, Mode=OneWay, Converter={StaticResource BoolToVisibility}, ConverterParameter=True}" />
-                <ProgressRing Visibility="{x:Bind ViewModel.SetMoveCommand.IsRunning, Mode=OneWay}" />
+                <SymbolIcon Symbol="Send" Visibility="{x:Bind ViewModel.MakeMoveCommand.IsRunning, Mode=OneWay, Converter={StaticResource BoolToVisibility}, ConverterParameter=True}" />
+                <ProgressRing Visibility="{x:Bind ViewModel.MakeMoveCommand.IsRunning, Mode=OneWay}" />
                 <TextBlock Text="{cme:ResourceString Name=PegSelection_MakeMove}" />
             </StackPanel>
         </Button>

src/Codebreaker.WinUI/Views/Components/PegSelectionComponent.xaml

@@ -1,10 +1,11 @@
 using Codebreaker.ViewModels;
+using Codebreaker.ViewModels.Messages;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml.Media.Animation;
 
 namespace CodeBreaker.WinUI.Views.Components;
 
-internal sealed partial class PegSelectionComponent : UserControl, IRecipient<GameMoveMessage>
+internal sealed partial class PegSelectionComponent : UserControl, IRecipient<MakeMoveMessage>
 {
     public PegSelectionComponent()
     {
@@ -26,13 +27,14 @@ public GamePageViewModel ViewModel
     public static readonly DependencyProperty ViewModelProperty =
         DependencyProperty.Register("ViewModel", typeof(GamePageViewModel), typeof(PegSelectionComponent), new PropertyMetadata(null));
 
-    public void Receive(GameMoveMessage message)
+    public void Receive(MakeMoveMessage message)
     {
-        if (message.GameMoveValue is not GameMoveValue.Started)
+        // Move must be completed already
+        if (message.IsSet)
             return;
 
         var animationService = ConnectedAnimationService.GetForCurrentView();
-        this.FindItemsOfType<ComboBox>(this)
+        this.FindChildrenRecursively<ComboBox>()
             .Foreach((comboBox, i) => animationService.PrepareToAnimate($"guess{i}", comboBox));
     }
 }

src/Codebreaker.WinUI/Views/Components/PegSelectionComponent.xaml.cs

@@ -13,7 +13,6 @@
     xmlns:cme="using:CodeBreaker.WinUI.CustomMarkupExtensions"
     mc:Ignorable="d">
     <Page.Resources>
-        <conv:GameStatusToVisibilityConverter x:Key="GameStatusVisibility" />
         <toolkitConverters:BoolToVisibilityConverter x:Key="BoolToVisibility" />
         <Style TargetType="InfoBar">
             <Setter Property="Margin" Value="0,0,0,30" />
@@ -66,17 +65,10 @@
                 <!-- The extra grid and the empy (enabled) TextBlock are necessary for showing the tooltip over the (disabled) TextBox. -->
                 <TextBlock />
                 <TextBox
-                    IsEnabled="{x:Bind ViewModel.IsNameEnterable, Mode=OneWay}"
                     Header="{cme:ResourceString Name=GamePage_NameInputHeader}"
                     PlaceholderText="{cme:ResourceString Name=GamePage_NameInputPlaceholder}"
                     VerticalAlignment="Center"
-                    Text="{x:Bind ViewModel.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                <ToolTipService.ToolTip>
-                    <ToolTip
-                    Content="{cme:ResourceString Name=GamePage_NameAlreadyProvidedTooltip}"
-                    IsEnabled="{x:Bind Path=ViewModel.IsNamePredefined, Mode=OneWay}"
-                    Placement="Bottom" />
-                </ToolTipService.ToolTip>
+                    Text="{x:Bind ViewModel.Username, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
             <Button
                 Grid.Column="1"
@@ -91,14 +83,14 @@
                 </StackPanel>
             </Button>
         </Grid>
-        <components:GameResultDisplay Grid.Row="0" />
+        <components:GameResultDisplay
+            Grid.Row="0"
+            ViewModel="{x:Bind ViewModel}" />
         <!--Gamebar section-->
         <StackPanel
             x:Name="PegSelectionArea"
             Orientation="Horizontal"
             Grid.Row="1">
-            <!--
-            Cancelling the game is not yet implemented in the VM
             <Button
                 Height="92" Margin="0,-6,4,0" Width="100"
                 ca:Confirm.Enabled="True"
@@ -112,11 +104,11 @@
                     <ProgressRing Visibility="{x:Bind ViewModel.CancelGameCommand.IsRunning, Mode=OneWay}" />
                     <TextBlock Text="{cme:ResourceString Name=GamePage_CancelButtonText}" />
                 </StackPanel>
-            </Button>-->
-                <components:PegSelectionComponent 
-                    Grid.Row="3"
-                    Margin="65,0,0,0"
-                    ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
+            </Button>
+            <components:PegSelectionComponent 
+                Grid.Row="3"
+                Margin="65,0,0,0"
+                ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
         </StackPanel>
         <!--Move section-->
         <ScrollViewer Grid.Row="2" Padding="0,0,0,15" x:Name="PegScrollViewer">
@@ -125,7 +117,7 @@
                 Background="Transparent"
                 SelectedIndex="-1"
                 IsHitTestVisible="False"
-                ItemsSource="{x:Bind ViewModel.GameMoves, Mode=OneWay}"
+                ItemsSource="{x:Bind ViewModel.Game.Moves, Mode=OneWay}"
                 ItemTemplate="{StaticResource PegsTemplate}" />
         </ScrollViewer>
     </Grid>