diff --git a/Sources/Model/Equipage.cs b/Sources/Model/Equipage.cs index 2d99461..1c7490f 100644 --- a/Sources/Model/Equipage.cs +++ b/Sources/Model/Equipage.cs @@ -16,11 +16,12 @@ namespace Model public int PremierEp { get; set; } public bool Statut { get; set; } public string Description { get; set; } - public Personnage Capitaine { get; set; } + public Personnage? Capitaine { get; set; } public List Membre { get; set; } = new List(); public List Allie { get; set; } = new List(); + public string? Image { get; set; } - public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description, Personnage capitaine) + public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description,string image) { Nom = nom; NomRomanise = nomRomanise; @@ -29,7 +30,7 @@ namespace Model PremierEp = premierEp; Statut = statut; Description = description; - Capitaine = capitaine; + Image = image; } } } diff --git a/Sources/Model/FruitDuDemon.cs b/Sources/Model/FruitDuDemon.cs index 3ed6c65..81145b8 100644 --- a/Sources/Model/FruitDuDemon.cs +++ b/Sources/Model/FruitDuDemon.cs @@ -17,6 +17,7 @@ namespace Model public string Forces { get; set; } public string Faiblesses { get; set; } public List Utilisateur { get; set; }= new List(); + public string? Image { get; set; } public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses) { @@ -30,6 +31,10 @@ namespace Model Faiblesses = faiblesses; } + public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses,string image) : this(nom, nomRomanise, type, premierChap, premierEp, description, forces, faiblesses) + { + Image = image; + } public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses, List utilisateur) : this( nom, nomRomanise, type, premierChap, premierEp, description, forces, faiblesses) { Utilisateur = utilisateur; diff --git a/Sources/Model/Stub/StubEquipage.cs b/Sources/Model/Stub/StubEquipage.cs new file mode 100644 index 0000000..41bae57 --- /dev/null +++ b/Sources/Model/Stub/StubEquipage.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model.Stub +{ + public static class StubEquipage + { + public static IEnumerable RecupererEquipage() + { + List Lequipage = new List() + { + new Equipage("Équipage au chapeau de paille", "Mugiwara No Ichimi", "East Blue", 1, 1, true, "L'équipage du Chapeau de Paille ...","mugiwara.jpg"), + new Equipage("Équipage du Roux", "Akagami Kalzokudan", "East Blue", 1, 4, true, "L'équipage du Roux ...","roux.png"), + new Equipage("Équipage du Clown", "Bagï Kalzokudan", "East Blue", 8, 4, true, "L'équipage du Clown ...","clown.png"), + new Equipage("Équipage de Barbe Blanche", "Shirohige Kaizokudan", "East Blue", 234, 151, true, "L'équipage de Barbe Blanche ...","blanche.jpg"), + new Equipage("Équipage de Barbe Noire", "Kurohige Kaizokudan", "East Blue", 234, 151, true, "L'équipage de Barbe Noire ...","noire.png"), + }; + return Lequipage; + } + } +} \ No newline at end of file diff --git a/Sources/Model/Stub/StubFruitDuDemon.cs b/Sources/Model/Stub/StubFruitDuDemon.cs new file mode 100644 index 0000000..061a22b --- /dev/null +++ b/Sources/Model/Stub/StubFruitDuDemon.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model.Stub +{ + public static class StubFruitDuDemon + { + public static IEnumerable RecupererFruit() + { + List fdd = new List() + { + new FruitDuDemon("Fruit de la fumée", "Moku Moky No Mi", "Logia", 97, 48, "Le fruit est ..", "Forces :", "Faiblesses :","fumer.png"), + new FruitDuDemon("Fruit de l'humain modèle Nika", "Nika Nika No Mi", "Zoan Mythique", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :","nika.png"), + new FruitDuDemon("Pyro fruit", "Nika Nika No Mi", "Logia", 158, 94, "Le fruit ...", "Forces :", "Faiblesses :","feu.png"), + new FruitDuDemon("Fruit des Éclosions", "Hana Hana no Mi", "Paramecia", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :","eclosion.png"), + new FruitDuDemon("Fruit du Félin, modèle Léopard", "Neko Neko no Mi", "Zoan Carnivore", 348, 245, "Le fruit ...", "Forces :", "Faiblesses :","leopard.png"), + }; + return fdd; + } + } +} diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml index 3450ec3..797d050 100644 --- a/Sources/Ohara/AppShell.xaml +++ b/Sources/Ohara/AppShell.xaml @@ -13,8 +13,8 @@ - + ContentTemplate="{DataTemplate local:PageEquipage}" + Route="PageEquipage" /> + diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml index 2513e50..43e3adf 100644 --- a/Sources/Ohara/MainPage.xaml +++ b/Sources/Ohara/MainPage.xaml @@ -27,11 +27,11 @@