version 2.1

Author: dme-compunet

Source/Compunet.SudokuSolver/App.xaml

@@ -6,7 +6,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Resources/Themes/LightTheme.xaml"/>
-                <ResourceDictionary Source="/Resources/Languages/Hebrew.xaml"/>
+                <ResourceDictionary Source="/Resources/Localization/StringResources.he.xaml"/>
                 <ResourceDictionary Source="/Resources/Fonts.xaml"/>
                 <ResourceDictionary Source="/Resources/Icons.xaml"/>
                 <ResourceDictionary Source="/Resources/ToolTip.xaml"/>

Source/Compunet.SudokuSolver/App.xaml.cs

@@ -1,6 +1,7 @@
 using Compunet.SudokuSolver.Application;
 using Compunet.SudokuSolver.Container;
 using Compunet.SudokuSolver.Mvvm;
+using Compunet.SudokuSolver.Print;
 using Compunet.SudokuSolver.Services;
 using Microsoft.Extensions.DependencyInjection;
 using System.Windows;
@@ -32,6 +33,7 @@ private IServiceCollection ConfigureServices(IServiceCollection services)
                            .AddSingleton<ISudokuInputService, SudokuInputService>()
                            .AddSingleton<IApplicationResourceManager, ApplicationResourceManager>()
                            .AddSingleton<ICreatePuzzleDialogService, CreatePuzzleDialogService>()
+                           .AddSingleton<IPrintService, PrintService>()
                            .AddSingleton<ISettingsService, SettingsService>()
                            .AddSingleton<IExitService, ExitService>()
                            ;

Source/Compunet.SudokuSolver/AppWindow.xaml

@@ -37,7 +37,7 @@
                     <views:SudokuControl Margin="20" 
                                          Width="500"
                                          Height="550"/>
-
+                    
                 </Viewbox>
 
             </Grid>

Source/Compunet.SudokuSolver/Application/ApplicationResourceManager.cs

@@ -73,12 +73,12 @@ private void InitLanguages()
         {
             var he = new ResourceDictionary
             {
-                Source = new Uri("/Resources/Languages/Hebrew.xaml", UriKind.RelativeOrAbsolute)
+                Source = new Uri("/Resources/Localization/StringResources.he.xaml", UriKind.RelativeOrAbsolute)
             };
 
             var en = new ResourceDictionary
             {
-                Source = new Uri("/Resources/Languages/English.xaml", UriKind.RelativeOrAbsolute)
+                Source = new Uri("/Resources/Localization/StringResources.en.xaml", UriKind.RelativeOrAbsolute)
             };
 
             var en_lang = new ThemeApplicationResource(DefaultEnglishLanguage, ApplicationResourceCategory.LanguageAsset, new Lazy<ResourceDictionary>(en));

Source/Compunet.SudokuSolver/Controls/BaseWindow.cs

@@ -1,9 +1,13 @@
 using Compunet.Platform;
+using Compunet.SudokuSolver.Mvvm;
 
 namespace Compunet.SudokuSolver.Controls
 {
     public abstract class BaseWindow : BasePlatformWindow
     {
-
+        public BaseWindow()
+        {
+            DataContext = new WindowViewModel(this);
+        }
     }
 }

Source/Compunet.SudokuSolver/Controls/BorderExtensions.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Compunet.SudokuSolver.Controls
+{
+    public static class BorderExtensions
+    {
+        public static readonly DependencyProperty ClipToCornerRadiusProperty =
+            DependencyProperty.RegisterAttached("ClipToCornerRadius",
+                                                typeof(bool),
+                                                typeof(BorderExtensions),
+                                                new PropertyMetadata(false, OnClipToCornerRadiusChanged));
+
+        private class ClipGeometrySelectorConverter : IMultiValueConverter
+        {
+            public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+            {
+                double width = (double)values[0];
+                double height = (double)values[1];
+                double radius = ((CornerRadius)values[2]).TopLeft;
+
+                Size size = new(width, height);
+                Rect rect = new(size);
+                RectangleGeometry clip = new(rect, radius, radius);
+
+                return clip;
+            }
+
+            public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+            {
+                return Array.Empty<object>();
+            }
+        }
+
+        private static void OnClipToCornerRadiusChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            Border border = (Border)d;
+            bool value = (bool)e.NewValue;
+
+            if (value == false)
+            {
+                border.SetValue(UIElement.ClipProperty, null);
+                return;
+            }
+
+            var binding = new MultiBinding();
+
+            binding.Bindings.Add(new Binding
+            {
+                Source = border,
+                Path = new PropertyPath("ActualWidth")
+            });
+
+            binding.Bindings.Add(new Binding
+            {
+                Source = border,
+                Path = new PropertyPath("ActualHeight")
+            });
+
+            binding.Bindings.Add(new Binding
+            {
+                Source = border,
+                Path = new PropertyPath("CornerRadius")
+            });
+
+            binding.Converter = new ClipGeometrySelectorConverter();
+            border.SetBinding(UIElement.ClipProperty, binding);
+        }
+
+        public static bool GetClipToCornerRadius(Border border)
+        {
+            return (bool)border.GetValue(ClipToCornerRadiusProperty);
+        }
+
+        public static void SetClipToCornerRadius(Border border, bool value)
+        {
+            border.SetValue(ClipToCornerRadiusProperty, value);
+        }
+    }
+}

Source/Compunet.SudokuSolver/Controls/SudokuListBoxItem.xaml.cs

@@ -56,7 +56,7 @@ public SudokuListBoxItem(Cell cell)
         private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             Value value = (Value)e.NewValue;
-            d.SetValue(ValueTextProperty, value.IsZero ? string.Empty : value.ToString());
+            d.SetValue(ValueTextProperty, value.ToDisplayString());
         }
     }
 }

Source/Compunet.SudokuSolver/Core/.Board/BoardValidationExtensions.cs

@@ -36,7 +36,7 @@ public static bool ColumnContains(this IBoard board, int columnindex, Value valu
             return false;
         }
 
-        public static bool SquareContains(this IBoard board, int sequreindex, Value value, Cell? ignore = null)
+        public static bool BoxContains(this IBoard board, int sequreindex, Value value, Cell? ignore = null)
         {
             int r = sequreindex / 3 * 3;
             int c = sequreindex % 3 * 3;
@@ -62,7 +62,7 @@ public static bool CheckValue(this IBoard board, Cell position, Value value)
         {
             return !(board.RowContains(position.Row, value)
                      || board.ColumnContains(position.Column, value)
-                     || board.SquareContains(position.Square, value));
+                     || board.BoxContains(position.Box, value));
         }
 
         public static IEnumerable<Cell> GetWarns(this IBoard state)
@@ -80,7 +80,7 @@ public static IEnumerable<Cell> GetWarns(this IBoard state)
                 if (state.ColumnContains(cell.Column, value, cell))
                     yield return cell;
 
-                if (state.SquareContains(cell.Square, value, cell))
+                if (state.BoxContains(cell.Box, value, cell))
                     yield return cell;
 
             }

Source/Compunet.SudokuSolver/Core/.Board/SudokuBoardGenerator.cs

@@ -37,22 +37,22 @@ public static async Task<IBoard> GeneratePuzzleState(SudokuPuzzleLevel level)
 
             var board = SudokuBoardCreator.CreateEditable(resolte);
 
-            int TakeRandomForRemove()
+            int CreateRandomForRemove()
             {
                 return level switch
                 {
-                    SudokuPuzzleLevel.Easy => random.Next(3, 8),
-                    SudokuPuzzleLevel.Medium => random.Next(5, 9),
-                    SudokuPuzzleLevel.Hard => random.Next(6, 9),
+                    SudokuPuzzleLevel.Easy => random.Next(4, 6),
+                    SudokuPuzzleLevel.Medium => random.Next(5, 7),
+                    SudokuPuzzleLevel.Hard => random.Next(6, 8),
                     _ => 0
                 };
             }
 
             var cells = Cell.AllRange.Shuffle();
 
-            foreach (var square in cells.GroupBy(c => c.Square))
+            foreach (var square in cells.GroupBy(c => c.Box))
             {
-                foreach (var cell in square.Take(TakeRandomForRemove()))
+                foreach (var cell in square.Take(CreateRandomForRemove()))
                 {
                     board.SetValue(cell, Value.Zero);
                 }

Source/Compunet.SudokuSolver/Core/.Structs/Cell.cs

@@ -20,12 +20,9 @@ public struct Cell : IEquatable<Cell>
 
         #endregion
 
-        //public static readonly Cell First = new(0);
-        //public static readonly Cell Last = new(80);
-
         public int Row => Index / 9;
         public int Column => Index % 9;
-        public int Square => Column / 3 + (Row / 3 * 3);
+        public int Box => Column / 3 + (Row / 3 * 3);
         public int Index { get; }
 
         public bool IsFirst => Index == 0;
@@ -102,7 +99,7 @@ public override int GetHashCode()
 
         public override string ToString()
         {
-            return $"Row: {Row}, Column: {Column}, Square: {Square}";
+            return $"Row: {Row}, Column: {Column}, Square: {Box}";
         }
 
         #endregion