diff --git a/Sources/Model/IDataManager.cs b/Sources/Model/IDataManager.cs index 49dc2b0..8cf01e9 100644 --- a/Sources/Model/IDataManager.cs +++ b/Sources/Model/IDataManager.cs @@ -8,11 +8,11 @@ namespace Model { public interface IDataManager { - //IEnumerable GetsBateaux(); - //IEnumerable GetBestiaires(); - //IEnumerable GetEquipages(); - //IEnumerable GetFruits(); - //IEnumerable GetIles(); - //IEnumerable GetPersonnages(); + IEnumerable GetBateaux(); + IEnumerable GetBestiaires(); + IEnumerable GetEquipages(); + IEnumerable GetFruits(); + IEnumerable GetIles(); + IEnumerable GetPersonnages(); } } diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs index 44b3127..21b510c 100644 --- a/Sources/Model/Manager.cs +++ b/Sources/Model/Manager.cs @@ -12,46 +12,35 @@ namespace Model { public IDataManager DataManager { get; set; } - public List Personnages { get; set; } - public List Fruits { get; set; } - public List Equipages { get; set; } - public List Bateaux { get; set; } - public List Bestiaires { get; set; } - public List Iles { get; set; } + public Manager() { DataManager = new StubManager(); - //Personnages = DataManager.GetPersonnages(); - //Fruits = DataManager.GetFruits(); - //Equipages = Stub.GetEquipages(); - //Bateaux = Stub.GetBateaux(); - //Bestiaires = Stub.GetBestiaires(); - //Iles = Stub.GetIles(); } public List GetPersonnages() { - return Personnages; + return DataManager.GetPersonnages().ToList(); } public List GetFruits() { - return Fruits; + return DataManager.GetFruits().ToList(); } public List GetEquipages() { - return Equipages; + return DataManager.GetEquipages().ToList(); } public List GetBateaux() { - return Bateaux; + return DataManager.GetBateaux().ToList(); } public List GetBestiaires() { - return Bestiaires; + return DataManager.GetBestiaires().ToList(); } public List GetIles() { - return Iles; + return DataManager.GetIles().ToList(); } } } diff --git a/Sources/Model/ObjetOhara.cs b/Sources/Model/ObjetOhara.cs new file mode 100644 index 0000000..78ff8ea --- /dev/null +++ b/Sources/Model/ObjetOhara.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class ObjetOhara + { + public string Nom { get; set; } + public string? Image { get; set;} + + public ObjetOhara(string nom,string image) { + Nom = nom; + Image = image; + } + } +} diff --git a/Sources/Model/Stub/StubManager.cs b/Sources/Model/Stub/StubManager.cs index 80c9721..bbb04b7 100644 --- a/Sources/Model/Stub/StubManager.cs +++ b/Sources/Model/Stub/StubManager.cs @@ -27,30 +27,30 @@ namespace Model.Stub } - public List GetPersonnages() + public IEnumerable GetPersonnages() { - return StubPersonnage.RecupererPersonnage().ToList(); + return StubPersonnage.RecupererPersonnage(); } - public List GetFruits() + public IEnumerable GetFruits() { - return StubFruitDuDemon.RecupererFruit().ToList(); + return StubFruitDuDemon.RecupererFruit(); } - public List GetEquipages() + public IEnumerable GetEquipages() { - return StubEquipage.RecupererEquipage().ToList(); + return StubEquipage.RecupererEquipage(); } - public List GetBateaux() + public IEnumerable GetBateaux() { - return StubBateau.RecupererBateau().ToList(); + return StubBateau.RecupererBateau(); } - public List GetBestiaires() + public IEnumerable GetBestiaires() { - return StubBestiaire.RecupererBestiaire().ToList(); + return StubBestiaire.RecupererBestiaire(); } - public List GetIles() + public IEnumerable GetIles() { - return StubIle.RecupererIle().ToList(); + return StubIle.RecupererIle(); } } } diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs index 406a7e4..d87719a 100644 --- a/Sources/Ohara/PageBateau.xaml.cs +++ b/Sources/Ohara/PageBateau.xaml.cs @@ -8,9 +8,10 @@ public partial class PageBateau : ContentPage public PageBateau() { InitializeComponent(); - List bateau = StubBateau.RecupererBateau().ToList(); + var manager = new Manager(); + - listeBateau.ItemsSource = bateau; + listeBateau.ItemsSource = manager.GetBateaux(); } private async void Hyperlink_FDD(object sender, EventArgs e) diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs index 9a90676..7ee3a46 100644 --- a/Sources/Ohara/PageBestiaire.xaml.cs +++ b/Sources/Ohara/PageBestiaire.xaml.cs @@ -9,10 +9,10 @@ public partial class PageBestiaire : ContentPage { InitializeComponent(); - List Lbest = StubBestiaire.RecupererBestiaire().ToList(); + var manager = new Manager(); - listeBest.ItemsSource = Lbest; + listeBest.ItemsSource = manager.GetBestiaires(); } private async void Hyperlink_Accueil(object sender, EventArgs e) { diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs index dd0287d..af9d29e 100644 --- a/Sources/Ohara/PageEquipage.xaml.cs +++ b/Sources/Ohara/PageEquipage.xaml.cs @@ -7,8 +7,8 @@ public partial class PageEquipage : ContentPage public PageEquipage() { InitializeComponent(); - List Lequipage = StubEquipage.RecupererEquipage().ToList(); - listeEquip.ItemsSource = Lequipage; + var manager = new Manager(); + listeEquip.ItemsSource = manager.GetEquipages(); } private async void Hyperlink_Accueil(object sender, EventArgs e) { diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs index 365aba9..519a053 100644 --- a/Sources/Ohara/PageFDD.xaml.cs +++ b/Sources/Ohara/PageFDD.xaml.cs @@ -8,12 +8,12 @@ public partial class PageFDD : ContentPage public PageFDD() { - InitializeComponent(); - List fdd = StubFruitDuDemon.RecupererFruit().ToList(); - - - listeFDD.ItemsSource = fdd; - } + InitializeComponent(); + var manager = new Manager(); + + + listeFDD.ItemsSource = manager.GetFruits(); + } private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e) { diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs index 2464390..97b3a1c 100644 --- a/Sources/Ohara/PageIle.xaml.cs +++ b/Sources/Ohara/PageIle.xaml.cs @@ -8,10 +8,10 @@ public partial class PageIle : ContentPage public PageIle() { InitializeComponent(); - List ile = StubIle.RecupererIle().ToList(); + var manager = new Manager(); - listeIle.ItemsSource = ile; + listeIle.ItemsSource = manager.GetIles(); } private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e) diff --git a/Sources/Ohara/PageInfoBestiaire.xaml.cs b/Sources/Ohara/PageInfoBestiaire.xaml.cs index 05b6114..8dbf475 100644 --- a/Sources/Ohara/PageInfoBestiaire.xaml.cs +++ b/Sources/Ohara/PageInfoBestiaire.xaml.cs @@ -8,9 +8,9 @@ public partial class PageInfoBestiaire : ContentPage public PageInfoBestiaire() { InitializeComponent(); - List Lbest = StubBestiaire.RecupererBestiaire().ToList(); - - - listeBest.ItemsSource = Lbest; + var manager = new Manager(); + + + listeBest.ItemsSource = manager.GetBestiaires(); } } \ No newline at end of file diff --git a/Sources/Ohara/PageInfoEquipage.xaml.cs b/Sources/Ohara/PageInfoEquipage.xaml.cs index 9e7bf07..01e2efb 100644 --- a/Sources/Ohara/PageInfoEquipage.xaml.cs +++ b/Sources/Ohara/PageInfoEquipage.xaml.cs @@ -8,11 +8,11 @@ public partial class PageInfoEquipage : ContentPage public PageInfoEquipage() { InitializeComponent(); - - List Lequipage = StubEquipage.RecupererEquipage().ToList(); + var manager = new Manager(); - listeEquip.ItemsSource = Lequipage; + + listeEquip.ItemsSource = manager.GetEquipages(); } } \ No newline at end of file diff --git a/Sources/Ohara/PageInfoFdd.xaml.cs b/Sources/Ohara/PageInfoFdd.xaml.cs index 3c1a225..82048d4 100644 --- a/Sources/Ohara/PageInfoFdd.xaml.cs +++ b/Sources/Ohara/PageInfoFdd.xaml.cs @@ -8,7 +8,7 @@ public partial class PageInfoFdd : ContentPage public PageInfoFdd() { InitializeComponent(); - List fdd = StubFruitDuDemon.RecupererFruit().ToList(); - listObj.ItemsSource = fdd; + var manager = new Manager(); + listObj.ItemsSource = manager.GetFruits(); } } \ No newline at end of file diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs index c7c732c..b97f97c 100644 --- a/Sources/Ohara/PagePersonnage.xaml.cs +++ b/Sources/Ohara/PagePersonnage.xaml.cs @@ -9,10 +9,10 @@ public partial class PagePersonnage : ContentPage { InitializeComponent(); - List perso = StubPersonnage.RecupererPersonnage().ToList(); + var manager = new Manager(); - listePerso.ItemsSource = perso; + listePerso.ItemsSource = manager.GetPersonnages(); } private async void Hyperlink_Accueil(object sender, EventArgs e) diff --git a/Sources/TestConsole/Program.cs b/Sources/TestConsole/Program.cs index 64c4abb..54d0f67 100644 --- a/Sources/TestConsole/Program.cs +++ b/Sources/TestConsole/Program.cs @@ -1,3 +1,8 @@ // See https://aka.ms/new-console-template for more information using Model; +var manager = new Manager(); + +foreach (Bateau b in manager.GetBateaux()){ + Console.WriteLine(b.Nom); +} \ No newline at end of file