From 4297dd49a8f8a7ececc2df7f9a9ac9ca2ffb2cd7 Mon Sep 17 00:00:00 2001
From: "jeremy.mouyon" <jeremy.mouyon@etu.uca.fr>
Date: Wed, 5 Jun 2024 17:39:23 +0200
Subject: [PATCH] its beautiful now !

---
 Qwirkle/QwirkleViews/AppShell.xaml            |  5 ++--
 Qwirkle/QwirkleViews/Pages/Gameboard.xaml     | 30 ++++++++++++++-----
 .../QwirkleViews/Resources/Styles/Styles.xaml | 26 +++++++++++-----
 Qwirkle/QwirkleViews/Views/Scoreboard.xaml    |  1 -
 4 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/Qwirkle/QwirkleViews/AppShell.xaml b/Qwirkle/QwirkleViews/AppShell.xaml
index c75f2a2..1b768b5 100644
--- a/Qwirkle/QwirkleViews/AppShell.xaml
+++ b/Qwirkle/QwirkleViews/AppShell.xaml
@@ -6,8 +6,9 @@
     xmlns:local="clr-namespace:Qwirkle"
     xmlns:localPages="clr-namespace:Qwirkle.Pages"
     Shell.FlyoutBehavior="Disabled"
-    Title="Qwirkle"
-    FlyoutBackgroundColor="White">
+    FlyoutBackgroundColor="White"
+       IsVisible="False"
+    >
     
     
     
diff --git a/Qwirkle/QwirkleViews/Pages/Gameboard.xaml b/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
index 098db2a..3095be4 100644
--- a/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
+++ b/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
@@ -13,7 +13,7 @@
             <x:Double x:Key="HorizontalSpacing">1</x:Double>
         <toolkit:MultiMathExpressionConverter x:Key="multiMathExpressionConverter" />
     </ContentPage.Resources>
-    <Grid>
+    <Grid BackgroundColor="#efca85">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="4*" />
@@ -38,10 +38,25 @@
             <Image Source="bag.png"></Image>
         </Border>
 
-        <Button  HorizontalOptions="Start" Grid.Row="0" Grid.Column="1" Text="Swap" WidthRequest="200" HeightRequest="10" FontSize="20" Margin="20" Clicked="OnButtonSwapClicked"></Button>
-
-        <Button  HorizontalOptions="End" Grid.Row="2" Grid.Column="1" Text="Skip / End Turn" WidthRequest="200" HeightRequest="10" FontSize="20" Margin="20" Clicked="OnButtonSkipClicked"></Button>
-        <Button  HorizontalOptions="Start" Grid.Row="2" Grid.Column="1" Text="Settings" WidthRequest="200" HeightRequest="10" FontSize="20" Margin="20" ></Button>
+        <Button  
+            HorizontalOptions="Start"
+            Grid.Row="0" Grid.Column="1"
+            Text="Swap"
+            Clicked="OnButtonSwapClicked"
+            Style="{StaticResource GameButton}"/>
+
+        <Button
+            HorizontalOptions="End"
+            Grid.Row="2" Grid.Column="1"
+            Text="Skip / End Turn" WidthRequest="200"
+            Clicked="OnButtonSkipClicked"
+            Style="{StaticResource GameButton}"/>
+        
+        <Button  
+            HorizontalOptions="Start" 
+            Grid.Row="2" Grid.Column="1"
+            Text="Settings"
+            Style="{StaticResource GameButton}"/>
 
         <CollectionView Grid.Row="0" Grid.Column="1" ItemsSource="{Binding PlayerList[0].Tiles}"
                         HorizontalOptions="Center"
@@ -128,7 +143,8 @@
         <ScrollView Grid.Row="1" Grid.Column="1" VerticalOptions="FillAndExpand">
             <CollectionView ItemsSource="{Binding Board.ReadCells}"
                             HorizontalOptions="Center"
-                            VerticalOptions="Center" HorizontalScrollBarVisibility="Never" VerticalScrollBarVisibility="Never">
+                            VerticalOptions="Center" HorizontalScrollBarVisibility="Never" VerticalScrollBarVisibility="Never"
+                            >
 
                 <CollectionView.HeightRequest>
 
@@ -174,7 +190,7 @@
             </CollectionView>
         </ScrollView>
 
-        <controls:Scoreboard HorizontalOptions="End" Grid.Row="1" Grid.Column="1" ></controls:Scoreboard>
+        <controls:Scoreboard InputTransparent="True" HorizontalOptions="End" Grid.Row="1" Grid.Column="1" ></controls:Scoreboard>
 
 
 
diff --git a/Qwirkle/QwirkleViews/Resources/Styles/Styles.xaml b/Qwirkle/QwirkleViews/Resources/Styles/Styles.xaml
index 961f55b..d2f2823 100644
--- a/Qwirkle/QwirkleViews/Resources/Styles/Styles.xaml
+++ b/Qwirkle/QwirkleViews/Resources/Styles/Styles.xaml
@@ -81,6 +81,13 @@
         <Setter Property="VerticalOptions" Value="End"/>
     </Style>
 
+    <Style TargetType="Button" x:Key="GameButton">
+        <Setter Property="WidthRequest" Value="200" />
+        <Setter Property="HeightRequest" Value="10" />
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="Margin" Value="20"/>
+    </Style>
+
     <Style TargetType="Image" x:Key="Logo">
         <Setter Property="HeightRequest" Value="300" />
         <Setter Property="Aspect" Value="AspectFit"/>
@@ -275,7 +282,7 @@
         <Setter Property="Padding" Value="5,0" />
         <Setter Property="VerticalOptions" Value="Center" />
         <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="TextColor" Value="DarkSlateGrey" />
+        <Setter Property="TextColor" Value="Black" />
     </Style>
 
     <Style TargetType="ListView">
@@ -480,17 +487,20 @@
 
     <Style TargetType="Page" ApplyToDerivedTypes="True">
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
+        <Setter Property="Shell.BackgroundColor" Value="{StaticResource OffBlack}" />
     </Style>
 
     <Style TargetType="Shell" ApplyToDerivedTypes="True">
-        <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
-        <Setter Property="Shell.ForegroundColor" Value="Green" />
-        <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
-        <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
+        <Setter Property="Shell.Title" Value="Qwirkle Game" />
+        <Setter Property="Shell.BackgroundColor" Value="#efca85" />
+        <Setter Property="Shell.TabBarIsVisible" Value="False" />
+        <Setter Property="Shell.FlyoutBehavior" Value="Disabled" />
+
+        <Setter Property="Shell.DisabledColor" Value="DimGray" />
+        <Setter Property="Shell.UnselectedColor" Value="DimGray" />
         <Setter Property="Shell.NavBarHasShadow" Value="False" />
-        <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="Shell.NavBarIsVisible" Value="False" />
+        <Setter Property="Shell.TabBarBackgroundColor" Value="DimGray" />
         <Setter Property="Shell.TabBarForegroundColor" Value="Green" />
         <Setter Property="Shell.TabBarTitleColor" Value="CornflowerBlue" />
         <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
diff --git a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
index 65604d0..cbe3819 100644
--- a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
+++ b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
@@ -8,7 +8,6 @@
 
     <VerticalStackLayout MaximumWidthRequest="200" Background="Transparent">
 
-
         <CollectionView ItemsSource="{Binding ScoreboardList}" BindingContext="{x:Reference root}">
             <CollectionView.ItemsLayout>
                 <GridItemsLayout Orientation="Vertical"/>