diff --git a/GameAtlas/GameAtlas/App.xaml.cs b/GameAtlas/GameAtlas/App.xaml.cs
index c613e67..06bd1b6 100644
--- a/GameAtlas/GameAtlas/App.xaml.cs
+++ b/GameAtlas/GameAtlas/App.xaml.cs
@@ -15,7 +15,7 @@ public partial class App : Application
MyManager.Persistance = new DataContractPersistance.DataContractPers();
- MainPage = new NavigationPage(new PageInscription());
+ MainPage = new AppShell();
MyManager.SauvegardeDonnees();
}
diff --git a/GameAtlas/GameAtlas/GameAtlas.csproj.user b/GameAtlas/GameAtlas/GameAtlas.csproj.user
index f7028d6..ac890c6 100644
--- a/GameAtlas/GameAtlas/GameAtlas.csproj.user
+++ b/GameAtlas/GameAtlas/GameAtlas.csproj.user
@@ -3,8 +3,8 @@
False
net7.0-android
- Pixel 5 - API 33 (1) (Android 13.0 - API 33)
- Emulator
+ Xiaomi 2201117SY (Android 12.0 - API 31)
+ PhysicalDevice
pixel_5_-_api_33_1
diff --git a/GameAtlas/GameAtlas/Models/IPersistanceManager.cs b/GameAtlas/GameAtlas/Models/IPersistanceManager.cs
index f1b27ad..280e086 100644
--- a/GameAtlas/GameAtlas/Models/IPersistanceManager.cs
+++ b/GameAtlas/GameAtlas/Models/IPersistanceManager.cs
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -12,23 +11,5 @@ namespace GameAtlas.Models
(List,List) ChargeDonnees();
void SauvegardeDonnees(List jeux, List utilisateurs);
-
}
-}
-=======
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GameAtlas.Models
-{
- public interface IPersistanceManager
- {
- List ChargeDonnees();
-
- void SauvDonnees(List utilisateurs);
- }
-}
->>>>>>> 192f86a (N/A)
+}
\ No newline at end of file
diff --git a/GameAtlas/GameAtlas/Stub/Stub.cs b/GameAtlas/GameAtlas/Stub/Stub.cs
index b14bdee..475f47a 100644
--- a/GameAtlas/GameAtlas/Stub/Stub.cs
+++ b/GameAtlas/GameAtlas/Stub/Stub.cs
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-using GameAtlas.Models;
+using GameAtlas.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -28,34 +27,4 @@ namespace GameAtlas.Stub
throw new NotImplementedException();
}
}
-}
-=======
-using GameAtlas.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GameAtlas.Stub
-{
- public class Stub : IPersistanceManager
- {
- public List ChargeDonnees()
- {
- List ListUsers = new List();
- Utilisateur user1 = new Utilisateur("gmail@gmail.com", "MrLilian24", "mdp_Tres_Securise000");
- ListUsers.Add(user1);
- return ListUsers;
- }
-
- public void SauvDonnees(List utilisateurs)
- {
- using (FileStream fs = new FileStream(@"C:\data.xml", FileMode.OpenOrCreate))
- {
- throw new NotImplementedException();
- }
- }
- }
-}
->>>>>>> 192f86a (N/A)
+}
\ No newline at end of file
diff --git a/GameAtlas/GameAtlas/Views/PageParcourir.xaml.cs b/GameAtlas/GameAtlas/Views/PageParcourir.xaml.cs
index b70410a..06c6c49 100644
--- a/GameAtlas/GameAtlas/Views/PageParcourir.xaml.cs
+++ b/GameAtlas/GameAtlas/Views/PageParcourir.xaml.cs
@@ -1,11 +1,16 @@
namespace GameAtlas.Views;
+using GameAtlas.Models;
+
public partial class PageParcourir : ContentPage
{
- public PageParcourir()
+
+ public Manager ParcourirManager => (App.Current as App).MyManager;
+ public PageParcourir()
{
InitializeComponent();
- }
+ BindingContext = this;
+ }
async void OnGame_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
{