From 1fefde79745aee7a96d2eed3dada16b827f57539 Mon Sep 17 00:00:00 2001
From: Jade_VAN_BRABANDT <Jade.VAN_BRABANDT@etu.uca.fr>
Date: Mon, 5 Jun 2023 14:05:00 +0200
Subject: [PATCH] Merge

---
 Sources/Stim.Model/Manager.cs | 2 +-
 Sources/Stim/EntryPopup.xaml  | 3 ++-
 Sources/Stim/MainPage.xaml    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Sources/Stim.Model/Manager.cs b/Sources/Stim.Model/Manager.cs
index bfb45f1..12ee4aa 100644
--- a/Sources/Stim.Model/Manager.cs
+++ b/Sources/Stim.Model/Manager.cs
@@ -11,7 +11,7 @@ namespace Model
             set { mgrpersistance = value; }
         }
         private IPersistance mgrpersistance;
-        public ObservableCollection<Game> GameList { get;}
+        public ObservableCollection<Game> GameList { get; set; }
 
         // dégage ça
         // fait une méthode qui te renvoie une liste filtrer avec les params (genre ton nom :D)
diff --git a/Sources/Stim/EntryPopup.xaml b/Sources/Stim/EntryPopup.xaml
index c701196..b8b9542 100644
--- a/Sources/Stim/EntryPopup.xaml
+++ b/Sources/Stim/EntryPopup.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Stim.EntryPopup"
-               CanBeDismissedByTappingOutsideOfPopup="False">
+             CanBeDismissedByTappingOutsideOfPopup="False">
     <VerticalStackLayout>
         <Grid ColumnDefinitions="*" RowDefinitions="auto, auto, auto,auto">
             <Label x:Name="LabelTxt"/>
@@ -11,4 +11,5 @@
             <Button Grid.Row="2" Text="Valider" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="Valider"/>
             <Button Grid.Row="3" Text="Annuler" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="CloseButton"/>
         </Grid>
+    </VerticalStackLayout>
 </toolkit:Popup>
diff --git a/Sources/Stim/MainPage.xaml b/Sources/Stim/MainPage.xaml
index 5be420b..2f77fb8 100644
--- a/Sources/Stim/MainPage.xaml
+++ b/Sources/Stim/MainPage.xaml
@@ -39,7 +39,7 @@
                     <SearchBar x:Name="Tag2" TextChanged="SearchBar_GameChanged" Grid.Column="1" Grid.Row="1" Placeholder="Tag 2" WidthRequest="200" HorizontalOptions="Start" Margin="5"/>
                 </Grid>
 
-                <CollectionView ItemsSource="{Binding ResearchedGame}" SelectionMode="Single" SelectionChanged="OnClickGameList" ItemsLayout="VerticalGrid, 5"  Grid.Column="1" Grid.Row="1" ItemTemplate="{StaticResource gameTemplate}"/>
+                <CollectionView ItemsSource="{Binding}" SelectionMode="Single" SelectionChanged="OnClickGameList" ItemsLayout="VerticalGrid, 5"  Grid.Column="1" Grid.Row="1" ItemTemplate="{StaticResource gameTemplate}"/>
             </Grid>
         </ScrollView>
         <ImageButton Source="add_white.png" Background="transparent" WidthRequest="50" HeightRequest="50" HorizontalOptions="End" VerticalOptions="End" Margin="0, 0, 10, 10" Clicked="GoToAddGamePage"/>