From 0437e4a184d2bfaa6257c4ee12fa7f5b033abc0d Mon Sep 17 00:00:00 2001
From: "jeremy.mouyon" <jeremy.mouyon@etu.uca.fr>
Date: Tue, 4 Jun 2024 11:15:31 +0200
Subject: [PATCH] push sb view

---
 Qwirkle/QwirkleViews/Views/Scoreboard.xaml    |  4 +-
 Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs | 43 ++++++++-----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
index 1982d53..1bc0c8d 100644
--- a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
+++ b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
@@ -8,13 +8,13 @@
 
     <VerticalStackLayout MaximumWidthRequest="200" Background="Transparent">
 
-        <CollectionView ItemsSource="{Binding NamesPlayers}">
+        <CollectionView ItemsSource="{Binding ScoreboardList}">
             <CollectionView.ItemsLayout>
                 <GridItemsLayout Orientation="Vertical"/>
             </CollectionView.ItemsLayout>
             <CollectionView.ItemTemplate>
                 <DataTemplate>
-                    <controls:ScoreboardLine Nameplayer="{Binding NameTag}"></controls:ScoreboardLine>
+                    <controls:ScoreboardLine Nameplayer="{Binding Key.NameTag}"></controls:ScoreboardLine>
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
diff --git a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs
index 7aa9b84..82d3f81 100644
--- a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs
+++ b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs
@@ -1,4 +1,6 @@
 using QwirkleClassLibrary.Players;
+using QwirkleClassLibrary.Games;
+using QwirkleClassLibrary.Boards;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 
@@ -6,43 +8,39 @@ namespace Qwirkle.Views;
 
 public partial class Scoreboard : ContentView, INotifyPropertyChanged
 {
-    private IOrderedEnumerable<KeyValuePair<Player, int>> scoreboard;
-    private Dictionary<Player, int> currentScoreBoard;
+    private Game game = ((App)Application.Current!).Game;
 
-    private List<Player> namesPlayers;
-    public List<Player> NamesPlayers
+    private IOrderedEnumerable<KeyValuePair<string, int>> scoreboard;
+
+    private ObservableCollection<KeyValuePair<string, int>> scoreboardList;
+    public ObservableCollection<KeyValuePair<string, int>> ScoreboardList
     {
-        get => namesPlayers;
+        get => scoreboardList;
         set
         {
-            if (namesPlayers != value)
+            if (scoreboardList != value)
             {
-                namesPlayers = value;
-                OnPropertyChanged(nameof(NamesPlayers));
+                scoreboardList = value;
+                OnPropertyChanged(nameof(ScoreboardList));
             }
         }
     }
+
     public Scoreboard()
-	{
-		InitializeComponent();
+    {
+        InitializeComponent();
         BindingContext = this;
 
-        scoreboard = ((App)Application.Current!).Game.ScoreBoard.OrderByDescending(x => x.Value).ThenBy(x => x.Key.NameTag);
-        currentScoreBoard = scoreboard.ToDictionary<Player, int>();
+        scoreboard = game.ScoreBoard.OrderByDescending(x => x.Value).ThenBy(x => x.Key);
+        ScoreboardList = new ObservableCollection<KeyValuePair<string, int>>(scoreboard);
 
-        NamesPlayers = currentScoreBoard.Keys.ToList();
-
-        ((App)Application.Current!).Game.Board.PropertyChanged += Board_PropertyChanged;
+        game.Board.PropertyChanged += Board_PropertyChanged;
     }
 
     private void Board_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
-
-        scoreboard = ((App)Application.Current!).Game.ScoreBoard.OrderByDescending(x => x.Value).ThenBy(x => x.Key.NameTag);
-        currentScoreBoard = scoreboard.ToDictionary<Player, int>();
-
-        NamesPlayers = currentScoreBoard.Keys.ToList();
-
+        scoreboard = game.ScoreBoard.OrderByDescending(x => x.Value).ThenBy(x => x.Key.NameTag);
+        ScoreboardList = new ObservableCollection<KeyValuePair<string, int>>(scoreboard);
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -51,7 +49,4 @@ public partial class Scoreboard : ContentView, INotifyPropertyChanged
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
-
-
-
 }
\ No newline at end of file