From ad3ff7259cb182408722dbdc107209a39ae90fc7 Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Sat, 29 Apr 2023 15:25:36 +0200
Subject: [PATCH 1/5] Version final de la page de connection et page de choix
 de compte

---
 .../Banquale/Views/ConnectionPage.xaml        | 72 +++++++++++++++++++
 .../Banquale/Views/SwitchAccountPage.xaml     | 51 ++++++++++++-
 .../Banquale/Views/SwitchAccountView.xaml     |  2 +-
 3 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml b/src/Banquale/Banquale/Views/ConnectionPage.xaml
index cdbf8dd..f0339b8 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml
@@ -41,4 +41,76 @@
             FontSize="Large"/>
 
     </StackLayout>
+
+
+        <!-- Version avec Grid (moins efficace quand on écrit dans les Entry-->
+    
+    <!--<Grid RowDefinitions="5*, 2*, *, 2*, 2*, 2*, 2*">
+        --><!--<Grid.RowDefinitions>
+            <RowDefinition Height="5*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>--><!--
+
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="9*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            
+            <Frame Grid.Column="1" BackgroundColor="#C8C8C8" CornerRadius="20">
+                <Entry Placeholder="Identifiant"
+                   PlaceholderColor="#6E6E6E"
+                   TextColor="#212121"
+                   MaxLength="20"
+                   VerticalTextAlignment="Center"
+                   HorizontalTextAlignment="Center"
+                   FontSize="Large"/>
+            </Frame>
+        </Grid>
+
+        <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="9*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Frame Grid.Column="1" BackgroundColor="#C8C8C8" CornerRadius="20">
+                <Entry Placeholder="Mot de passe"
+                   PlaceholderColor="#6E6E6E"
+                   TextColor="#212121"
+                   IsPassword="True"
+                   MinimumWidthRequest="275"
+                   MaxLength="20"
+                   VerticalTextAlignment="Center"
+                   HorizontalTextAlignment="Center"
+                   FontSize="Large"/>
+            </Frame>
+        </Grid>
+
+        <Grid Grid.Row="5">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="20*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button Grid.Column="1" Text="Se connecter"
+                BorderWidth="2"
+                BorderColor="Black"
+                HorizontalOptions="Fill"
+                BackgroundColor="Gray"
+                TextColor="Black"
+                FontSize="Large"/>
+        </Grid>
+
+    </Grid>-->
+
+    
+        
+        
 </ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
index 27b3429..7932c86 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
@@ -7,7 +7,10 @@
              BackgroundColor="White">
 	
 
-	<StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                    
+                <!-- Version StackLayout, moins efficace pour la responsivity -->
+    
+	<!--<StackLayout VerticalOptions="Center" HorizontalOptions="Center">
 
         <local:SwitchAccountView/>
 
@@ -25,5 +28,49 @@
                 Margin="10,65,0,0"
                 FontSize="Large"/>
 
-    </StackLayout>
+    </StackLayout>-->
+
+    
+    
+    
+    <Grid RowDefinitions="3*, 2*, *, 2*, *, 2*, 3*">
+        
+
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="15*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <local:SwitchAccountView Grid.Column="1"/>
+        </Grid>
+
+        <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="15*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <local:SwitchAccountView Grid.Column="1"/>
+        </Grid>
+
+        <Grid Grid.Row="5">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="15*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button Grid.Column="1" Text="Déconnexion"
+                BorderWidth="2"
+                BorderColor="Black"
+                HorizontalOptions="Fill"
+                BackgroundColor="Gray"
+                TextColor="Black"
+                MinimumHeightRequest="75"
+                MinimumWidthRequest="375"
+                FontSize="Large"/>
+        </Grid>
+
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/SwitchAccountView.xaml b/src/Banquale/Banquale/Views/SwitchAccountView.xaml
index c03fb6f..ad87a42 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountView.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountView.xaml
@@ -12,11 +12,11 @@
             <Setter Property="MinimumHeightRequest" Value="75" />
             <Setter Property="HorizontalOptions" Value="Fill" />
             <Setter Property="VerticalOptions" Value="Center"/>
-            <Setter Property="Margin" Value="15,50,15,0" />
             <Setter Property="LineBreakMode" Value="WordWrap" />
         </Style>
     </ContentView.Resources>
 
     <Button Text=" Compte Personnel &#x0a; Mme Tatouille "/>
+    <!-- &#x0a; sert à faire un retour à la ligne--> 
 
 </ContentView>

From 78149ac2622da18af9cced04955c4885fad3b0bc Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Sat, 29 Apr 2023 15:37:30 +0200
Subject: [PATCH 2/5] =?UTF-8?q?ajout=20page=20de=20cat=C3=A9gorie=20et=20v?=
 =?UTF-8?q?iew=20pour=20les=20cat=C3=A9gories?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Banquale/Banquale/Views/CategoryPage.xaml | 15 ++++++++++++
 .../Banquale/Views/CategoryPage.xaml.cs       |  9 +++++++
 src/Banquale/Banquale/Views/CategoryView.xaml | 24 +++++++++++++++++++
 .../Banquale/Views/CategoryView.xaml.cs       |  9 +++++++
 4 files changed, 57 insertions(+)
 create mode 100644 src/Banquale/Banquale/Views/CategoryPage.xaml
 create mode 100644 src/Banquale/Banquale/Views/CategoryPage.xaml.cs
 create mode 100644 src/Banquale/Banquale/Views/CategoryView.xaml
 create mode 100644 src/Banquale/Banquale/Views/CategoryView.xaml.cs

diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml b/src/Banquale/Banquale/Views/CategoryPage.xaml
new file mode 100644
index 0000000..857463d
--- /dev/null
+++ b/src/Banquale/Banquale/Views/CategoryPage.xaml
@@ -0,0 +1,15 @@
+<?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="Banquale.Views.CategoryPage"
+             xmlns:local="clr-namespace:Banquale.Views"
+             Title="CategoryPage">
+    <Grid>
+        <local:CategoryView/>
+        <local:CategoryView/>
+        <local:CategoryView/>
+        <local:CategoryView/>
+        <local:CategoryView/>
+        <local:CategoryView/>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml.cs b/src/Banquale/Banquale/Views/CategoryPage.xaml.cs
new file mode 100644
index 0000000..268f7b5
--- /dev/null
+++ b/src/Banquale/Banquale/Views/CategoryPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace Banquale.Views;
+
+public partial class CategoryPage : ContentPage
+{
+	public CategoryPage()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml b/src/Banquale/Banquale/Views/CategoryView.xaml
new file mode 100644
index 0000000..95a93ad
--- /dev/null
+++ b/src/Banquale/Banquale/Views/CategoryView.xaml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Banquale.Views.CategoryView">
+    
+    <VerticalStackLayout>
+        <BoxView BackgroundColor="Black"
+                 HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"
+                 Margin="20, 0, 20, 0"/>
+
+        <Grid Margin="20, 5, 20, 5"
+            HorizontalOptions="Fill">
+
+            <Label
+                Text="catégorie"
+                HorizontalOptions="Center"
+                Margin="10, 0, 0, 0"/>
+        </Grid>
+
+
+
+    </VerticalStackLayout>
+</ContentView>
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml.cs b/src/Banquale/Banquale/Views/CategoryView.xaml.cs
new file mode 100644
index 0000000..35349b7
--- /dev/null
+++ b/src/Banquale/Banquale/Views/CategoryView.xaml.cs
@@ -0,0 +1,9 @@
+namespace Banquale.Views;
+
+public partial class CategoryView : ContentView
+{
+	public CategoryView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file

From 8d1bda7614448358fae8ab25e4d2a2aac7823296 Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Sat, 29 Apr 2023 16:42:34 +0200
Subject: [PATCH 3/5] Ajout du prg

---
 src/Banquale/Banquale/Banquale.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index 2a871d6..6d975ac 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -61,6 +61,12 @@
 	  <MauiXaml Remove="Resources\Images\Images.xaml" />
 	</ItemGroup>
 	<ItemGroup>
+	  <MauiXaml Update="Views\CategoryPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\CategoryView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\ConnectionPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From b748932f4779b4bcec02f9a3b50241dfb218925e Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Wed, 3 May 2023 10:11:53 +0200
Subject: [PATCH 4/5] =?UTF-8?q?Am=C3=A9lioration=20categ-page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Banquale/Banquale/AppShell.xaml           |  6 ++++
 src/Banquale/Banquale/Views/CategoryPage.xaml | 30 ++++++++++++++-----
 src/Banquale/Banquale/Views/CategoryView.xaml | 13 ++++----
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 3e6e544..3a25dad 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -24,6 +24,12 @@
             Title="Connection"
             ContentTemplate="{DataTemplate view:ConnectionPage}"
             Route="Views" />
+
+        <ShellContent
+            Title="Category"
+            ContentTemplate="{DataTemplate view:CategoryPage}"
+            Route="Views" />
+
     </TabBar>
 
 </Shell>
diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml b/src/Banquale/Banquale/Views/CategoryPage.xaml
index 857463d..6f54d5d 100644
--- a/src/Banquale/Banquale/Views/CategoryPage.xaml
+++ b/src/Banquale/Banquale/Views/CategoryPage.xaml
@@ -3,13 +3,27 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.CategoryPage"
              xmlns:local="clr-namespace:Banquale.Views"
-             Title="CategoryPage">
-    <Grid>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
+             Title="CategoryPage"
+             BackgroundColor="White">
+    
+    
+    <Grid RowDefinitions="*,2*,*,*,*,*,*,*,*,*,*,*,2*">
+        
+        
+        <ImageButton Source="back_arrow_icon.svg" Grid.Row="0" HorizontalOptions="Start"/>
+
+        <local:CategoryView Grid.Row="2"/>
+        <local:CategoryView Grid.Row="3"/>
+        <local:CategoryView Grid.Row="4"/>
+        <local:CategoryView Grid.Row="5"/>
+        <local:CategoryView Grid.Row="6"/>
+        <local:CategoryView Grid.Row="7"/>
+        <local:CategoryView Grid.Row="8"/>
+        <local:CategoryView Grid.Row="9"/>
+        <local:CategoryView Grid.Row="10"/>
+        <local:CategoryView Grid.Row="11"/>
+        <BoxView HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3" Grid.Row="12"/>
+        
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml b/src/Banquale/Banquale/Views/CategoryView.xaml
index 95a93ad..4f70d72 100644
--- a/src/Banquale/Banquale/Views/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/CategoryView.xaml
@@ -4,21 +4,18 @@
              x:Class="Banquale.Views.CategoryView">
     
     <VerticalStackLayout>
-        <BoxView BackgroundColor="Black"
-                 HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3"
-                 Margin="20, 0, 20, 0"/>
+        <BoxView HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"/>
 
         <Grid Margin="20, 5, 20, 5"
             HorizontalOptions="Fill">
 
             <Label
-                Text="catégorie"
+                Text="Catégorie"
+                TextColor="Black"
                 HorizontalOptions="Center"
-                Margin="10, 0, 0, 0"/>
+                VerticalOptions="Center"/>
         </Grid>
 
-
-
     </VerticalStackLayout>
 </ContentView>

From baa981e7ed8b3a749c32173e5c82369d2a0c436d Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Fri, 5 May 2023 16:47:39 +0200
Subject: [PATCH 5/5] Final version categ-page

---
 src/Banquale/Banquale/Views/CategoryPage.xaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml b/src/Banquale/Banquale/Views/CategoryPage.xaml
index 6f54d5d..2196407 100644
--- a/src/Banquale/Banquale/Views/CategoryPage.xaml
+++ b/src/Banquale/Banquale/Views/CategoryPage.xaml
@@ -7,7 +7,7 @@
              BackgroundColor="White">
     
     
-    <Grid RowDefinitions="*,2*,*,*,*,*,*,*,*,*,*,*,2*">
+    <Grid RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*,2*">
         
         
         <ImageButton Source="back_arrow_icon.svg" Grid.Row="0" HorizontalOptions="Start"/>
@@ -22,8 +22,11 @@
         <local:CategoryView Grid.Row="9"/>
         <local:CategoryView Grid.Row="10"/>
         <local:CategoryView Grid.Row="11"/>
-        <BoxView HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3" Grid.Row="12"/>
+
+        <VerticalStackLayout Grid.Row="12">
+            <BoxView HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"/>
+        </VerticalStackLayout>
         
     </Grid>
 </ContentPage>
\ No newline at end of file