From 5dfd426c3e8dd956b2ae111b2b4dc30e067f3728 Mon Sep 17 00:00:00 2001
From: HMatheo <hersan.matheo@gmail.com>
Date: Sat, 20 May 2023 13:44:17 +0200
Subject: [PATCH 1/3] Fixed data overwriting problem.

---
 MangaMap/App.xaml.cs          |  2 +-
 MangaMap/Stub/DataContract.cs | 30 +++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/MangaMap/App.xaml.cs b/MangaMap/App.xaml.cs
index f247bfb..f852825 100644
--- a/MangaMap/App.xaml.cs
+++ b/MangaMap/App.xaml.cs
@@ -18,7 +18,7 @@ public partial class App : Application
 		MyManager.Admins.Add(MyAdmin);
 
 		MainPage = new AppShell();
-        MyManager.Persistance = new DataContract();
+        //MyManager.Persistance = new DataContract();
 
         MyManager.sauvegarder();
     }
diff --git a/MangaMap/Stub/DataContract.cs b/MangaMap/Stub/DataContract.cs
index f2d0f3e..837c007 100644
--- a/MangaMap/Stub/DataContract.cs
+++ b/MangaMap/Stub/DataContract.cs
@@ -39,8 +39,8 @@ namespace MangaMap.Stub
         public void sauvegarder(List<Oeuvre> o, List<Utilisateur> u)
         {
             var serializer = new DataContractSerializer(typeof(DataToPersist));
-
             DataToPersist data;
+
             if (File.Exists(Path.Combine(FilePath, FileName)))
             {
                 using (Stream s = File.OpenRead(Path.Combine(FilePath, FileName)))
@@ -53,19 +53,22 @@ namespace MangaMap.Stub
                 data = new DataToPersist();
             }
 
-            // Vérifier si un utilisateur avec le même nom d'utilisateur existe déjà
-            var existingUser = data.Utilisateurs.FirstOrDefault(user => user.Pseudo == u.Last().Pseudo);
-            if (existingUser != null)
-            {
-                // Mettre à jour l'utilisateur existant
-                existingUser.MotDePasse = u.Last().MotDePasse;
-                existingUser.Email = u.Last().Email;
-
-            }
-            else
+            // Parcourir les nouveaux utilisateurs
+            foreach (var newUser in u)
             {
-                // Ajouter le nouvel utilisateur à la liste existante
-                data.Utilisateurs.Add(u.Last());
+                // Vérifier si un utilisateur avec le même nom d'utilisateur existe déjà
+                var existingUser = data.Utilisateurs.FirstOrDefault(user => user.Pseudo == newUser.Pseudo);
+                if (existingUser != null)
+                {
+                    // Mettre à jour les informations de l'utilisateur existant
+                    existingUser.MotDePasse = newUser.MotDePasse;
+                    existingUser.Email = newUser.Email;
+                }
+                else
+                {
+                    // Ajouter le nouvel utilisateur à la liste existante
+                    data.Utilisateurs.Add(newUser);
+                }
             }
 
             var settings = new XmlWriterSettings() { Indent = true };
@@ -77,6 +80,7 @@ namespace MangaMap.Stub
                 }
             }
         }
+
     }
 
 }
\ No newline at end of file

From eb705a874f0e45b9a31f2893663244f700d231ff Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Wed, 31 May 2023 15:59:15 +0200
Subject: [PATCH 2/3] Added logos and navigation

---
 MangaMap/AppShell.xaml                   |   2 +-
 MangaMap/CustomHeader.xaml               |  19 ++++++++++---------
 MangaMap/Resources/Images/listbutton.png | Bin 0 -> 494 bytes
 3 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 MangaMap/Resources/Images/listbutton.png

diff --git a/MangaMap/AppShell.xaml b/MangaMap/AppShell.xaml
index 127b9d3..b79ea35 100644
--- a/MangaMap/AppShell.xaml
+++ b/MangaMap/AppShell.xaml
@@ -7,7 +7,7 @@
     xmlns:Views="clr-namespace:MangaMap.Views"
     Shell.FlyoutBehavior="Disabled"
     Shell.NavBarIsVisible="False"
-    Shell.TabBarIsVisible="True">
+    Shell.TabBarIsVisible="False">
 
     <TabBar Route="page">
 
diff --git a/MangaMap/CustomHeader.xaml b/MangaMap/CustomHeader.xaml
index 46f2ea5..d1eb227 100644
--- a/MangaMap/CustomHeader.xaml
+++ b/MangaMap/CustomHeader.xaml
@@ -3,26 +3,26 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="MangaMap.NewContent1"
              Background="{StaticResource Primary}">
-    <Grid ColumnDefinitions="50, *,80,40, 40">
+    <Grid ColumnDefinitions="50, *,100,40, 40">
         <ImageButton Source="logo.png"
                      MaximumHeightRequest="30"
                      MaximumWidthRequest="30"
                      VerticalOptions="Center"
                      Clicked="ImageButton_Clicked"/>
 
-        <Button Grid.Column="2"
-                MaximumHeightRequest="210"
-                MaximumWidthRequest="100"
-                VerticalOptions="Center"
-                BackgroundColor="{StaticResource Secondary}"
-                Text="Ma Liste"
-                TextColor="White"
-                Clicked="ListButton_Clicked" />
+        <ImageButton Grid.Column="2"
+                     Source="listbutton.png"
+                     MaximumWidthRequest="30"
+                     MaximumHeightRequest="30"
+                     BackgroundColor="{StaticResource Primary}"
+                     VerticalOptions="Center"
+                     Clicked="ListButton_Clicked" />
 
         <ImageButton Grid.Column="3"
                      Source="account_circle.png"
                      MaximumHeightRequest="30"
                      MaximumWidthRequest="30"
+                     BackgroundColor="{StaticResource Primary}"
                      VerticalOptions="Center"
                      Clicked="AccountButton_Clicked"/>
 
@@ -30,6 +30,7 @@
                      Source="settings.png"
                      MaximumHeightRequest="30"
                      MaximumWidthRequest="30"
+                     BackgroundColor="{StaticResource Primary}"
                      VerticalOptions="Center"
                      Clicked="SettingButton_Clicked"/>
     </Grid>
diff --git a/MangaMap/Resources/Images/listbutton.png b/MangaMap/Resources/Images/listbutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b5b5b7b8c7f45f1b5af009963202b78f802cfb2
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005CNkl<ZXhZFo
z;Y|ZE429bbU;~(dvO(DZCZKFkCZJ3JOh7k)4d@2I1l$OW!26`0RHeD3M{zGfw&Xui
zE_u(-7dsh`Dz|av_(x7)Xa!vXS76Tw{QDG|DnJkN6ZuMhFaOvxXn*>7N`Xu5^b*<a
zRAWtK{77TCmBsc<)&amnBDAFjZX)BT^ks!!>qdi}Qs7-5O(K9urHdK}bSc1pu;@r3
zNLv}HyJaZ_Vkto$p3A?jQ1)FncZ~8=&gEzFPx)g>;31nM&^I6lpYH??9`ayASD*$3
zI8JeTpkj{CHgKsF;t0K4AEWL3t|B&=5GewSHGvS^l?GlTh})WBMFu=umLfo7M(TtH
zcu0iC+@hMf>IrnE(5)g(OA%UeDFnc0`D_Czz#&kK?NZ3N6OiAHyr}CWQQU<<G0~0z
zaRNij;|i3nKzOC3HWX#KOFgd)n~zm=qsJvNND=7!tU|4LGbGphS*7}3h-gkD5nXDm
zil;@uhbh57Kr6lKNEOn^%9`I);+a0WmeUW>2R+GSml-S2*>$~;WkX~<!4)tLaCUiD
kAR8j%39f)~fV0d00JMWWF~^U}1^@s607*qoM6N<$g4o#8aR2}S

literal 0
HcmV?d00001


From abe37aad8700836edbd0738b99e3dd228ba6f262 Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Wed, 31 May 2023 16:33:59 +0200
Subject: [PATCH 3/3] Enhancement button

---
 MangaMap/Stub/Stub.cs        | 2 +-
 MangaMap/Views/homePage.xaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MangaMap/Stub/Stub.cs b/MangaMap/Stub/Stub.cs
index aa2c5bf..31aaff2 100644
--- a/MangaMap/Stub/Stub.cs
+++ b/MangaMap/Stub/Stub.cs
@@ -29,7 +29,7 @@ namespace MangaMap.Stub
             l1.Add(o1); l1.Add(o2);
             l2.Add(u1); l2.Add(u2); l2.Add(u3);
 
-            u1.ListeOeuvreEnVisionnage.Add(o1);
+            //u1.ListeOeuvreEnVisionnage.Add(o1);
 
             return (l1, l2);
         }
diff --git a/MangaMap/Views/homePage.xaml b/MangaMap/Views/homePage.xaml
index 25cac50..45c432c 100644
--- a/MangaMap/Views/homePage.xaml
+++ b/MangaMap/Views/homePage.xaml
@@ -44,7 +44,7 @@
                 </HorizontalStackLayout>
 
 
-                <ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}">
+                <!--<ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}">
                     
                     <ListView.ItemTemplate>
                         <DataTemplate>
@@ -53,7 +53,7 @@
                             </ViewCell>
                         </DataTemplate>
                     </ListView.ItemTemplate>
-                </ListView>
+                </ListView>-->
 
             </VerticalStackLayout>