From afbbd9bc9354d82494f88bccd4df56cbec532736 Mon Sep 17 00:00:00 2001 From: Yoan Date: Mon, 10 Apr 2023 15:18:46 +0200 Subject: [PATCH] =?UTF-8?q?Page=20=C3=A9quipage=20avec=20la=20collection?= =?UTF-8?q?=20et=20les=20objets=20+=20Boutons=20de=20navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Model/Equipage.cs | 7 +- Sources/Model/Stub/StubEquipage.cs | 24 +++ Sources/Ohara/AppShell.xaml | 4 +- Sources/Ohara/MainPage.xaml | 4 +- Sources/Ohara/MainPage.xaml.cs | 10 + Sources/Ohara/NewPage3.xaml.cs | 22 --- Sources/Ohara/Ohara.csproj | 14 +- Sources/Ohara/PageEquipage.xaml | 86 ++++++++ Sources/Ohara/PageEquipage.xaml.cs | 25 +++ Sources/Ohara/{NewPage3.xaml => PageFDD.xaml} | 185 +++++++++--------- Sources/Ohara/PageFDD.xaml.cs | 32 +++ Sources/Ohara/Resources/Images/blanche.jpg | Bin 0 -> 12068 bytes Sources/Ohara/Resources/Images/clown.png | Bin 0 -> 5988 bytes Sources/Ohara/Resources/Images/mugiwara.jpg | Bin 0 -> 47036 bytes Sources/Ohara/Resources/Images/noire.png | Bin 0 -> 6676 bytes Sources/Ohara/Resources/Images/roux.png | Bin 0 -> 7108 bytes Sources/TestConsole/Program.cs | 15 +- 17 files changed, 292 insertions(+), 136 deletions(-) create mode 100644 Sources/Model/Stub/StubEquipage.cs delete mode 100644 Sources/Ohara/NewPage3.xaml.cs create mode 100644 Sources/Ohara/PageEquipage.xaml create mode 100644 Sources/Ohara/PageEquipage.xaml.cs rename Sources/Ohara/{NewPage3.xaml => PageFDD.xaml} (90%) create mode 100644 Sources/Ohara/PageFDD.xaml.cs create mode 100644 Sources/Ohara/Resources/Images/blanche.jpg create mode 100644 Sources/Ohara/Resources/Images/clown.png create mode 100644 Sources/Ohara/Resources/Images/mugiwara.jpg create mode 100644 Sources/Ohara/Resources/Images/noire.png create mode 100644 Sources/Ohara/Resources/Images/roux.png 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/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/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml index 0c44294..d21618c 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 @@