ajouter favoris fonctionnel

Sources/Model/Manager.cs

@@ -135,10 +135,10 @@ namespace Model
             List<ObjetOhara> listeFavoris = new List<ObjetOhara>();
             listeFavoris.AddRange(Bateaux);
             listeFavoris.AddRange(Equipages);
-            listeFavoris.AddRange(GetEquipages());
+            listeFavoris.AddRange(Bestiaire);
-            listeFavoris.AddRange(GetFruits());
+            listeFavoris.AddRange(Fruits);
-            listeFavoris.AddRange(GetBestiaires());
+            listeFavoris.AddRange(Iles);
-            listeFavoris.AddRange(GetPersonnages());
+            listeFavoris.AddRange(Personnages);
             foreach(ObjetOhara obj in listeFavoris.ToList())
             {
                 if (obj.EstFavori == false)

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;
         }

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)
     {
-
+        manager.SelectedItem = (Bestiaire)listeBest.SelectedItem;
-        await Navigation.PushAsync(new PageInfoBestiaire((Bestiaire)listeBest.SelectedItem));
+        await Navigation.PushAsync(new PageInfoBestiaire());
     }
 }

Sources/Ohara/PageEquipage.xaml.cs

@@ -14,8 +14,8 @@ public partial class PageEquipage : ContentPage
     }
     async void listeEquip_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        
+        manager.SelectedItem=(Equipage)listeEquip.SelectedItem; 
-        await Navigation.PushAsync(new PageInfoEquipage((Equipage)listeEquip.SelectedItem));
+        await Navigation.PushAsync(new PageInfoEquipage());
     }
 
 }

Sources/Ohara/PageFDD.xaml.cs

@@ -44,7 +44,7 @@ public partial class PageFDD : ContentPage
 
     async void listeFDD_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-     
+        manager.SelectedItem=(FruitDuDemon)listeFDD.SelectedItem;
-        await Navigation.PushAsync(new PageInfoFdd((FruitDuDemon)listeFDD.SelectedItem));
+        await Navigation.PushAsync(new PageInfoFdd());
     }
 }

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();
     }
 }

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());
     }
 }

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();

Sources/Ohara/PageInfoBestiaire.xaml

@@ -15,6 +15,7 @@
                     <ColumnDefinition Width="40*"/>
                 </Grid.ColumnDefinitions>
                 <VerticalStackLayout Grid.Column="0" Spacing="4">
+                    <Button x:Name="bouttonFav" Text="Ajouter aux favoris" Style="{StaticResource buttonFavsInfo}" Clicked="AjouterFav_Clicked" />
                     <Frame Style="{StaticResource frameInfo}">
                         <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
                     </Frame>

Sources/Ohara/PageInfoBestiaire.xaml.cs

@@ -5,9 +5,23 @@ namespace Ohara;
 
 public partial class PageInfoBestiaire : ContentPage
 {
-	public PageInfoBestiaire(Bestiaire bestiaire)
+    public Manager manager => (App.Current as App).manager;
+    public PageInfoBestiaire()
 	{
 		InitializeComponent();
-        BindingContext=bestiaire;
+        if (manager.SelectedItem.EstFavori == true)
+        {
+            bouttonFav.IsEnabled = false;
+            bouttonFav.Text = "Ajouté au favoris";
+        }
+        BindingContext = manager.SelectedItem;
+
+    }
+
+    private void AjouterFav_Clicked(object sender, EventArgs e)
+    {
+        manager.AddFavoris(manager.SelectedItem);
+        bouttonFav.IsEnabled = false;
+        bouttonFav.Text = "Ajouté au favoris";
     }
 }

Sources/Ohara/PageInfoEquipage.xaml

@@ -16,6 +16,7 @@
                     <ColumnDefinition Width="40*"/>
                 </Grid.ColumnDefinitions>
                 <VerticalStackLayout Grid.Column="0" Spacing="4">
+                    <Button x:Name="bouttonFav" Text="Ajouter aux favoris" Style="{StaticResource buttonFavsInfo}" Clicked="AjouterFav_Clicked" />
                     <Frame Style="{StaticResource frameInfo}">
                         <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
                     </Frame>

Sources/Ohara/PageInfoEquipage.xaml.cs

@@ -5,9 +5,23 @@ namespace Ohara;
 
 public partial class PageInfoEquipage : ContentPage
 {
-	public PageInfoEquipage(Equipage equipage)
+    public Manager manager => (App.Current as App).manager;
+    public PageInfoEquipage()
 	{
 		InitializeComponent();
-        BindingContext = equipage;
+        if (manager.SelectedItem.EstFavori == true)
+        {
+            bouttonFav.IsEnabled = false;
+            bouttonFav.Text = "Ajouté au favoris";
+        }
+        BindingContext = manager.SelectedItem;
+
+    }
+
+    private void AjouterFav_Clicked(object sender, EventArgs e)
+    {
+        manager.AddFavoris(manager.SelectedItem);
+        bouttonFav.IsEnabled = false;
+        bouttonFav.Text = "Ajouté au favoris";
     }
 }

Sources/Ohara/PageInfoFdd.xaml

@@ -15,6 +15,7 @@
 
                 </Grid.ColumnDefinitions>
                 <VerticalStackLayout Grid.Column="0" Spacing="2"  Padding="5">
+                    <Button x:Name="bouttonFav" Text="Ajouter aux favoris" Style="{StaticResource buttonFavsInfo}" Clicked="AjouterFav_Clicked" />
                     <Frame Style="{StaticResource frameInfo}">
                         <Label Text="Sommaire :" Style="{StaticResource titreInfo}" />
                     </Frame>

Sources/Ohara/PageInfoFdd.xaml.cs

@@ -5,9 +5,23 @@ namespace Ohara;
 
 public partial class PageInfoFdd : ContentPage
 {
-	public PageInfoFdd(FruitDuDemon fdd)
+    public Manager manager => (App.Current as App).manager;
+    public PageInfoFdd()
 	{
 		InitializeComponent();
-        BindingContext = fdd;
+        if (manager.SelectedItem.EstFavori == true)
+        {
+            bouttonFav.IsEnabled = false;
+            bouttonFav.Text = "Ajouté au favoris";
+        }
+        BindingContext = manager.SelectedItem;
+
+    }
+
+    private void AjouterFav_Clicked(object sender, EventArgs e)
+    {
+        manager.AddFavoris(manager.SelectedItem);
+        bouttonFav.IsEnabled = false;
+        bouttonFav.Text = "Ajouté au favoris";
     }
 }

Sources/Ohara/PageInfoIle.xaml

@@ -15,7 +15,8 @@
                 <ColumnDefinition Width="40*"/>
             </Grid.ColumnDefinitions>
             <VerticalStackLayout Grid.Column="0" Spacing="4">
-                <Frame Style="{StaticResource frameInfo}">
+                    <Button x:Name="bouttonFav" Text="Ajouter aux favoris" Style="{StaticResource buttonFavsInfo}" Clicked="AjouterFav_Clicked" />
+                    <Frame Style="{StaticResource frameInfo}">
                     <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
                 </Frame>
                 <Frame Style="{StaticResource frameInfo}">

Sources/Ohara/PageInfoIle.xaml.cs

@@ -5,9 +5,23 @@ namespace Ohara;
 
 public partial class PageInfoIle : ContentPage
 {
-	public PageInfoIle(Ile ile)
+    public Manager manager => (App.Current as App).manager;
+    public PageInfoIle()
 	{
         InitializeComponent();
-        BindingContext = ile;
+        if (manager.SelectedItem.EstFavori == true)
+        {
+            bouttonFav.IsEnabled = false;
+            bouttonFav.Text = "Ajouté au favoris";
+        }
+        BindingContext = manager.SelectedItem;
+
+    }
+
+    private void AjouterFav_Clicked(object sender, EventArgs e)
+    {
+        manager.AddFavoris(manager.SelectedItem);
+        bouttonFav.IsEnabled = false;
+        bouttonFav.Text = "Ajouté au favoris";
     }
 }

Sources/Ohara/PageInfoPersonnage.xaml

@@ -15,6 +15,7 @@
                     <ColumnDefinition Width="40*"/>
                 </Grid.ColumnDefinitions>
                 <VerticalStackLayout Grid.Column="0" Spacing="4">
+                    <Button x:Name="bouttonFav" Text="Ajouter aux favoris" Style="{StaticResource buttonFavsInfo}" Clicked="AjouterFav_Clicked" />
                     <Frame Style="{StaticResource frameInfo}">
                         <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
                     </Frame>

Sources/Ohara/PageInfoPersonnage.xaml.cs

@@ -1,15 +1,27 @@
 using Model.Stub;
 using Model;
 using Plugin.Maui.Audio;
-
-
 namespace Ohara;
 
 public partial class PageInfoPersonnage : ContentPage
 {
-	public PageInfoPersonnage(Personnage perso)
+    public Manager manager => (App.Current as App).manager;
+    public PageInfoPersonnage()
 	{
         InitializeComponent();
-        BindingContext = perso;
+        if (manager.SelectedItem.EstFavori == true)
+        {
+            bouttonFav.IsEnabled = false;
+            bouttonFav.Text = "Ajouté au favoris";
+        }
+        BindingContext = manager.SelectedItem;
+
+    }
+
+    private void AjouterFav_Clicked(object sender, EventArgs e)
+    {
+        manager.AddFavoris(manager.SelectedItem);
+        bouttonFav.IsEnabled = false;
+        bouttonFav.Text = "Ajouté au favoris";
     }
 }

Sources/Ohara/PagePersonnage.xaml.cs

@@ -17,8 +17,8 @@ public partial class PagePersonnage : ContentPage
     }
     async void listePerso_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-
+        manager.SelectedItem = (Personnage)listePerso.SelectedItem;
-        await Navigation.PushAsync(new PageInfoPersonnage((Personnage)listePerso.SelectedItem));
+        await Navigation.PushAsync(new PageInfoPersonnage());
     }
 
 }