Merge pull request #17 from CodebreakerApp/main

update maui from main

Author: christiannagel

.github/workflows/codebreaker-lib-viewmodels.yml

@@ -1,4 +1,4 @@
-name: Analyzers lib
+name: Viewmodels lib
 
 on:
 
@@ -7,8 +7,8 @@ on:
     branches: 
       [ main ]
     paths:
-    - 'src/clients/xaml/Codebreaker.GameAPIs.ViewModels/**'
-    - 'src/clients/xaml/Codebreaker.GameAPIs.ViewModels.Tests/**'
+    - 'src/clients/xaml/Codebreaker.ViewModels/**'
+    - 'src/clients/xaml/Codebreaker.ViewModels.Tests/**'
     - 'src/Codebreaker.ViewModels.sln'
     - '.github/workflows/codebreaker-lib-viewmodels.yml'
     - '.github/workflows/createnuget-withbuildnumber.yml'

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 CN innovation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/clients/xaml/CodeBreaker.ViewModels/CodeBreaker.ViewModels.csproj

@@ -23,7 +23,7 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
-    <PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.5.0-beta.12" />
+    <PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.5.0-beta.13" />
   </ItemGroup>
 
   <ItemGroup>

src/clients/xaml/CodeBreaker.ViewModels/Components/GameViewModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-using Codebreaker.GameAPIs.Client.Models;
+using CodeBreaker.ViewModels.Models;
 
 namespace CodeBreaker.ViewModels.Components;
 
@@ -11,9 +11,6 @@ public class GameViewModel
     public GameViewModel(Game game)
     {
         _game = game;
-
-        ColorList = new List<string>(_game.FieldValues["colors"]);
-        Code = new List<string>(_game.Codes);
     }
 
     public Guid GameId => _game.GameId;
@@ -22,9 +19,7 @@ public GameViewModel(Game game)
 
     public string GameType => _game.GameType;
 
-    public IReadOnlyList<string> Code { get; private set; }
-
-    public IReadOnlyList<string> ColorList { get; private set; }
+    public IDictionary<string, string[]> FieldValues => _game.FieldValues;
 
     public int NumberCodes => _game.NumberCodes;
 

src/clients/xaml/CodeBreaker.ViewModels/Components/MoveViewModel.cs

@@ -1,5 +1,4 @@
-using Codebreaker.GameAPIs.Client.Models;
-
+using CodeBreaker.ViewModels.Models;
 
 namespace CodeBreaker.ViewModels.Components;
 
@@ -12,7 +11,9 @@ public MoveViewModel(Move move) =>
 
     public int MoveNumber => _move.MoveNumber;
 
+    // TODO: read-only or updates?
     public IReadOnlyList<string> GuessPegs => _move.GuessPegs;
 
-    public string[] KeyPegs => _move.KeyPegs;
+    // TODO: read-only or updates?
+    public string[] KeyPegs => _move.KeyPegs.ToArray();
 }

src/clients/xaml/CodeBreaker.ViewModels/Models/Game.cs

@@ -1,7 +1,5 @@
 using System.Collections.ObjectModel;
 
-using Codebreaker.GameAPIs.Client.Models;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace CodeBreaker.ViewModels.Models;

src/clients/xaml/CodeBreaker.ViewModels/Models/Move.cs

@@ -0,0 +1,29 @@
+using System.Collections.ObjectModel;
+
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace CodeBreaker.ViewModels.Models;
+public partial class Move(Guid moveId, int moveNumber) : ObservableObject
+{
+    public Guid MoveId { get; private set; } = moveId;
+
+    /// <summary>
+    /// The move number for this move within the associated game.
+    /// </summary>
+    [ObservableProperty]
+    private int _moveNumber = moveNumber;
+
+    /// <summary>
+    /// The guess pegs from the user for this move.
+    /// </summary>
+    public ObservableCollection<string> GuessPegs { get; } = new();
+
+    /// <summary>
+    /// The result from the analyer for this move based on the associated game that contains the move.
+    /// </summary>
+    public ObservableCollection<string> KeyPegs { get; } = new();
+
+    public override string ToString() => $"{MoveNumber}. " +
+        $"{string.Join('#', GuessPegs)} : " +
+        $"{string.Join('#', KeyPegs)}";
+}