diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs index 3c8ce05..6442b09 100644 --- a/Sources/Model/Manager.cs +++ b/Sources/Model/Manager.cs @@ -135,10 +135,10 @@ namespace Model List listeFavoris = new List(); listeFavoris.AddRange(Bateaux); listeFavoris.AddRange(Equipages); - listeFavoris.AddRange(GetEquipages()); - listeFavoris.AddRange(GetFruits()); - listeFavoris.AddRange(GetBestiaires()); - listeFavoris.AddRange(GetPersonnages()); + listeFavoris.AddRange(Bestiaire); + listeFavoris.AddRange(Fruits); + listeFavoris.AddRange(Iles); + listeFavoris.AddRange(Personnages); foreach(ObjetOhara obj in listeFavoris.ToList()) { if (obj.EstFavori == false) diff --git a/Sources/Model/Stub/StubBateau.cs b/Sources/Model/Stub/StubBateau.cs index 350b5cb..a5c1e4d 100644 --- a/Sources/Model/Stub/StubBateau.cs +++ b/Sources/Model/Stub/StubBateau.cs @@ -16,9 +16,6 @@ namespace Model.Stub new Bateau("Sunny", "Sauzando Sani-go", 435, 321, "Le Thousand Sunny est...", "Ce bateau a pour particularités ...", "sunny.png"), new Bateau("Vogue Merry", "Goingu Merri-go", 41, 17, "Le Vogue Merry est...", "Ce bateau a pour particularités ...", "vogue_merry.png"), new Bateau("Moby Dick", "Mobi Dikku-go", 234, 151, "Le Moby Dick est...", "Ce bateau a pour particularités ...", "moby_dick.png"), - new Bateau("Test", "Mobi Dikku-go", 234, 151, "Le Moby Dick est...", "Ce bateau a pour particularités ...", "moby_dick.png"), - new Bateau("Test2", "Mobi Dikku-go", 234, 151, "Le Moby Dick est...", "Ce bateau a pour particularités ...", "moby_dick.png"), - }; return bateau; } diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs index 38df1f3..4395120 100644 --- a/Sources/Ohara/PageBestiaire.xaml.cs +++ b/Sources/Ohara/PageBestiaire.xaml.cs @@ -8,17 +8,16 @@ namespace Ohara; public partial class PageBestiaire : ContentPage { public Manager manager => (App.Current as App).manager; - public ICommand AjouterFavoris { get; private set; } + public PageBestiaire() { InitializeComponent(); - //AjouterFavoris = new Command((obj) => manager.AddFavoris((ObjetOhara)obj)); listeBest.ItemsSource = manager.GetBestiaires(); } async void listeBest_SelectionChanged(object sender, SelectionChangedEventArgs e) { - - await Navigation.PushAsync(new PageInfoBestiaire((Bestiaire)listeBest.SelectedItem)); + manager.SelectedItem = (Bestiaire)listeBest.SelectedItem; + await Navigation.PushAsync(new PageInfoBestiaire()); } } \ No newline at end of file diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs index 1228313..9593771 100644 --- a/Sources/Ohara/PageEquipage.xaml.cs +++ b/Sources/Ohara/PageEquipage.xaml.cs @@ -14,8 +14,8 @@ public partial class PageEquipage : ContentPage } async void listeEquip_SelectionChanged(object sender, SelectionChangedEventArgs e) { - - await Navigation.PushAsync(new PageInfoEquipage((Equipage)listeEquip.SelectedItem)); + manager.SelectedItem=(Equipage)listeEquip.SelectedItem; + await Navigation.PushAsync(new PageInfoEquipage()); } } \ No newline at end of file diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs index 6729f2f..354a158 100644 --- a/Sources/Ohara/PageFDD.xaml.cs +++ b/Sources/Ohara/PageFDD.xaml.cs @@ -44,7 +44,7 @@ public partial class PageFDD : ContentPage async void listeFDD_SelectionChanged(object sender, SelectionChangedEventArgs e) { - - await Navigation.PushAsync(new PageInfoFdd((FruitDuDemon)listeFDD.SelectedItem)); + manager.SelectedItem=(FruitDuDemon)listeFDD.SelectedItem; + await Navigation.PushAsync(new PageInfoFdd()); } } \ No newline at end of file diff --git a/Sources/Ohara/PageFavoris.xaml.cs b/Sources/Ohara/PageFavoris.xaml.cs index ba782be..4e0063e 100644 --- a/Sources/Ohara/PageFavoris.xaml.cs +++ b/Sources/Ohara/PageFavoris.xaml.cs @@ -26,20 +26,20 @@ public partial class PageFavoris : ContentPage if (t.Equals(typeof(Bateau))) await Navigation.PushAsync(new PageInfoBateau()); else if (t.Equals(typeof(Equipage))) - await Navigation.PushAsync(new PageInfoEquipage((Equipage)listeFavs.SelectedItem)); + await Navigation.PushAsync(new PageInfoEquipage()); else if (t.Equals(typeof(Personnage))) - await Navigation.PushAsync(new PageInfoPersonnage((Personnage)listeFavs.SelectedItem)); + await Navigation.PushAsync(new PageInfoPersonnage()); else if (t.Equals(typeof(Ile))) - await Navigation.PushAsync(new PageInfoIle((Ile)listeFavs.SelectedItem)); + await Navigation.PushAsync(new PageInfoIle()); else if (t.Equals(typeof(FruitDuDemon))) - await Navigation.PushAsync(new PageInfoFdd((FruitDuDemon)listeFavs.SelectedItem)); + await Navigation.PushAsync(new PageInfoFdd()); else if (t.Equals(typeof(Bestiaire))) - await Navigation.PushAsync(new PageInfoBestiaire((Bestiaire)listeFavs.SelectedItem)); + await Navigation.PushAsync(new PageInfoBestiaire()); } private void Button_Clicked(object sender, EventArgs e) { - listeFavs.ItemsSource = manager.GetBateaux(); + listeFavs.ItemsSource = manager.GetFavoris(); } } \ No newline at end of file diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs index 6e46b38..bcd2c6c 100644 --- a/Sources/Ohara/PageIle.xaml.cs +++ b/Sources/Ohara/PageIle.xaml.cs @@ -15,6 +15,7 @@ public partial class PageIle : ContentPage } async void listeIle_SelectionChanged(object sender, SelectionChangedEventArgs e) { - await Navigation.PushAsync(new PageInfoIle((Ile)listeIle.SelectedItem)); + manager.SelectedItem=(Ile)listeIle.SelectedItem; + await Navigation.PushAsync(new PageInfoIle()); } } \ No newline at end of file diff --git a/Sources/Ohara/PageInfoBateau.xaml.cs b/Sources/Ohara/PageInfoBateau.xaml.cs index a291bec..8fba560 100644 --- a/Sources/Ohara/PageInfoBateau.xaml.cs +++ b/Sources/Ohara/PageInfoBateau.xaml.cs @@ -7,7 +7,7 @@ namespace Ohara; public partial class PageInfoBateau : ContentPage { public Manager manager => (App.Current as App).manager; - public ICommand AjouterFavs { get; private set; } + public PageInfoBateau() { InitializeComponent(); diff --git a/Sources/Ohara/PageInfoBestiaire.xaml b/Sources/Ohara/PageInfoBestiaire.xaml index 4dcad1e..d306017 100644 --- a/Sources/Ohara/PageInfoBestiaire.xaml +++ b/Sources/Ohara/PageInfoBestiaire.xaml @@ -15,6 +15,7 @@ +