Merge branch 'main' into 92-animations-and-infomessages

Author: szv

src/Codebreaker.ViewModels/Components/InfoMessageViewModel.cs

@@ -31,7 +31,7 @@ public partial class InfoMessageViewModel(Action closeAction) : ObservableObject
     [NotifyPropertyChangedFor(nameof(HasAction))]
     private string? _actionText = "OK";
 
-    public bool HasAction => ExecuteActionCommand is not null && ActionText is not null;
+    public bool HasAction => Action is not null && ActionText is not null;
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(CloseCommand))]

src/Codebreaker.WinUI/Converters/ColornameToBrushConverter.cs

@@ -1,4 +1,5 @@
-using Microsoft.UI;
+using Microsoft.Extensions.Logging;
+using Microsoft.UI;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
 using Windows.UI;
@@ -11,18 +12,12 @@ public class ColornameToBrushConverter : IValueConverter
     private readonly static Brush s_whiteBrush = new SolidColorBrush(Colors.White);
     private readonly static Brush s_redBrush = new SolidColorBrush(Color.FromArgb(255, 209, 52, 56));
     private readonly static Brush s_greenBrush = new SolidColorBrush(Color.FromArgb(255, 0, 173, 86));
-    private readonly static Brush s_blueBrush = new SolidColorBrush(Color.FromArgb(255, 79, 107, 237));
+    private readonly static Brush s_blueBrush = new SolidColorBrush(Color.FromArgb(255, 0, 128, 212));
     private readonly static Brush s_yellowBrush = new SolidColorBrush(Color.FromArgb(255, 252, 225, 0));
+    private readonly static Brush s_orangeBrush = new SolidColorBrush(Color.FromArgb(255, 234, 74, 33));
+    private readonly static Brush s_purpleBrush = new SolidColorBrush(Color.FromArgb(255, 91, 95, 199));
     private readonly static Brush s_emptyBrush = new SolidColorBrush(Color.FromArgb(255, 160, 174, 178));
 
-    public Brush BlackBrush { get; set; } = s_blackBrush;
-    public Brush WhiteBrush { get; set; } = s_whiteBrush;
-    public Brush RedBrush { get; set; } = s_redBrush;
-    public Brush GreenBrush { get; set; } = s_greenBrush;
-    public Brush BlueBrush { get; set; } = s_blueBrush;
-    public Brush YellowBrush { get; set; } = s_yellowBrush;
-    private Brush EmptyBrush { get; set; } = s_emptyBrush;
-
     public object Convert(object value, Type targetType, object parameter, string language)
     {
         if (value is null)
@@ -33,13 +28,15 @@ public object Convert(object value, Type targetType, object parameter, string la
 
         return colorname switch
         {
-            "Black" => BlackBrush,
-            "White" => WhiteBrush,
-            "Red" => RedBrush,
-            "Green" => GreenBrush,
-            "Blue" => BlueBrush,
-            "Yellow" => YellowBrush,
-            _ => EmptyBrush
+            "Black" => s_blackBrush,
+            "White" => s_whiteBrush,
+            "Red" => s_redBrush,
+            "Green" => s_greenBrush,
+            "Blue" => s_blueBrush,
+            "Yellow" => s_yellowBrush,
+            "Orange" => s_orangeBrush,
+            "Purple" => s_purpleBrush,
+            _ => s_emptyBrush
         };
     }
 

src/Codebreaker.WinUI/Views/Templates/CodeBreakerTemplates.xaml

@@ -17,9 +17,9 @@
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="0" Text="{Binding Path=MoveNumber}" FontSize="{ThemeResource LargeFontSize}" Margin="48,0,10,0" VerticalAlignment="Center" />
+            <TextBlock Grid.Column="0" Text="{Binding Path=MoveNumber, Mode=OneTime}" FontSize="{ThemeResource LargeFontSize}" Margin="48,0,10,0" VerticalAlignment="Center" />
             <Border Grid.Column="1" Margin="20,0,0,0" Padding="7" x:Name="ShadowTarget">
-                <ItemsControl ItemsSource="{Binding Path=GuessPegs}">
+                <ItemsControl ItemsSource="{Binding Path=GuessPegs, Mode=OneTime}">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
                             <StackPanel Orientation="Horizontal" Spacing="27" />
@@ -28,7 +28,7 @@
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Grid>
-                                <Ellipse Width="68" Height="68" Margin="12,4" Fill="{Binding Converter={StaticResource ColorConverter}}" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" />
+                                <Ellipse Width="68" Height="68" Margin="12,4" Fill="{Binding Mode=OneTime, Converter={StaticResource ColorConverter}}" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" />
                             </Grid>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
@@ -41,27 +41,15 @@
                         <RowDefinition />
                         <RowDefinition />
                     </Grid.RowDefinitions>
-                    <ItemsControl Grid.Row="0" ItemsSource="{Binding Path=KeyPegs.White, Converter={StaticResource IntToEnumerableConverter}}">
+                    <ItemsControl Grid.Row="0" ItemsSource="{Binding Path=KeyPegs, Mode=OneTime}">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <StackPanel Orientation="Horizontal" Spacing="20" />
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <Ellipse Width="25" Height="25" Fill="White" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" />
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                    <ItemsControl Grid.Row="1" ItemsSource="{Binding Path=KeyPegs.Black, Converter={StaticResource IntToEnumerableConverter}}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="20" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Ellipse Width="25" Height="25" Fill="Black" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" />
+                                <Ellipse Width="25" Height="25" Fill="{Binding Mode=OneTime, Converter={StaticResource ColorConverter}}" Stroke="{ThemeResource TextBoxBorderThemeBrush}" StrokeThickness="1" />
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>