From 907d89733673a64f684d25dbe2fdcd9507aa4db4 Mon Sep 17 00:00:00 2001
From: Yvan CALATAYUD <yvcalatayu>
Date: Fri, 26 May 2023 09:56:37 +0200
Subject: [PATCH 1/4] Binding PageJeu + Bouton Voir

---
 GameAtlas/GameAtlas/Models/Jeu.cs                      |  6 +++---
 GameAtlas/GameAtlas/Models/Popup.cs                    | 10 ++++++----
 .../GameAtlas/Views/Composants/BoutonVoir.xaml.cs      |  9 ++++++++-
 GameAtlas/GameAtlas/Views/PageJeu.xaml                 |  6 +++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/GameAtlas/GameAtlas/Models/Jeu.cs b/GameAtlas/GameAtlas/Models/Jeu.cs
index 642b4b4..adf2403 100644
--- a/GameAtlas/GameAtlas/Models/Jeu.cs
+++ b/GameAtlas/GameAtlas/Models/Jeu.cs
@@ -15,7 +15,7 @@ namespace GameAtlas.Models
         [DataMember]
         public string Sortie { get; private set; }
         [DataMember]
-        public List<string> Plateformes { get; private set; }
+        public string Plateformes { get; private set; }
         [DataMember]
         public string Developpeur { get; private set; }
         [DataMember]
@@ -27,11 +27,11 @@ namespace GameAtlas.Models
         //[DataMember]
         //public List<(string,string)> Revendeurs { get; private set; }
         [DataMember]
-        public List<string> Genres { get; private set; }
+        public string Genres { get; private set; }
         [DataMember]
         public string Image { get; private set; }
 
-        public Jeu(string nom, string sortie, List<string> plateformes, string developpeur, string editeur, int note, int nbTelechargement, List<string> genres, string image)
+        public Jeu(string nom, string sortie, string plateformes, string developpeur, string editeur, int note, int nbTelechargement, string genres, string image)
         {
             Nom = nom;
             Sortie = sortie;
diff --git a/GameAtlas/GameAtlas/Models/Popup.cs b/GameAtlas/GameAtlas/Models/Popup.cs
index b266c84..b5f6ef7 100644
--- a/GameAtlas/GameAtlas/Models/Popup.cs
+++ b/GameAtlas/GameAtlas/Models/Popup.cs
@@ -132,21 +132,23 @@ namespace GameAtlas.Models
                 string image = imageEntry.Text;
 
                 // Séparer les plateformes par des espaces et les ajouter à une liste
-                List<string> plateformesList = plateformesText.Split(' ').ToList();
+                // List<string> plateformesList = plateformesText.Split(' ').ToList();
 
                 // Séparer les genres par des espaces et les ajouter à une liste
-                List<string> genresList = genresText.Split(' ').ToList();
+                // List<string> genresList = genresText.Split(' ').ToList();
 
                 Jeu jeu = new Jeu
                 (
                     nom,
                     sortieString,
-                    plateformesList,
+                    //plateformesList,
+                    plateformesText,
                     developpeur,
                     editeur,
                     note,
                     nbTelechargement,
-                    genresList,
+                    //genresList,
+                    genresText,
                     image
                 );
 
diff --git a/GameAtlas/GameAtlas/Views/Composants/BoutonVoir.xaml.cs b/GameAtlas/GameAtlas/Views/Composants/BoutonVoir.xaml.cs
index 6183131..32cbcb7 100644
--- a/GameAtlas/GameAtlas/Views/Composants/BoutonVoir.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/Composants/BoutonVoir.xaml.cs
@@ -1,5 +1,7 @@
 namespace GameAtlas.Views.Composants;
 
+using GameAtlas.Models;
+
 public partial class BoutonVoir : ContentView
 {
 	public BoutonVoir()
@@ -9,6 +11,11 @@ public partial class BoutonVoir : ContentView
 
     private async void OnVoirClicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync(nameof(PageJeu));
+        var selectedjeu = (sender as Button)?.BindingContext as Jeu;
+        if (selectedjeu != null)
+        {
+            //await Shell.Current.GoToAsync(nameof(PageJeu(selectedjeu));      ---- Ne marche pas ----
+            await Navigation.PushAsync(new PageJeu(selectedjeu));
+        }
     }
 }
\ No newline at end of file
diff --git a/GameAtlas/GameAtlas/Views/PageJeu.xaml b/GameAtlas/GameAtlas/Views/PageJeu.xaml
index 45a21ea..90ad570 100644
--- a/GameAtlas/GameAtlas/Views/PageJeu.xaml
+++ b/GameAtlas/GameAtlas/Views/PageJeu.xaml
@@ -37,7 +37,7 @@
 
                     <Label Text="{Binding JeuModel.Nom}" FontFamily="PTSansCBold" FontSize="14" TextColor="{StaticResource Black}"/>
 
-                    <Label Text="10 février 2023" FontFamily="RobotoRegular" FontSize="11" TextColor="{StaticResource Gray500}"/>
+                    <Label Text="{Binding JeuModel.Sortie}" FontFamily="RobotoRegular" FontSize="11" TextColor="{StaticResource Gray500}"/>
 
                     <FlexLayout Direction="Row" JustifyContent="Start" AlignItems="Start" Wrap="Wrap" >
                         <BindableLayout.ItemsSource>
@@ -71,7 +71,7 @@
                         <Label.FormattedText>
                             <FormattedString>
                                 <Span Text="Editeur:               " TextColor="{StaticResource Gray500}" />
-                                <Span Text="{Binding JeuModel.Developpeur}" TextColor="{StaticResource Black}" />
+                                <Span Text="{Binding JeuModel.Editeur}" TextColor="{StaticResource Black}" />
                             </FormattedString>
                         </Label.FormattedText>
                     </Label>
@@ -87,7 +87,7 @@
                         <Frame BorderColor="{StaticResource Black}" CornerRadius="5" Padding="15" BackgroundColor="Transparent">
                             <Grid RowDefinitions="auto,auto" ColumnDefinitions="auto,*" ColumnSpacing="15" VerticalOptions="Center">
                                 <Image Grid.RowSpan="2" Source="trophy" WidthRequest="20" VerticalOptions="Center"/>
-                                <Label Grid.Column="1" Text="4.6" FontFamily="RobotoRegular" FontSize="16" TextColor="{StaticResource Black}" VerticalOptions="Center"/>
+                                <Label Grid.Column="1" Text="{Binding JeuModel.Note}" FontFamily="RobotoRegular" FontSize="16" TextColor="{StaticResource Black}" VerticalOptions="Center"/>
                                 <Label Grid.Row="1" Grid.Column="1" Text="Note" FontFamily="RobotoRegular" FontSize="12" TextColor="{StaticResource Gray500}" VerticalOptions="Center"/>
                             </Grid>
                         </Frame>
-- 
2.36.3


From 2dc68c581bab4fb2b387c3227f006321f21dae0f Mon Sep 17 00:00:00 2001
From: "yvan.calatayud" <yvan.calatayud@etu.uca.fr>
Date: Fri, 26 May 2023 11:06:01 +0200
Subject: [PATCH 2/4] Binding PageAccueil

---
 GameAtlas/GameAtlas/Views/PageAccueil.xaml | 2 +-
 GameAtlas/GameAtlas/Views/PageJeu.xaml.cs  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/GameAtlas/GameAtlas/Views/PageAccueil.xaml b/GameAtlas/GameAtlas/Views/PageAccueil.xaml
index 73cb92f..4354984 100644
--- a/GameAtlas/GameAtlas/Views/PageAccueil.xaml
+++ b/GameAtlas/GameAtlas/Views/PageAccueil.xaml
@@ -69,7 +69,7 @@
                         <BindableLayout.ItemTemplate>
                             <DataTemplate>
                                 <Grid>
-                                    <ImageButton Source="{Binding Image}" CornerRadius="20" HeightRequest="160" WidthRequest="290"/>
+                                    <ImageButton Source="{Binding Image}" CornerRadius="15" HeightRequest="160" WidthRequest="290" Clicked="OnButtonClicked"/>
                                     <HorizontalStackLayout Margin="25,95,0,0" Spacing="5">
                                         <Image Style="{StaticResource Stars}"/>
                                         <Image Style="{StaticResource Stars}"/>
diff --git a/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs b/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
index 149e270..cc7bbb1 100644
--- a/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
@@ -25,7 +25,6 @@ public partial class PageJeu : ContentPage
 
         this.BindingContext = this;
 
-
     }
 
     async void Back_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
-- 
2.36.3


From ea5fc5249276de3401cc564691d985af2249d9e2 Mon Sep 17 00:00:00 2001
From: "remi.lavergne" <remi.lavergne@etu.uca.fr>
Date: Fri, 26 May 2023 11:10:22 +0200
Subject: [PATCH 3/4] N/A

---
 GameAtlas/GameAtlas/GameAtlas.csproj.user | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GameAtlas/GameAtlas/GameAtlas.csproj.user b/GameAtlas/GameAtlas/GameAtlas.csproj.user
index 0a945fc..ac890c6 100644
--- a/GameAtlas/GameAtlas/GameAtlas.csproj.user
+++ b/GameAtlas/GameAtlas/GameAtlas.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
     <ActiveDebugFramework>net7.0-android</ActiveDebugFramework>
-    <ActiveDebugProfile>Google Pixel 6a (Android 13.0 - API 33)</ActiveDebugProfile>
+    <ActiveDebugProfile>Xiaomi 2201117SY (Android 12.0 - API 31)</ActiveDebugProfile>
     <SelectedPlatformGroup>PhysicalDevice</SelectedPlatformGroup>
     <DefaultDevice>pixel_5_-_api_33_1</DefaultDevice>
   </PropertyGroup>
-- 
2.36.3


From ca430d2d7d47d894b903dfe83638df8fe64203f1 Mon Sep 17 00:00:00 2001
From: "remi.lavergne" <remi.lavergne@etu.uca.fr>
Date: Fri, 26 May 2023 12:00:13 +0200
Subject: [PATCH 4/4] Ajout Binding PageProfil + Popup PageJeu (Bouton Ajouter)

---
 GameAtlas/GameAtlas/Models/Utilisateur.cs    |  9 +++++---
 GameAtlas/GameAtlas/Views/PageJeu.xaml       |  3 +++
 GameAtlas/GameAtlas/Views/PageJeu.xaml.cs    |  8 +++++++
 GameAtlas/GameAtlas/Views/PageProfil.xaml    | 22 +-------------------
 GameAtlas/GameAtlas/Views/PageProfil.xaml.cs |  4 ++++
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/GameAtlas/GameAtlas/Models/Utilisateur.cs b/GameAtlas/GameAtlas/Models/Utilisateur.cs
index 18fdf91..014e1e3 100644
--- a/GameAtlas/GameAtlas/Models/Utilisateur.cs
+++ b/GameAtlas/GameAtlas/Models/Utilisateur.cs
@@ -17,15 +17,18 @@ namespace GameAtlas.Models
         public string Pseudo { get; private set; }
         [DataMember]
         public string Mdp { get; private set; }
-
-        //public List<Jeu> ListePossedes { get; private set; }
-        //public List<Jeu> ListeFavoris { get; private set; }
+        [DataMember]
+        public List<Jeu> ListePossedes { get; private set; }
+        [DataMember]
+        public List<Jeu> ListeFavoris { get; private set; }
 
         public Utilisateur(string mail, string pseudo, string mdp)
         {
             Mail = mail;
             Pseudo = pseudo;
             Mdp = mdp;
+            ListePossedes = new List<Jeu>();
+            ListeFavoris = new List<Jeu>();
         }
 
 
diff --git a/GameAtlas/GameAtlas/Views/PageJeu.xaml b/GameAtlas/GameAtlas/Views/PageJeu.xaml
index 90ad570..a76d0ce 100644
--- a/GameAtlas/GameAtlas/Views/PageJeu.xaml
+++ b/GameAtlas/GameAtlas/Views/PageJeu.xaml
@@ -81,6 +81,9 @@
                             <Image Source="plus" HeightRequest="15"/>
                             <Label Text="Ajouter à" FontFamily="PTSansCBold" FontSize="13" TextColor="{StaticResource Black}" VerticalOptions="Center"/>
                         </HorizontalStackLayout>
+                        <Frame.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="OnAddTapped"/>
+                        </Frame.GestureRecognizers>
                     </Frame>
 
                     <Grid RowDefinitions="50" ColumnDefinitions="auto,*,auto,*,auto,*,auto" Margin="0,5">
diff --git a/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs b/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
index cc7bbb1..869d6ae 100644
--- a/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
@@ -27,6 +27,14 @@ public partial class PageJeu : ContentPage
 
     }
 
+    async void OnAddTapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+        string action = await DisplayActionSheet("Choix de la liste:", "Annuler", null, "Mes Favoris", "Jeux Possédés", "Ma Wishlist");
+        Debug.WriteLine("Popup Action: " + action);
+
+        //if (action == "")
+    }
+
     async void Back_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
     {
         await Navigation.PopAsync();
diff --git a/GameAtlas/GameAtlas/Views/PageProfil.xaml b/GameAtlas/GameAtlas/Views/PageProfil.xaml
index bce17da..8a4e2b6 100644
--- a/GameAtlas/GameAtlas/Views/PageProfil.xaml
+++ b/GameAtlas/GameAtlas/Views/PageProfil.xaml
@@ -66,27 +66,7 @@
                 <Label Text="Liste de profil" FontFamily="PTSansCBold" FontSize="24" TextColor="{StaticResource Black}" HorizontalOptions="Center"/>
 
                 <Grid>
-                    <CollectionView Margin="0,10,0,0" VerticalScrollBarVisibility="Never">
-                        <CollectionView.ItemsSource>
-                            <x:Array Type="{x:Type x:String}">
-                                <x:String>https://cdn1.epicgames.com/offer/b7b42e2078524ab386a8b2a9856ef557/EGS_SifuDeluxeEditionUpgradeBundle_Sloclap_Bundles_S1_2560x1440-43bae7aa2089289442238bd1e2b55655</x:String>
-                                <x:String>https://cdn.cloudflare.steamstatic.com/steam/apps/1562430/capsule_616x353.jpg?t=1682587412</x:String>
-                                <x:String>https://i.ytimg.com/vi/0JdUZOZBi2g/maxresdefault.jpg</x:String>
-                                <x:String>https://staticctf.ubisoft.com/J3yJr34U2pZ2Ieem48Dwy9uqj5PNUQTn/63JzhYgJbTQC1yW74tmZLJ/dd2912bbaf7c7a8a7e005f02d3e6cf4b/jd23-buy-keyart.jpg</x:String>
-                                <x:String>https://gaming-cdn.com/images/products/8893/616x353/horizon-forbidden-west-ps5-playstation-5-jeu-playstation-store-cover.jpg</x:String>
-                                <x:String>https://www.highgroundgaming.com/wp-content/uploads/2020/09/Uncharted-Games-Ranked.jpg</x:String>
-                                <x:String>https://i.ytimg.com/vi/WQUU8jI1Sq8/maxresdefault.jpg</x:String>
-                                <x:String>https://cdn1.epicgames.com/offer/e97659b501af4e3981d5430dad170911/EGS_HogwartsLegacy_AvalancheSoftware_S1_2560x1440-2baf3188eb3c1aa248bcc1af6a927b7e</x:String>
-                                <x:String>https://cdn1.epicgames.com/offer/236c74b4cd2e4e3099cbe2ebdc9686fd/EGS_DeadIsland2_DeepSilverDambusterStudios_S1_2560x1440-fdc688ce46680914ee3c4a7949ce8a67</x:String>
-                                <x:String>https://cdn.akamai.steamstatic.com/steam/apps/986130/capsule_616x353.jpg?t=1682348079</x:String>
-                                <x:String>https://cdn1.epicgames.com/offer/b7b42e2078524ab386a8b2a9856ef557/EGS_SifuDeluxeEditionUpgradeBundle_Sloclap_Bundles_S1_2560x1440-43bae7aa2089289442238bd1e2b55655</x:String>
-                                <x:String>https://cdn.cloudflare.steamstatic.com/steam/apps/1562430/capsule_616x353.jpg?t=1682587412</x:String>
-                                <x:String>https://i.ytimg.com/vi/0JdUZOZBi2g/maxresdefault.jpg</x:String>
-                                <x:String>https://staticctf.ubisoft.com/J3yJr34U2pZ2Ieem48Dwy9uqj5PNUQTn/63JzhYgJbTQC1yW74tmZLJ/dd2912bbaf7c7a8a7e005f02d3e6cf4b/jd23-buy-keyart.jpg</x:String>
-                                <x:String>https://image.api.playstation.com/vulcan/ap/rnd/202010/2915/X8TO4UqHFGMQbHTDwKNlWU9z.jpg</x:String>
-                                <x:String>https://www.highgroundgaming.com/wp-content/uploads/2020/09/Uncharted-Games-Ranked.jpg</x:String>
-                            </x:Array>
-                        </CollectionView.ItemsSource>
+                    <CollectionView ItemsSource="{Binding ListeFavoris}" Margin="0,10,0,0" VerticalScrollBarVisibility="Never">
                         <CollectionView.ItemTemplate>
                             <DataTemplate>
                                 <Border HeightRequest="97.5" StrokeShape="RoundRectangle 5" VerticalOptions="Start" HorizontalOptions="Center">
diff --git a/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs b/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
index 677f0c4..d40dade 100644
--- a/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
@@ -1,10 +1,14 @@
+using GameAtlas.Models;
+
 namespace GameAtlas.Views;
 
 public partial class PageProfil : ContentPage
 {
+    public Manager ProfilManager => (App.Current as App).MyManager;
 	public PageProfil()
 	{
 		InitializeComponent();
+        BindingContext = ProfilManager;
 	}
 
     async void OnGame_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
-- 
2.36.3