From 06ea3ff4a06939b9787f33ef87ab6d2353a74413 Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Thu, 1 Jun 2023 17:30:39 +0200
Subject: [PATCH 1/5] Modif listPage

---
 MangaMap/Resources/Images/addepisodes.png | Bin 0 -> 265 bytes
 MangaMap/Views/listPage.xaml              |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 MangaMap/Resources/Images/addepisodes.png

diff --git a/MangaMap/Resources/Images/addepisodes.png b/MangaMap/Resources/Images/addepisodes.png
new file mode 100644
index 0000000000000000000000000000000000000000..a84e38f737695dd118cc220d8b86a4e326f41a68
GIT binary patch
literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0002cNkl<ZXhZFn
zK@Nj33<Tk2?ayd`MqgG^DF;qyT-Pc=lS_nR%zAfYnRyy~&4c5gEa2Y?s(=b48PGyW
z0@JUnzyXDicDD5MXWKu|KVOv!SOAer1-t{qCkHWFNDFD9Bm-I~NnoT4MQ52?!*=iZ
z*0#TbSkd<)1-yd*vf&6D3hGFPF91opqy2Oiidw>PnlKi*10>%*Mg<6CD&QzVeBuwy
zcP!b32yb?wD|aE{fOJfyh0@?i0t+B4RmP}5CA%cI3J{hmV^pA$U6OkPw2(M4GXgvH
P00000NkvXXu0mjf3gKhP

literal 0
HcmV?d00001

diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index 036e9c6..6ea8dd4 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -20,10 +20,10 @@
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <Grid Margin="20" Grid.Row="0" ColumnDefinitions="*,300,300">
+                        <Grid Margin="20" Grid.Row="0" ColumnDefinitions="*,400,400">
                             <Label Grid.Column="0"
                            Text="Titre" FontSize="Large" TextColor="White"
-                           HorizontalOptions="Start" VerticalOptions="Center"/>
+                           VerticalOptions="Center"/>
                             <Label Grid.Column="1"
                            Text="Score" FontSize="Large" TextColor="White"
                            HorizontalOptions="Center" VerticalOptions="Center"/>
@@ -36,11 +36,12 @@
                             <VerticalStackLayout BindableLayout.ItemsSource="{Binding UtilisateurActuel.ListeOeuvreEnVisionnage}" Spacing="10">
                                 <BindableLayout.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
+                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,700,200,40">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start" Clicked="AnimeImageClickedList"/>
                                             <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
                                             <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" />
+                                            <ImageButton Grid.Column="4" Source="addepisodes.png" BackgroundColor="#333333" HorizontalOptions="End" MaximumHeightRequest="10" MaximumWidthRequest="10"/>
                                         </Grid>
                                     </DataTemplate>
                                     

From 774bfbade126d309b3b1e13d1c622578146a3958 Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Thu, 1 Jun 2023 17:45:05 +0200
Subject: [PATCH 2/5] Modif listPage

---
 MangaMap/Views/listPage.xaml    | 28 ++++++++++++++--------------
 MangaMap/Views/listPage.xaml.cs |  5 +++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index 6ea8dd4..7397965 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -20,10 +20,10 @@
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <Grid Margin="20" Grid.Row="0" ColumnDefinitions="*,400,400">
+                        <Grid Margin="20" Grid.Row="0" ColumnDefinitions="*,400,300">
                             <Label Grid.Column="0"
                            Text="Titre" FontSize="Large" TextColor="White"
-                           VerticalOptions="Center"/>
+                           HorizontalOptions="Start" VerticalOptions="Center"/>
                             <Label Grid.Column="1"
                            Text="Score" FontSize="Large" TextColor="White"
                            HorizontalOptions="Center" VerticalOptions="Center"/>
@@ -36,12 +36,12 @@
                             <VerticalStackLayout BindableLayout.ItemsSource="{Binding UtilisateurActuel.ListeOeuvreEnVisionnage}" Spacing="10">
                                 <BindableLayout.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,700,200,40">
+                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300,40">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start" Clicked="AnimeImageClickedList"/>
                                             <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
                                             <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" />
-                                            <ImageButton Grid.Column="4" Source="addepisodes.png" BackgroundColor="#333333" HorizontalOptions="End" MaximumHeightRequest="10" MaximumWidthRequest="10"/>
+                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <ImageButton Grid.Column="4" Source="addepisodes.png" BackgroundColor="#333333" HorizontalOptions="End" MaximumHeightRequest="5" MaximumWidthRequest="5" Clicked="OnAddClicked"/>
                                         </Grid>
                                     </DataTemplate>
                                     
@@ -78,9 +78,9 @@
                                     <DataTemplate>
                                         <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start" Clicked="AnimeImageClickedList"/>
-                                            <Label Grid.Column="1" Text="{Binding Nom}" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
-                                            <Label Grid.Column="2" Text="4/5" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
+                                            <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
+                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
@@ -117,9 +117,9 @@
                                     <DataTemplate>
                                         <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start" Clicked="AnimeImageClickedList"/>
-                                            <Label Grid.Column="1" Text="{Binding Nom}" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
-                                            <Label Grid.Column="2" Text="4/5" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
+                                            <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
+                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
@@ -156,9 +156,9 @@
                                     <DataTemplate>
                                         <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start" Clicked="AnimeImageClickedList"/>
-                                            <Label Grid.Column="1" Text="{Binding Nom}" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
-                                            <Label Grid.Column="2" Text="4/5" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
+                                            <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
+                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
diff --git a/MangaMap/Views/listPage.xaml.cs b/MangaMap/Views/listPage.xaml.cs
index 9283e00..ee3bdf3 100644
--- a/MangaMap/Views/listPage.xaml.cs
+++ b/MangaMap/Views/listPage.xaml.cs
@@ -21,4 +21,9 @@ public partial class listPage : ContentPage
             await Navigation.PushAsync(new ficheAnime(selectedAnime));
         }
     }
+
+    private async void OnAddClicked(object sender, EventArgs e)
+    {
+        
+    }
 }
\ No newline at end of file

From 2d76be4ebbcb5fd6fccf1f407ce685b541aa757e Mon Sep 17 00:00:00 2001
From: HMatheo <hersan.matheo@gmail.com>
Date: Thu, 1 Jun 2023 18:52:06 +0200
Subject: [PATCH 3/5] Image picker implemented

---
 MangaMap/CustomHeader.xaml          |  3 ++-
 MangaMap/CustomHeader.xaml.cs       |  8 ++++++--
 MangaMap/Model/Oeuvre.cs            |  4 ++--
 MangaMap/Stub/Stub.cs               |  6 +++---
 MangaMap/Views/CreateOeuvre.xaml.cs | 26 +++++++++++++++++++++++++-
 MangaMap/Views/createOeuvre.xaml    |  2 ++
 MangaMap/Views/listPage.xaml        |  2 +-
 MangaMap/Views/listPage.xaml.cs     |  9 ++++++++-
 8 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/MangaMap/CustomHeader.xaml b/MangaMap/CustomHeader.xaml
index 2266bf9..6e9f252 100644
--- a/MangaMap/CustomHeader.xaml
+++ b/MangaMap/CustomHeader.xaml
@@ -17,7 +17,8 @@
                      MaximumHeightRequest="30"
                      BackgroundColor="{StaticResource Primary}"
                      VerticalOptions="Center"
-                     Clicked="ListButton_Clicked" />
+                     Clicked="ListButton_Clicked"
+                     IsVisible="{Binding IsUserLoggedIn}" />
 
         <ImageButton Grid.Column="3"
                      Source="account_circle.png"
diff --git a/MangaMap/CustomHeader.xaml.cs b/MangaMap/CustomHeader.xaml.cs
index b771b2c..ea77c51 100644
--- a/MangaMap/CustomHeader.xaml.cs
+++ b/MangaMap/CustomHeader.xaml.cs
@@ -1,13 +1,17 @@
 using MangaMap.Views;
 namespace MangaMap;
+using MangaMap.Model;
+using System.ComponentModel;
+using INotifyPropertyChanged = System.ComponentModel.INotifyPropertyChanged;
 
-public partial class NewContent1 : ContentView
+public partial class NewContent1 : ContentView, INotifyPropertyChanged
 {
+    public Manager my_manager => (App.Current as App).MyManager;
     public NewContent1()
     {
         InitializeComponent();
-    }
 
+    }
     async void ImageButton_Clicked(System.Object sender, System.EventArgs e)
     {
         //Navigation.PushAsync(new homePage());
diff --git a/MangaMap/Model/Oeuvre.cs b/MangaMap/Model/Oeuvre.cs
index 52f1016..56eec70 100644
--- a/MangaMap/Model/Oeuvre.cs
+++ b/MangaMap/Model/Oeuvre.cs
@@ -8,12 +8,12 @@ using System.Threading.Tasks;
 namespace MangaMap.Model
 {
     [DataContract]
-   public class Oeuvre
+    public class Oeuvre
     {
         [DataMember]
         public string Nom { get; private set; }
         [DataMember]
-        public List <string> Genre { get; private set; }
+        public List<string> Genre { get; private set; }
         [DataMember]
         public string Type { get; private set; }
         [DataMember]
diff --git a/MangaMap/Stub/Stub.cs b/MangaMap/Stub/Stub.cs
index 31aaff2..b0a5129 100644
--- a/MangaMap/Stub/Stub.cs
+++ b/MangaMap/Stub/Stub.cs
@@ -9,8 +9,8 @@ namespace MangaMap.Stub
 {
     public class Stub : IPersistanceManager
 
-        //Cette classe sert à faire charger un jeu de données qui n'est pas celui enregistrer dans le fichier sur l'ordinateur.
-        //Il permet de faire des transistion entre différent moyen de persister.
+    //Cette classe sert à faire charger un jeu de données qui n'est pas celui enregistrer dans le fichier sur l'ordinateur.
+    //Il permet de faire des transistion entre différent moyen de persister.
     {
         public (List<Oeuvre>, List<Utilisateur>) chargeDonne()
         {
@@ -39,4 +39,4 @@ namespace MangaMap.Stub
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/MangaMap/Views/CreateOeuvre.xaml.cs b/MangaMap/Views/CreateOeuvre.xaml.cs
index 62ad23e..ee61349 100644
--- a/MangaMap/Views/CreateOeuvre.xaml.cs
+++ b/MangaMap/Views/CreateOeuvre.xaml.cs
@@ -1,6 +1,9 @@
 using System.Text.RegularExpressions;
 using MangaMap.Model;
 using static System.Runtime.InteropServices.JavaScript.JSType;
+using System.Threading.Tasks;
+using Microsoft.Maui.Storage;
+
 
 namespace MangaMap.Views;
 
@@ -13,6 +16,27 @@ public partial class createOeuvre : ContentPage
 		InitializeComponent();
 	}
 
+    private string imagePath;
+
+    async void SelectImageClicked(object sender, EventArgs e)
+    {
+        var result = await FilePicker.PickAsync(new PickOptions
+        {
+            FileTypes = FilePickerFileType.Images,
+            PickerTitle = "Pick an image"
+        });
+
+        if (result != null)
+        {
+            var stream = await result.OpenReadAsync();
+            // Utilisez le chemin d'accès à l'image sélectionnée
+            imagePath = result.FullPath;
+
+            // Affichez l'image sélectionnée dans l'interface utilisateur, si nécessaire
+            
+        }
+    }
+
     async void AddClicked(object sender, System.EventArgs e)
     {
         // Récupérer les valeurs des entrées
@@ -43,7 +67,7 @@ public partial class createOeuvre : ContentPage
             return;
         }
 
-        Oeuvre oeuv = new Oeuvre(nom, type, description, nbEp, "logo.png");
+        Oeuvre oeuv = new Oeuvre(nom, type, description, nbEp, imagePath);
         my_manager.Oeuvres.Add(oeuv);
         my_manager.sauvegarder();
         await Navigation.PushAsync(new homePage());
diff --git a/MangaMap/Views/createOeuvre.xaml b/MangaMap/Views/createOeuvre.xaml
index 3088088..1c4bdc3 100644
--- a/MangaMap/Views/createOeuvre.xaml
+++ b/MangaMap/Views/createOeuvre.xaml
@@ -7,6 +7,8 @@
     <VerticalStackLayout>
         <Label Text="Création d'une nouvelle série" FontSize="Title" Margin="0,0,0,20" TextColor="#ffffff"/>
 
+        <Button Text="Sélectionner une image" Clicked="SelectImageClicked" Margin="0,0,0,10"/>
+
         <Entry x:Name="nameEntry" Placeholder="Nom" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
 
         <Entry x:Name="typeEntry" Placeholder="Type" Margin="0,0,0,10" Style="{StaticResource Champs}"/>
diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index 7397965..47833af 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -158,7 +158,7 @@
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start" Clicked="AnimeImageClickedList"/>
                                             <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
                                             <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="{Binding NbEpisodes}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <Label Grid.Column="2" Text="{Binding NbEpisodesVus}" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
diff --git a/MangaMap/Views/listPage.xaml.cs b/MangaMap/Views/listPage.xaml.cs
index ee3bdf3..9e3102b 100644
--- a/MangaMap/Views/listPage.xaml.cs
+++ b/MangaMap/Views/listPage.xaml.cs
@@ -24,6 +24,13 @@ public partial class listPage : ContentPage
 
     private async void OnAddClicked(object sender, EventArgs e)
     {
-        
+        var button = (ImageButton)sender;
+        var oeuvre = (Oeuvre)button.BindingContext;
+
+        // Mettez à jour le nombre d'épisodes vus
+        oeuvre.AjouterEpisode(1);
+
+        // Sauvegardez les modifications
+        my_manager.sauvegarder();
     }
 }
\ No newline at end of file

From cb9648c6c60d3b6d0a5dc3af676770c94efdc59d Mon Sep 17 00:00:00 2001
From: HMatheo <hersan.matheo@gmail.com>
Date: Thu, 1 Jun 2023 19:09:37 +0200
Subject: [PATCH 4/5] Better button

---
 MangaMap/Views/homePage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MangaMap/Views/homePage.xaml b/MangaMap/Views/homePage.xaml
index 5baf291..7a2919e 100644
--- a/MangaMap/Views/homePage.xaml
+++ b/MangaMap/Views/homePage.xaml
@@ -46,8 +46,8 @@
 
                 <ScrollView>
                     <Grid x:Name="grille">
-                        <Grid.RowDefinitions  >
-                            <RowDefinition Height="85"/>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="20"/>
                             <RowDefinition/>
                             <RowDefinition/>
                             <RowDefinition/>

From 692c34472b234b0435010ada347939fc5b0dd4e6 Mon Sep 17 00:00:00 2001
From: HMatheo <hersan.matheo@gmail.com>
Date: Thu, 1 Jun 2023 19:24:46 +0200
Subject: [PATCH 5/5] Better navigation for settingsPage

---
 MangaMap/Views/settingsPage.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MangaMap/Views/settingsPage.xaml.cs b/MangaMap/Views/settingsPage.xaml.cs
index 1a3b5b3..6b96b08 100644
--- a/MangaMap/Views/settingsPage.xaml.cs
+++ b/MangaMap/Views/settingsPage.xaml.cs
@@ -14,7 +14,7 @@ public partial class settingsPage : ContentPage
     {
         my_manager.UtilisateurActuel = new Utilisateur();
         my_manager.isAdmin = false;
-        await Shell.Current.Navigation.PushAsync(new loginPage());
+        await Shell.Current.GoToAsync("//page/secondaire/connexionPage");
     }
 
     private async void LoginAdminClicked(object sender, EventArgs e)