diff --git a/Sources/Model/IDataManager.cs b/Sources/Model/IDataManager.cs index 9575d14..49dc2b0 100644 --- a/Sources/Model/IDataManager.cs +++ b/Sources/Model/IDataManager.cs @@ -8,11 +8,11 @@ namespace Model { public interface IDataManager { - IEnumerable RecupererBateau(); - IEnumerable RecupererBestiaire(); - IEnumerable RecupererEquipage(); - IEnumerable RecupererFruit(); - IEnumerable RecupererIle(); - IEnumerable RecupererPersonnage(); + //IEnumerable GetsBateaux(); + //IEnumerable GetBestiaires(); + //IEnumerable GetEquipages(); + //IEnumerable GetFruits(); + //IEnumerable GetIles(); + //IEnumerable GetPersonnages(); } } diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs index e88378b..44b3127 100644 --- a/Sources/Model/Manager.cs +++ b/Sources/Model/Manager.cs @@ -1,12 +1,57 @@ -using System; +using Model.Stub; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Model + { - internal class Manager + public class Manager { + 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; + } + public List GetFruits() + { + return Fruits; + } + public List GetEquipages() + { + return Equipages; + } + public List GetBateaux() + { + return Bateaux; + } + public List GetBestiaires() + { + return Bestiaires; + } + public List GetIles() + { + return Iles; + } } } diff --git a/Sources/Model/Stub/StubBateau.cs b/Sources/Model/Stub/StubBateau.cs index 68a12c4..a5c1e4d 100644 --- a/Sources/Model/Stub/StubBateau.cs +++ b/Sources/Model/Stub/StubBateau.cs @@ -7,9 +7,9 @@ using static System.Net.Mime.MediaTypeNames; namespace Model.Stub { - public static class StubBateau + public class StubBateau { - public static IEnumerable RecupererBateau() + public IEnumerable RecupererBateau() { List bateau = new List() { diff --git a/Sources/Model/Stub/StubBestiaire.cs b/Sources/Model/Stub/StubBestiaire.cs index 57dc408..5a0fbb6 100644 --- a/Sources/Model/Stub/StubBestiaire.cs +++ b/Sources/Model/Stub/StubBestiaire.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; namespace Model.Stub { - public static class StubBestiaire + public class StubBestiaire { - public static IEnumerable RecupererBestiaire() + public IEnumerable RecupererBestiaire() { List best = new List() { diff --git a/Sources/Model/Stub/StubEquipage.cs b/Sources/Model/Stub/StubEquipage.cs index 822dec9..17a5055 100644 --- a/Sources/Model/Stub/StubEquipage.cs +++ b/Sources/Model/Stub/StubEquipage.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; namespace Model.Stub { - public static class StubEquipage + public class StubEquipage { - public static IEnumerable RecupererEquipage() + public IEnumerable RecupererEquipage() { List Lequipage = new List() { diff --git a/Sources/Model/Stub/StubFruitDuDemon.cs b/Sources/Model/Stub/StubFruitDuDemon.cs index 061a22b..b7575ec 100644 --- a/Sources/Model/Stub/StubFruitDuDemon.cs +++ b/Sources/Model/Stub/StubFruitDuDemon.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; namespace Model.Stub { - public static class StubFruitDuDemon + public class StubFruitDuDemon { - public static IEnumerable RecupererFruit() + public IEnumerable RecupererFruit() { List fdd = new List() { diff --git a/Sources/Model/Stub/StubIle.cs b/Sources/Model/Stub/StubIle.cs index c457ec8..2ed4367 100644 --- a/Sources/Model/Stub/StubIle.cs +++ b/Sources/Model/Stub/StubIle.cs @@ -7,9 +7,9 @@ using static System.Net.Mime.MediaTypeNames; namespace Model.Stub { - public static class StubIle + public class StubIle { - public static IEnumerable RecupererIle() + public IEnumerable RecupererIle() { List ile = new List() { diff --git a/Sources/Model/Stub/StubManager.cs b/Sources/Model/Stub/StubManager.cs new file mode 100644 index 0000000..80c9721 --- /dev/null +++ b/Sources/Model/Stub/StubManager.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model.Stub +{ + public class StubManager : IDataManager + { + + public StubPersonnage StubPersonnage { get; set; } + public StubFruitDuDemon StubFruitDuDemon { get; set; } + public StubEquipage StubEquipage { get; set; } + public StubBateau StubBateau { get; set; } + public StubBestiaire StubBestiaire { get; set; } + public StubIle StubIle { get; set; } + + public StubManager() + { + StubPersonnage = new StubPersonnage(); + StubFruitDuDemon = new StubFruitDuDemon(); + StubEquipage = new StubEquipage(); + StubBateau = new StubBateau(); + StubBestiaire = new StubBestiaire(); + StubIle = new StubIle(); + } + + + public List GetPersonnages() + { + return StubPersonnage.RecupererPersonnage().ToList(); + } + + public List GetFruits() + { + return StubFruitDuDemon.RecupererFruit().ToList(); + } + public List GetEquipages() + { + return StubEquipage.RecupererEquipage().ToList(); + } + public List GetBateaux() + { + return StubBateau.RecupererBateau().ToList(); + } + public List GetBestiaires() + { + return StubBestiaire.RecupererBestiaire().ToList(); + } + public List GetIles() + { + return StubIle.RecupererIle().ToList(); + } + } +} diff --git a/Sources/Model/Stub/StubPersonnage.cs b/Sources/Model/Stub/StubPersonnage.cs index 8a9da65..7ad973d 100644 --- a/Sources/Model/Stub/StubPersonnage.cs +++ b/Sources/Model/Stub/StubPersonnage.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; namespace Model.Stub { - public static class StubPersonnage + public class StubPersonnage { - public static IEnumerable RecupererPersonnage() + public IEnumerable RecupererPersonnage() { List perso = new List() { diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml index 97c8cea..302c51e 100644 --- a/Sources/Ohara/AppShell.xaml +++ b/Sources/Ohara/AppShell.xaml @@ -13,7 +13,7 @@ diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml index 4a9757c..e02ed06 100644 --- a/Sources/Ohara/PageFDD.xaml +++ b/Sources/Ohara/PageFDD.xaml @@ -15,25 +15,25 @@ - + - - - - - + + + + + -