From c6c03bae96ac3d19d86e844ea9ca7c3801423831 Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Mon, 3 Apr 2023 11:30:51 +0200
Subject: [PATCH] Add DarkTheme and loginPage

---
 MangaMap/App.xaml                          |  1 +
 MangaMap/AppShell.xaml                     | 26 ++++++++++-------
 MangaMap/MangaMap.csproj                   | 10 +++++--
 MangaMap/Resources/Theme/DarkTheme.xaml    | 12 ++++++++
 MangaMap/Resources/Theme/DarkTheme.xaml.cs |  9 ++++++
 MangaMap/Views/loginPage.xaml              | 19 ++++++------
 MangaMap/Views/loginPage.xaml.cs           |  2 +-
 MangaMap/Views/signUpPage.xaml             | 34 ++++++++++++++++++++++
 MangaMap/Views/signUpPage.xaml.cs          | 14 +++++++++
 9 files changed, 103 insertions(+), 24 deletions(-)
 create mode 100644 MangaMap/Resources/Theme/DarkTheme.xaml
 create mode 100644 MangaMap/Resources/Theme/DarkTheme.xaml.cs
 create mode 100644 MangaMap/Views/signUpPage.xaml
 create mode 100644 MangaMap/Views/signUpPage.xaml.cs

diff --git a/MangaMap/App.xaml b/MangaMap/App.xaml
index 449386f..383c08d 100644
--- a/MangaMap/App.xaml
+++ b/MangaMap/App.xaml
@@ -8,6 +8,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+                <ResourceDictionary Source="Resources/Theme/DarkTheme.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/MangaMap/AppShell.xaml b/MangaMap/AppShell.xaml
index 9320469..e879090 100644
--- a/MangaMap/AppShell.xaml
+++ b/MangaMap/AppShell.xaml
@@ -1,20 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="MangaMap.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MangaMap"
-    xmlns:Views="clr-namespace:MangaMap.Views">
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<Shell
+    x:Class="MangaMap.AppShell"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:MangaMap"
+    xmlns:Views="clr-namespace:MangaMap.Views">
+
     <TabBar>
         <Tab Title="HomePage">
             <ShellContent 
                           ContentTemplate="{DataTemplate Views:homePage}" />
         </Tab>
+        <Tab Title="signUpPage">
+            <ShellContent 
+                          ContentTemplate="{DataTemplate Views:signUpPage}" />
+        </Tab>
         <Tab Title="loginPage">
             <ShellContent 
                           ContentTemplate="{DataTemplate Views:loginPage}" />
         </Tab>
-    </TabBar>
-
-</Shell>
+    </TabBar>
+
+</Shell>
diff --git a/MangaMap/MangaMap.csproj b/MangaMap/MangaMap.csproj
index 732c162..bae8805 100644
--- a/MangaMap/MangaMap.csproj
+++ b/MangaMap/MangaMap.csproj
@@ -53,18 +53,24 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Compile Update="Views\loginPage.xaml.cs">
-	    <DependentUpon>loginPage.xaml</DependentUpon>
+	  <Compile Update="Views\signUpPage.xaml.cs">
+	    <DependentUpon>signUpPage.xaml</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="Resources\Theme\DarkTheme.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\homePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Views\loginPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\signUpPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/MangaMap/Resources/Theme/DarkTheme.xaml b/MangaMap/Resources/Theme/DarkTheme.xaml
new file mode 100644
index 0000000..c957a55
--- /dev/null
+++ b/MangaMap/Resources/Theme/DarkTheme.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="MangaMap.Resources.Theme.DarkTheme">
+
+    <ResourceDictionary>
+        <Color x:Key="TextColor">#FFFFFF</Color>
+        <Color x:Key="EntryPlaceholderColor">#C7C7CC</Color>
+        <Color x:Key="ButtonColor">#9370DB</Color>
+    </ResourceDictionary>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/MangaMap/Resources/Theme/DarkTheme.xaml.cs b/MangaMap/Resources/Theme/DarkTheme.xaml.cs
new file mode 100644
index 0000000..478b2ca
--- /dev/null
+++ b/MangaMap/Resources/Theme/DarkTheme.xaml.cs
@@ -0,0 +1,9 @@
+namespace MangaMap.Resources.Theme;
+
+public partial class DarkTheme : ResourceDictionary
+{
+	public DarkTheme()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/MangaMap/Views/loginPage.xaml b/MangaMap/Views/loginPage.xaml
index 340ab4d..9e259ba 100644
--- a/MangaMap/Views/loginPage.xaml
+++ b/MangaMap/Views/loginPage.xaml
@@ -5,22 +5,21 @@
              Title="loginPage">
 
 
-    <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+    <StackLayout VerticalOptions="Center" HorizontalOptions="Center" BackgroundColor="{StaticResource BackgroundColor}">
 
-        <Label Text="S'inscrire a MapManga" FontSize="Large" Margin="0,0,0,20"/>
+        <Label Text="Se connecter a MapManga" FontSize="Large" Margin="0,0,0,20" TextColor="{StaticResource TextColor}" />
 
-        <Entry Placeholder="Email" Margin="0,0,0,10" />
+        <Entry Placeholder="Email" Margin="0,0,0,10" TextColor="{StaticResource TextColor}" PlaceholderColor="{StaticResource PlaceholderColor}" />
 
-        <Entry Placeholder="Nom d'utilisateur" Margin="0,0,0,10" />
+        <Entry Placeholder="Mot de passe" IsPassword="True" Margin="0,0,0,20" TextColor="{StaticResource TextColor}" PlaceholderColor="{StaticResource PlaceholderColor}" />
 
-        <Entry Placeholder="Mot de passe" IsPassword="True" Margin="0,0,0,10" />
+        <Button Text="Se connecter" Clicked="OnLoginClicked" BackgroundColor="{StaticResource ButtonBackgroundColor}" TextColor="{StaticResource ButtonTextColor}" />
 
-        <Entry Placeholder="Confirmer le mot de passe" IsPassword="True" Margin="0,0,0,20" />
-
-        <Button Text="S'inscire" Clicked="OnLoginClicked" BackgroundColor="MediumPurple"/>
+        <StackLayout VerticalOptions="End" HorizontalOptions="Center" Orientation="Horizontal">
+            <Label Text="Pas de compte ? " TextColor="{StaticResource TextColor}" />
+            <Label Text="S'inscrire" TextColor="{StaticResource ButtonBackgroundColor}" />
+        </StackLayout>
 
     </StackLayout>
 
-
-
 </ContentPage>
\ No newline at end of file
diff --git a/MangaMap/Views/loginPage.xaml.cs b/MangaMap/Views/loginPage.xaml.cs
index 37de7d4..17b4576 100644
--- a/MangaMap/Views/loginPage.xaml.cs
+++ b/MangaMap/Views/loginPage.xaml.cs
@@ -4,7 +4,7 @@ public partial class loginPage : ContentPage
 {
 	public loginPage()
 	{
-        InitializeComponent();
+		InitializeComponent();
 	}
 
     private void OnLoginClicked(object sender, EventArgs e)
diff --git a/MangaMap/Views/signUpPage.xaml b/MangaMap/Views/signUpPage.xaml
new file mode 100644
index 0000000..d6680a4
--- /dev/null
+++ b/MangaMap/Views/signUpPage.xaml
@@ -0,0 +1,34 @@
+<?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="MangaMap.Views.signUpPage"
+             Title="loginPage"
+             Background="#1E1E1E">
+
+
+
+    <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+
+        <Label Text="S'inscrire a MapManga" FontSize="Large" Margin="0,0,0,20"/>
+
+        <Entry Placeholder="Email" Margin="0,0,0,10" />
+
+        <Entry Placeholder="Nom d'utilisateur" Margin="0,0,0,10" />
+
+        <Entry Placeholder="Mot de passe" IsPassword="True" Margin="0,0,0,10" />
+
+        <Entry Placeholder="Confirmer le mot de passe" IsPassword="True" Margin="0,0,0,20" />
+
+        <Button Text="S'inscire" Clicked="OnLoginClicked" BackgroundColor="MediumPurple"/>
+
+        <StackLayout Orientation="Horizontal" HorizontalOptions="Center">
+            <Label Text="Pas de compte ? " />
+            <Label Text="S'inscrire" TextColor="MediumPurple">
+            </Label>
+        </StackLayout>
+        
+    </StackLayout>
+
+
+
+</ContentPage>
\ No newline at end of file
diff --git a/MangaMap/Views/signUpPage.xaml.cs b/MangaMap/Views/signUpPage.xaml.cs
new file mode 100644
index 0000000..3f40078
--- /dev/null
+++ b/MangaMap/Views/signUpPage.xaml.cs
@@ -0,0 +1,14 @@
+namespace MangaMap.Views;
+
+public partial class signUpPage : ContentPage
+{
+	public signUpPage()
+	{
+        InitializeComponent();
+	}
+
+    private void OnLoginClicked(object sender, EventArgs e)
+    {
+        //
+    }
+}
\ No newline at end of file