Merge pull request 'Echec correction affichage PageAccueil' (#46) from yvan into master

Reviewed-on: remi.lavergne/SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD#46

GameAtlas/GameAtlas/Stub/Stub.cs

@@ -13,8 +13,14 @@ namespace GameAtlas.Stub
         {
             List<Utilisateur> ListUsers = new List<Utilisateur>();
             List<Jeu> ListJeu = new List<Jeu>();
-            Utilisateur user1 = new Utilisateur("test@gmail.com", "test", "Test1234");
+            Utilisateur userTest = new Utilisateur("test@gmail.com", "test", "Test1234");
-            ListUsers.Add(user1);
+            ListUsers.Add(userTest);
+            Jeu TheLastOfUs = new Jeu("The last of Us Part 1","5 Fevrier 2023","Ps5 XOne Pc","dev","ed", 5, 487,"Aventure", "cover_lastofus1.png");
+            Jeu ForzaHorizon = new Jeu("Forza Horizon 5", "12 Mars 2023", "Ps5", "dev", "ed", 4, 420, "Course", "cover_forzahorizon5.png");
+            Jeu Test = new Jeu("The Legend of Zelda: Tears of the Kingdom", "8 Janvier 2023", "Switch Pc", "dev", "ed", 5, 250, "Aventure", "cover_zelda.png");
+            ListJeu.Add(TheLastOfUs);
+            ListJeu.Add(ForzaHorizon);
+            ListJeu.Add(Test);
             return (ListJeu,ListUsers);
         }
 

GameAtlas/GameAtlas/Views/PageAccueil.xaml

@@ -106,12 +106,12 @@
                 Padding="25,25,0,25"
                 />
 
-                <Grid Grid.Row="6" ColumnDefinitions="auto,auto,auto">
+                <Grid Grid.Row="6">
 
                     <VerticalStackLayout Spacing="40" BindableLayout.ItemsSource="{Binding ListJeux}">
                         <BindableLayout.ItemTemplate>
                             <DataTemplate>
-                                <HorizontalStackLayout Grid.Row="0" Spacing="20">
+                                <HorizontalStackLayout Spacing="30">
                                     <Image Source="{Binding Image}" HeightRequest="60" WidthRequest="100" Margin="25,0,0,0"/>
                                     <VerticalStackLayout Spacing="15">
                                         <Label Text="{Binding Nom}" FontFamily="PTSansNarrow-Bold" FontSize="15"/>

GameAtlas/GameAtlas/Views/PageJeu.xaml.cs

@@ -25,7 +25,7 @@ public partial class PageJeu : ContentPage
 
         this.BindingContext = this;
 
-<<<<<<< HEAD
+
     }
 
     async void OnAddTapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
@@ -34,8 +34,7 @@ public partial class PageJeu : ContentPage
         Debug.WriteLine("Popup Action: " + action);
 
         //if (action == "")
-=======
+
->>>>>>> origin/master
     }
 
     async void Back_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)