Merge pull request #18 from CodebreakerApp/13-update-net-maui-client-for-api-v3

viewmodel updates #14

Author: christiannagel

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

@@ -1,8 +1,4 @@
-using System.Collections.ObjectModel;
-
-using CodeBreaker.ViewModels.Models;
-
-namespace CodeBreaker.ViewModels.Components;
+namespace Codebreaker.ViewModels.Components;
 
 public class GameViewModel
 {
@@ -17,7 +13,7 @@ public GameViewModel(Game game)
 
     public string Name => _game.PlayerName;
 
-    public string GameType => _game.GameType;
+    public GameType GameType => _game.GameType;
 
     public IDictionary<string, string[]> FieldValues => _game.FieldValues;
 

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

@@ -1,8 +1,6 @@
 using System.Windows.Input;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 
-namespace CodeBreaker.ViewModels;
+namespace Codebreaker.ViewModels;
 
 public enum InfoMessageSeverity
 {

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

@@ -1,6 +1,4 @@
-using CodeBreaker.ViewModels.Models;
-
-namespace CodeBreaker.ViewModels.Components;
+namespace Codebreaker.ViewModels.Components;
 
 public class MoveViewModel
 {

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

@@ -1,8 +1,6 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+namespace Codebreaker.ViewModels;
 
-namespace CodeBreaker.ViewModels;
-
- public partial class SelectedFieldViewModel : ObservableObject
+public partial class SelectedFieldViewModel : ObservableObject
 {
     [ObservableProperty]
     private string? _value;

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

@@ -1,12 +1,8 @@
-using System.Collections.ObjectModel;
-
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace CodeBreaker.ViewModels.Models;
+namespace Codebreaker.ViewModels.Models;
 
 public partial class Game(
     Guid gameId,
-    string gameType,
+    GameType gameType,
     string playerName,
     DateTime startTime,
     int numberCodes,
@@ -20,7 +16,7 @@ public partial class Game(
     /// <summary>
     /// Gets the type of the game. <see cref="GameType"/>
     /// </summary>
-    public string GameType { get; private set; } = gameType;
+    public GameType GameType { get; private set; } = gameType;
 
     /// <summary>
     /// Gets the name of the player.

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

@@ -1,8 +1,4 @@
-using System.Collections.ObjectModel;
-
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace CodeBreaker.ViewModels.Models;
+namespace Codebreaker.ViewModels.Models;
 public partial class Move(Guid moveId, int moveNumber) : ObservableObject
 {
     public Guid MoveId { get; private set; } = moveId;

…ewModels/Pages/ColorGamePageViewModel.cs …er.ViewModels/Pages/GamePageViewModel.cssrc/clients/xaml/CodeBreaker.ViewModels/Pages/ColorGamePageViewModel.cs renamed to src/clients/xaml/CodeBreaker.ViewModels/Pages/GamePageViewModel.cs src/clients/xaml/CodeBreaker.ViewModels/Pages/ColorGamePageViewModel.cs renamed to src/clients/xaml/CodeBreaker.ViewModels/Pages/GamePageViewModel.cs

@@ -1,17 +1,6 @@
-using System.Collections.ObjectModel;
+using Microsoft.Extensions.Options;
 
-using Codebreaker.GameAPIs.Client;
-using Codebreaker.GameAPIs.Client.Models;
-
-using CodeBreaker.ViewModels.Services;
-
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-
-using Microsoft.Extensions.Options;
-
-namespace CodeBreaker.ViewModels;
+namespace Codebreaker.ViewModels;
 
 public enum GameMode
 {
@@ -118,7 +107,7 @@ private async Task StartGameAsync()
 
             GameStatus = GameMode.Started;
 
-            Game = new Models.Game(gameId, "Game6x4", Name, DateTime.Now, numberCodes, maxMoves)
+            Game = new Game(gameId, GameType.Game6x4, Name, DateTime.Now, numberCodes, maxMoves)
             {
                 FieldValues = fieldValues
             };
@@ -186,9 +175,9 @@ private async Task SetMoveAsync()
 
             string[] guessPegs = Fields.Select(x => x.Value!).ToArray();
 
-            (string[] results, bool ended, bool isVictory) = await _client.SetMoveAsync(_game.GameId,  Name, GameType.Game6x4,  _moveNumber, guessPegs);
+            (string[] keyPegs, bool ended, bool isVictory) = await _client.SetMoveAsync(_game.GameId,  Name, GameType.Game6x4,  _moveNumber, guessPegs);
 
-            SelectionAndKeyPegs selectionAndKeyPegs = new(guessPegs, results, _moveNumber++);
+            SelectionAndKeyPegs selectionAndKeyPegs = new(guessPegs, keyPegs, _moveNumber++);
             GameMoves.Add(selectionAndKeyPegs);
             GameStatus = GameMode.MoveSet;
 
@@ -236,22 +225,6 @@ private void ClearSelectedColor()
         SetMoveCommand.NotifyCanExecuteChanged();
     }
 
-    //private void SetGamerNameIfAvailable()
-    //{
-    //    string? gamerName = _authService.LastUserInformation?.GamerName;
-
-    //    if (string.IsNullOrWhiteSpace(gamerName))
-    //    {
-    //        Name = string.Empty;
-    //        IsNamePredefined = false;
-    //    }
-    //    else
-    //    {
-    //        Name = gamerName;
-    //        IsNamePredefined = true;
-    //    }
-    //}
-
     private void InitializeValues()
     {
         ClearSelectedColor();

src/clients/xaml/CodeBreaker.ViewModels/Services/GameInfoService.cs

@@ -1,4 +1,4 @@
-namespace CodeBreaker.ViewModels.Services;
+namespace Codebreaker.ViewModels.Services;
 
 public class GameInfoService
 {

src/clients/xaml/CodeBreaker.ViewModels/Services/IDialogService.cs

@@ -1,4 +1,4 @@
-namespace CodeBreaker.ViewModels.Services;
+namespace Codebreaker.ViewModels.Services;
 
 public interface IDialogService
 {

src/clients/xaml/CodeBreaker.ViewModels/Services/InfoBarMessageService.cs

@@ -1,7 +1,4 @@
-using System.Collections.ObjectModel;
-using CommunityToolkit.Mvvm.Input;
-
-namespace CodeBreaker.ViewModels.Services;
+namespace Codebreaker.ViewModels.Services;
 
 public class InfoBarMessageService
 {