From fc5d386f57d31ec8b93d9b48f0f43b63b768b9e8 Mon Sep 17 00:00:00 2001
From: jeremy-my <jeremy-my@users.noreply.github.com>
Date: Wed, 27 Mar 2024 18:01:58 +0100
Subject: [PATCH] =?UTF-8?q?delete=20CM=20page=20and=20play=20page=20/=20ad?=
 =?UTF-8?q?d=20Gameboard=20page=20/=20edit=20styles=20for=20add=20the=20ba?=
 =?UTF-8?q?ckground=20color=20in=20VerticalStackLayout=20+=20scroll=20view?=
 =?UTF-8?q?=20=E2=86=92=20edit=20of=20AppShell=20after=20edit=20of=20pages?=
 =?UTF-8?q?=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Qwirkle/Qwirkle/AppShell.xaml                  |  6 +++---
 Qwirkle/Qwirkle/Pages/CM.xaml.cs               |  9 ---------
 Qwirkle/Qwirkle/Pages/GameBoard.xaml.cs        |  9 +++++++++
 .../Qwirkle/Pages/{CM.xaml => Gameboard.xaml}  |  4 ++--
 Qwirkle/Qwirkle/Pages/Play.xaml                | 12 ------------
 Qwirkle/Qwirkle/Pages/Play.xaml.cs             |  9 ---------
 Qwirkle/Qwirkle/Pages/Settings.xaml            | 18 +++++++++++-------
 Qwirkle/Qwirkle/Qwirkle.csproj                 | 12 ++++++------
 Qwirkle/Qwirkle/Resources/Styles/Styles.xaml   |  7 +++++++
 9 files changed, 38 insertions(+), 48 deletions(-)
 delete mode 100644 Qwirkle/Qwirkle/Pages/CM.xaml.cs
 create mode 100644 Qwirkle/Qwirkle/Pages/GameBoard.xaml.cs
 rename Qwirkle/Qwirkle/Pages/{CM.xaml => Gameboard.xaml} (79%)
 delete mode 100644 Qwirkle/Qwirkle/Pages/Play.xaml
 delete mode 100644 Qwirkle/Qwirkle/Pages/Play.xaml.cs

diff --git a/Qwirkle/Qwirkle/AppShell.xaml b/Qwirkle/Qwirkle/AppShell.xaml
index 2021db8..7c8d6e5 100644
--- a/Qwirkle/Qwirkle/AppShell.xaml
+++ b/Qwirkle/Qwirkle/AppShell.xaml
@@ -13,9 +13,9 @@
             ContentTemplate="{DataTemplate local:MainPage}"
             Route="MainPage" />
         <ShellContent
-            Title="Play"
-            ContentTemplate="{DataTemplate localPages:Play}"
-            Route="MainPage" />
+            Title="Gameboard"
+            ContentTemplate="{DataTemplate localPages:Gameboard}"
+            Route="Gameboard" />
         <ShellContent
             Title="Leaderboard"
             ContentTemplate="{DataTemplate localPages:Leaderboard}"
diff --git a/Qwirkle/Qwirkle/Pages/CM.xaml.cs b/Qwirkle/Qwirkle/Pages/CM.xaml.cs
deleted file mode 100644
index c791909..0000000
--- a/Qwirkle/Qwirkle/Pages/CM.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Qwirkle.Pages;
-
-public partial class NewPage1 : ContentPage
-{
-	public NewPage1()
-	{
-		InitializeComponent();
-	}
-}
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Pages/GameBoard.xaml.cs b/Qwirkle/Qwirkle/Pages/GameBoard.xaml.cs
new file mode 100644
index 0000000..79df361
--- /dev/null
+++ b/Qwirkle/Qwirkle/Pages/GameBoard.xaml.cs
@@ -0,0 +1,9 @@
+namespace Qwirkle.Pages;
+
+public partial class Gameboard : ContentPage
+{
+	public Gameboard()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Pages/CM.xaml b/Qwirkle/Qwirkle/Pages/Gameboard.xaml
similarity index 79%
rename from Qwirkle/Qwirkle/Pages/CM.xaml
rename to Qwirkle/Qwirkle/Pages/Gameboard.xaml
index 37cb3e4..263cde3 100644
--- a/Qwirkle/Qwirkle/Pages/CM.xaml
+++ b/Qwirkle/Qwirkle/Pages/Gameboard.xaml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Qwirkle.Pages.NewPage1"
-             Title="NewPage1">
+             x:Class="Qwirkle.Pages.Gameboard"
+             Title="Gameboard">
     <VerticalStackLayout>
         <Label 
             Text="Welcome to .NET MAUI!"
diff --git a/Qwirkle/Qwirkle/Pages/Play.xaml b/Qwirkle/Qwirkle/Pages/Play.xaml
deleted file mode 100644
index 3b5c95c..0000000
--- a/Qwirkle/Qwirkle/Pages/Play.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Qwirkle.Pages.Play"
-             Title="Play">
-    <VerticalStackLayout>
-        <Label 
-            Text="Play"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Pages/Play.xaml.cs b/Qwirkle/Qwirkle/Pages/Play.xaml.cs
deleted file mode 100644
index 02072cf..0000000
--- a/Qwirkle/Qwirkle/Pages/Play.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Qwirkle.Pages;
-
-public partial class Play : ContentPage
-{
-	public Play()
-	{
-		InitializeComponent();
-	}
-}
\ No newline at end of file
diff --git a/Qwirkle/Qwirkle/Pages/Settings.xaml b/Qwirkle/Qwirkle/Pages/Settings.xaml
index 7f5b513..96d9092 100644
--- a/Qwirkle/Qwirkle/Pages/Settings.xaml
+++ b/Qwirkle/Qwirkle/Pages/Settings.xaml
@@ -22,14 +22,18 @@
 
         <Grid RowDefinitions="Auto,Auto" ColumnDefinitions="0.5*,0.5*">
                             
-            <Switch Grid.Column="1" HorizontalOptions="End" ThumbColor="AliceBlue"/>
+            <Switch
+                Grid.Column="1"
+                HorizontalOptions="End"
+                ThumbColor="AliceBlue"/>
                             
-            <Slider Grid.Row="1"
-            Grid.ColumnSpan="2"
-            Margin="10"
-            Minimum="0"
-            Maximum="10"
-            Value="3" />
+            <Slider 
+                Grid.Row="1"
+                Grid.ColumnSpan="2"
+                Margin="10"
+                Minimum="0"
+                Maximum="10"
+                Value="3" />
                             
         </Grid>
 
diff --git a/Qwirkle/Qwirkle/Qwirkle.csproj b/Qwirkle/Qwirkle/Qwirkle.csproj
index f68dec0..f4d4760 100644
--- a/Qwirkle/Qwirkle/Qwirkle.csproj
+++ b/Qwirkle/Qwirkle/Qwirkle.csproj
@@ -66,28 +66,28 @@
 	  <Compile Update="Pages\Leaderboard.xaml.cs">
 	    <DependentUpon>Leaderboard.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Pages\GameBoard.xaml.cs">
+	    <DependentUpon>Gameboard.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Pages\Scoreboard.xaml.cs">
 	    <DependentUpon>Scoreboard.xaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="Pages\Settings.xaml.cs">
 	    <DependentUpon>Settings.xaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="Pages\Play.xaml.cs">
-	    <DependentUpon>Play.xaml</DependentUpon>
-	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
 	  <MauiXaml Update="Pages\Leaderboard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Scoreboard.xaml">
+	  <MauiXaml Update="Pages\Gameboard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Settings.xaml">
+	  <MauiXaml Update="Pages\Scoreboard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Play.xaml">
+	  <MauiXaml Update="Pages\Settings.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	</ItemGroup>
diff --git a/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml b/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
index ea9aaed..c4f9779 100644
--- a/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
+++ b/Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
@@ -415,4 +415,11 @@
         <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
 
+    <Style TargetType="VerticalStackLayout">
+        <Setter Property="BackgroundColor" Value="#efca85"/>
+    </Style>
+
+    <Style TargetType="ScrollView" >
+        <Setter Property="BackgroundColor" Value="#efca85"/>
+    </Style>
 </ResourceDictionary>