From 0d37f545512cbbdae7fbf3da7596216811a8a7d7 Mon Sep 17 00:00:00 2001
From: "jules.lascret" <jules.lascret@etu.uca.fr>
Date: Fri, 29 Mar 2024 14:34:08 +0100
Subject: [PATCH] Slight change for the leaderboard + added colors in style

---
 Qwirkle/Qwirkle/Pages/Leaderboard.xaml       | 50 ++++++++++++--------
 Qwirkle/Qwirkle/Resources/Styles/Colors.xaml |  2 +
 Qwirkle/Qwirkle/Views/LeaderboardLine.xaml   | 27 +++++++++--
 3 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/Qwirkle/Qwirkle/Pages/Leaderboard.xaml b/Qwirkle/Qwirkle/Pages/Leaderboard.xaml
index ff04bca..ed728c5 100644
--- a/Qwirkle/Qwirkle/Pages/Leaderboard.xaml
+++ b/Qwirkle/Qwirkle/Pages/Leaderboard.xaml
@@ -4,21 +4,41 @@
              x:Class="Qwirkle.Pages.Leaderboard"
              xmlns:controls="clr-namespace:Qwirkle.Views"
              Title="Leaderboard">
+    
     <ScrollView>
-        <VerticalStackLayout Spacing="50">
-            <Label
-                Text="Leaderboard"
-                FontSize="Header"
-                HorizontalOptions="Center"/>
+        <VerticalStackLayout Spacing="30" Padding="5">
+            <Grid ColumnDefinitions="auto, *">
+                <Button Text="Return"
+                        Grid.Column="0"
+                        Grid.Row="0"
+                        Margin="10, 0, 0, 0"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center"
+                />
+                <Label FontSize="Header"
+                       Grid.Column="1"
+                       Grid.Row="0"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       Padding="50, 10"
+                       Text="Leaderboard"/>
+            </Grid>
             
-            <Border Stroke="Black"
-                    StrokeThickness="1.5"
-                    Margin="5">
+            <Border Stroke="{StaticResource Gray800}"
+                    StrokeThickness="4"
+                    Margin="10, 0">
+                
+                <Border.Shadow>
+                    <Shadow Brush="Black"
+                            Offset="10, 5"
+                            Radius="20"
+                            Opacity="0.7"/>
+                </Border.Shadow>
                 <Border.StrokeShape>
-                    <RoundRectangle CornerRadius="10"/>
+                    <RoundRectangle CornerRadius="3"/>
                 </Border.StrokeShape>
                 
-                <VerticalStackLayout Padding="10">
+                <VerticalStackLayout>
                     <controls:LeaderboardLine></controls:LeaderboardLine>
                     <Rectangle HeightRequest="2" BackgroundColor="Black"/>
                     
@@ -62,19 +82,11 @@
                     <Rectangle HeightRequest="2" BackgroundColor="Black"/>
                     
                     <controls:LeaderboardLine></controls:LeaderboardLine>
-                    <Rectangle HeightRequest="2" BackgroundColor="Black"/>
                 </VerticalStackLayout>
             </Border>
-
-            <Button Text="Return"
-                Margin="10"
-                HorizontalOptions="Center"
-                VerticalOptions="End"
-            />
             
         </VerticalStackLayout>
-
-
+        
     </ScrollView>
 
 </ContentPage>
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Resources/Styles/Colors.xaml b/Qwirkle/Qwirkle/Resources/Styles/Colors.xaml
index 22f0a67..f82f30c 100644
--- a/Qwirkle/Qwirkle/Resources/Styles/Colors.xaml
+++ b/Qwirkle/Qwirkle/Resources/Styles/Colors.xaml
@@ -25,6 +25,8 @@
     <Color x:Key="Gray400">#919191</Color>
     <Color x:Key="Gray500">#6E6E6E</Color>
     <Color x:Key="Gray600">#404040</Color>
+    <Color x:Key="Gray800">#333333</Color>
+    <Color x:Key="Gray800A">#33333322</Color>
     <Color x:Key="Gray900">#212121</Color>
     <Color x:Key="Gray950">#141414</Color>
 
diff --git a/Qwirkle/Qwirkle/Views/LeaderboardLine.xaml b/Qwirkle/Qwirkle/Views/LeaderboardLine.xaml
index 6b00533..0c643f1 100644
--- a/Qwirkle/Qwirkle/Views/LeaderboardLine.xaml
+++ b/Qwirkle/Qwirkle/Views/LeaderboardLine.xaml
@@ -3,7 +3,7 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Qwirkle.Views.LeaderboardLine">
-    <Grid ColumnDefinitions="4*, 2*, 2*, 2*"
+    <Grid ColumnDefinitions="4*, auto, 2*, auto, 2*, auto, 2*"
           RowDefinitions="50">
                         
         <Label
@@ -11,33 +11,52 @@
             Grid.Column="0"
             FontSize="Medium"
             FontAttributes="Bold"
+            Padding="5, 0"
             Text="Player Tag"
             TextColor="DarkSlateGrey"
             VerticalOptions="Center"/>
+        
+        <Rectangle WidthRequest="2"
+                   Grid.Column="1"
+                   Grid.RowSpan="20"
+                   BackgroundColor="Black"/>
                         
         <Label
             Grid.Row="0"
-            Grid.Column="1"
+            Grid.Column="2"
             FontSize="Medium"
             FontAttributes="Bold"
+            Padding="5, 0"
             Text="Date"
             TextColor="DarkSlateGrey"
             VerticalOptions="Center"/>
+        
+        <Rectangle WidthRequest="2"
+                   Grid.Column="3"
+                   Grid.RowSpan="20"
+                   BackgroundColor="Black"/>
                         
         <Label
             Grid.Row="0"
-            Grid.Column="2"
+            Grid.Column="4"
             FontSize="Medium"
             FontAttributes="Bold"
+            Padding="5, 0"
             Text="Points"
             TextColor="DarkSlateGrey"
             VerticalOptions="Center"/>
+        
+        <Rectangle WidthRequest="2"
+                   Grid.Column="5"
+                   Grid.RowSpan="20"
+                   BackgroundColor="Black"/>
                         
         <Label
             Grid.Row="0"
-            Grid.Column="3"
+            Grid.Column="6"
             FontSize="Medium"
             FontAttributes="Bold"
+            Padding="5, 0"
             Text="Victories"
             TextColor="DarkSlateGrey"
             VerticalOptions="Center"/>