Debut de la fonctionnalité ajouté favoris

Sources/Model/Manager.cs

@@ -14,11 +14,24 @@ namespace Model
     {
         public IDataManager DataManager { get; set; }
 
-        public ObservableCollection<Bateau> Bateaux { get; private set; } 
+        public ObservableCollection<Bateau> Bateaux { get; set; }
+        public ObservableCollection<Personnage> Personnages { get; set; }
+        public ObservableCollection<FruitDuDemon> Fruits { get; set; }
+        public ObservableCollection<Ile> Iles { get; set; }
+        public ObservableCollection<Bestiaire> Bestiaire { get; set; }
+        public ObservableCollection<Equipage> Equipages { get; set; }
+        
+        public ObjetOhara? SelectedItem { get; set; } = null;
 
         public Manager() {
-            Bateaux = new ObservableCollection<Bateau>();
             DataManager = new StubManager();
+            Bateaux = new ObservableCollection<Bateau>(DataManager.GetBateaux());
+            Personnages = new ObservableCollection<Personnage>(DataManager.GetPersonnages());
+            Fruits = new ObservableCollection<FruitDuDemon>(DataManager.GetFruits());
+            Iles = new ObservableCollection<Ile>(DataManager.GetIles());
+            Bestiaire = new ObservableCollection<Bestiaire>(DataManager.GetBestiaires());
+            Equipages = new ObservableCollection<Equipage>(DataManager.GetEquipages());
+
         }
 
         public List<Personnage> GetPersonnages()
@@ -120,15 +133,15 @@ namespace Model
         public List<ObjetOhara> GetFavoris()
         {
             List<ObjetOhara> listeFavoris = new List<ObjetOhara>();
-            listeFavoris.AddRange(GetBateaux());
+            listeFavoris.AddRange(Bateaux);
-            listeFavoris.AddRange(GetIles());
+            listeFavoris.AddRange(Equipages);
             listeFavoris.AddRange(GetEquipages());
             listeFavoris.AddRange(GetFruits());
             listeFavoris.AddRange(GetBestiaires());
             listeFavoris.AddRange(GetPersonnages());
             foreach(ObjetOhara obj in listeFavoris.ToList())
             {
-                if (obj.EstFavori == true)
+                if (obj.EstFavori == false)
                 {
                     listeFavoris.Remove(obj);
                 }
@@ -136,9 +149,64 @@ namespace Model
             return listeFavoris;
         }
 
-        public void AddBateauFavoris(Bateau bateau)
+       public void AddFavoris(ObjetOhara obj)
         {
-            bateau.EstFavori = true;
+            Type t = obj.GetType();
+         
+            if (t.Equals(typeof(Bateau)))
+                foreach(Bateau b in Bateaux)
+                {
+                    if (b.Equals(obj))
+                    {
+                        b.EstFavori = true;
+                    }
+                }
+            else if (t.Equals(typeof(Equipage)))
+                foreach (Equipage b in Equipages)
+                {
+                    if (b.Equals(obj))
+                    {
+                        b.EstFavori = true;
+                    }
+                }
+
+            else if (t.Equals(typeof(Personnage)))
+                foreach (Personnage b in Personnages)
+                {
+                    if (b.Equals(obj))
+                    {
+                        b.EstFavori = true;
+                    }
+                }
+
+            else if (t.Equals(typeof(Ile)))
+                foreach (Ile b in Iles)
+                {
+                    if (b.Equals(obj))
+                    {
+                        b.EstFavori = true;
+                    }
+                }
+
+            else if (t.Equals(typeof(FruitDuDemon)))
+                foreach (FruitDuDemon b in Fruits)
+                {
+                    if (b.Equals(obj))
+                    {
+                        b.EstFavori = true;
+                    }
+                }
+
+            else if (t.Equals(typeof(Bestiaire)))
+                foreach (Bestiaire b in Bestiaire)
+                {
+                    if (b.Equals(obj))
+                    {
+                        b.EstFavori = true;
+                    }
+                }
+
         }
+
     }
 }

Sources/Model/ObjetOhara.cs

@@ -23,6 +23,17 @@ namespace Model
             Image = image;
             EstFavori = estFavori;
         }
+
+        public override bool Equals(object? obj)
+        {
+            if (obj == null) return false;
+            else
+            {
+                ObjetOhara o = (ObjetOhara)obj;
+                return o.Nom == Nom;
+            }
+            
+        }
     }
 }
 

Sources/Model/Stub/StubBateau.cs

@@ -16,6 +16,9 @@ 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/PageBateau.xaml

@@ -21,14 +21,14 @@
             <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
                 <Label Text="Filtrer" HorizontalTextAlignment="Center" />
             </Frame>
-
+        
             <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
                 <Label Text="Trier" HorizontalTextAlignment="Center"  />
             </Frame>
         </Grid>
 
         <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
-            <CollectionView x:Name="listeBateau" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeBateau_SelectionChanged">
+            <CollectionView x:Name="listeBateau" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeBateau_SelectionChanged" ItemsSource="{Binding Bateaux}" >
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
 

Sources/Ohara/PageBateau.xaml.cs

@@ -11,12 +11,18 @@ public partial class PageBateau : ContentPage
     public PageBateau()
 	{
 		InitializeComponent();
-        listeBateau.ItemsSource = manager.GetBateaux();
+        BindingContext = manager;
        
     }
 
     async void listeBateau_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        await Navigation.PushAsync(new PageInfoBateau((Bateau)listeBateau.SelectedItem));
+        manager.SelectedItem = (Bateau)listeBateau.SelectedItem;
+        await Navigation.PushAsync(new PageInfoBateau());
+    }
+
+    private void Button_Clicked(object sender, EventArgs e)
+    {
+        
     }
 }

Sources/Ohara/PageFDD.xaml

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Ohara.PageFDD"
+             x:Class="Ohara.PageFDD"
-             Title="PageFDD"
+             Title="PageFDD"
-             BackgroundColor="#e2edf1">
+             BackgroundColor="#e2edf1">
-
+
-
+
-
+
-    <CollectionView x:Name="listeFDD" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeFDD_SelectionChanged" >
+    <CollectionView x:Name="listeFDD" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeFDD_SelectionChanged" >
-        <CollectionView.ItemsLayout>
+        <CollectionView.ItemsLayout>
-            <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
+            <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
-        </CollectionView.ItemsLayout>
+        </CollectionView.ItemsLayout>
         <CollectionView.Header>
             <Grid ColumnDefinitions="200,*,100,10,100" BackgroundColor="#72a3b3" Padding="10">
                 <SearchBar x:Name="searchBar" Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                <Frame x:Name="Logia" CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
                     <Label Text="Filtrer" HorizontalTextAlignment="Center" />
                 </Frame>
 
@@ -23,37 +23,37 @@
                 </Frame>
 
             </Grid>
-        </CollectionView.Header>
+        </CollectionView.Header>
-        <CollectionView.ItemTemplate >
+        <CollectionView.ItemTemplate >
-            <DataTemplate >
+            <DataTemplate >
-
+
-                <Frame Style="{StaticResource frameObjet}">
+                <Frame Style="{StaticResource frameObjet}">
-                    <StackLayout Orientation="Vertical" Padding="5">
+                    <StackLayout Orientation="Vertical" Padding="5">
-                        <Image
+                        <Image
-                                    Source="{Binding Image}"
+                                    Source="{Binding Image}"
-                                    HeightRequest="280"
+                                    HeightRequest="280"
-                                    WidthRequest="280" />
+                                    WidthRequest="280" />
-
+
-                        <Label
+                        <Label
-                                        HorizontalOptions="Center"
+                                        HorizontalOptions="Center"
-                                        VerticalOptions="Start"
+                                        VerticalOptions="Start"
-                                        HorizontalTextAlignment="Center"
+                                        HorizontalTextAlignment="Center"
-                                        Text="{Binding Nom}"
+                                        Text="{Binding Nom}"
-                                         
+                                         
-                                        FontSize="19"
+                                        FontSize="19"
-                                        TextColor="#72a3b3"
+                                        TextColor="#72a3b3"
-                                        FontAttributes="Bold" />
+                                        FontAttributes="Bold" />
-
+
-                        <Label
+                        <Label
-                                        VerticalOptions="Center"
+                                        VerticalOptions="Center"
-                                        HorizontalOptions="Center"
+                                        HorizontalOptions="Center"
-                                        Text="{Binding Type}"
+                                        Text="{Binding Type}"
-                                        FontAttributes="Italic"
+                                        FontAttributes="Italic"
-                                        TextColor="#72a3b3"/>
+                                        TextColor="#72a3b3"/>
-
+
-                    </StackLayout>
+                    </StackLayout>
-                </Frame>
+                </Frame>
-            </DataTemplate>
+            </DataTemplate>
-        </CollectionView.ItemTemplate>
+        </CollectionView.ItemTemplate>
-    </CollectionView>
+    </CollectionView>
 </ContentPage>

Sources/Ohara/PageFDD.xaml.cs

@@ -22,8 +22,8 @@ public partial class PageFDD : ContentPage
         }
         searchBar.TextChanged += OnTextChanged;
         FiltrerType = new Command((type) => listeFDD.ItemsSource = manager.FiltrerFDD(type.ToString()));
-        Logia.Command = FiltrerType;
+        //Logia.Command = FiltrerType;
-        Logia.CommandParameter = "Logia";
+        //Logia.CommandParameter = "Logia";
         
     }
 

Sources/Ohara/PageFavoris.xaml

@@ -5,18 +5,19 @@
              Title="PageFavoris"
             BackgroundColor="#e2edf1">
 
-    <CollectionView x:Name="listeFavs" SelectionMode="Single" SelectionChanged="listeFavs_SelectionChanged">
+    <CollectionView x:Name="listeFavs" SelectionMode="Single" SelectionChanged="listeFavs_SelectionChanged"  EmptyView="Aucun résultat trouvé.">
         <CollectionView.ItemsLayout>
             <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
         </CollectionView.ItemsLayout>
         <CollectionView.Header>
-            <Grid ColumnDefinitions="200,*,100,10,100" BackgroundColor="#72a3b3" Padding="10">
+            <Grid ColumnDefinitions="200,*,100,100,10,100" BackgroundColor="#72a3b3" Padding="10">
                 <SearchBar x:Name="searchBar" Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                <Button Text="Actualiser" Clicked="Button_Clicked" Grid.Column="2" CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef"/>
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
                     <Label Text="Filtrer" HorizontalTextAlignment="Center" />
                 </Frame>
-
+                
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="4">
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="5">
                     <Label Text="Trier" HorizontalTextAlignment="Center"  />
                 </Frame>
                 

Sources/Ohara/PageFavoris.xaml.cs

@@ -1,40 +1,45 @@
-using Model;
+using Model;
-using Plugin.Maui.Audio;
+using Plugin.Maui.Audio;
-
+
-namespace Ohara;
+namespace Ohara;
-
+
-public partial class PageFavoris : ContentPage
+public partial class PageFavoris : ContentPage
-{
+{
-    public Manager manager => (App.Current as App).manager;
+    public Manager manager => (App.Current as App).manager;
-
+
-    public PageFavoris()
+    public PageFavoris()
-	{
+	{
-	    InitializeComponent();
+	    InitializeComponent();
         listeFavs.ItemsSource = manager.GetFavoris();
-        void OnTextChanged(object sender, EventArgs e)
+        void OnTextChanged(object sender, EventArgs e)
-        {
+        {
-            SearchBar searchBar = (SearchBar)sender;
+            SearchBar searchBar = (SearchBar)sender;
-            listeFavs.ItemsSource = manager.RechercheObjetOhara(searchBar.Text, manager.GetFavoris());
+            listeFavs.ItemsSource = manager.RechercheObjetOhara(searchBar.Text, manager.GetFavoris());
-        }
+        }
-        searchBar.TextChanged += OnTextChanged;
+        searchBar.TextChanged += OnTextChanged;
-
+
-    }
+    }
-    async void listeFavs_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    async void listeFavs_SelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
+    {
-        Type t = listeFavs.SelectedItem.GetType();
+        Type t = listeFavs.SelectedItem.GetType();
-        Console.WriteLine(t);
+        Console.WriteLine(t);
-        if (t.Equals(typeof(Bateau)))
+        if (t.Equals(typeof(Bateau)))
-            await Navigation.PushAsync(new PageInfoBateau((Bateau)listeFavs.SelectedItem));
+            await Navigation.PushAsync(new PageInfoBateau());
-        else if (t.Equals(typeof(Equipage)))
+        else if (t.Equals(typeof(Equipage)))
-            await Navigation.PushAsync(new PageInfoEquipage((Equipage)listeFavs.SelectedItem));
+            await Navigation.PushAsync(new PageInfoEquipage((Equipage)listeFavs.SelectedItem));
-        else if (t.Equals(typeof(Personnage)))
+        else if (t.Equals(typeof(Personnage)))
-            await Navigation.PushAsync(new PageInfoPersonnage((Personnage)listeFavs.SelectedItem));
+            await Navigation.PushAsync(new PageInfoPersonnage((Personnage)listeFavs.SelectedItem));
-        else if (t.Equals(typeof(Ile)))
+        else if (t.Equals(typeof(Ile)))
-            await Navigation.PushAsync(new PageInfoIle((Ile)listeFavs.SelectedItem));
+            await Navigation.PushAsync(new PageInfoIle((Ile)listeFavs.SelectedItem));
-        else if (t.Equals(typeof(FruitDuDemon)))
+        else if (t.Equals(typeof(FruitDuDemon)))
-            await Navigation.PushAsync(new PageInfoFdd((FruitDuDemon)listeFavs.SelectedItem));
+            await Navigation.PushAsync(new PageInfoFdd((FruitDuDemon)listeFavs.SelectedItem));
-        else if (t.Equals(typeof(Bestiaire)))
+        else if (t.Equals(typeof(Bestiaire)))
-            await Navigation.PushAsync(new PageInfoBestiaire((Bestiaire)listeFavs.SelectedItem));
+            await Navigation.PushAsync(new PageInfoBestiaire((Bestiaire)listeFavs.SelectedItem));
-
+
-    }
+    }
+
+    private void Button_Clicked(object sender, EventArgs e)
+    {
+        listeFavs.ItemsSource = manager.GetBateaux();
+    }
 }

Sources/Ohara/PageInfoBateau.xaml

@@ -15,7 +15,7 @@
                     <ColumnDefinition Width="40*"/>
                 </Grid.ColumnDefinitions>
                 <VerticalStackLayout Grid.Column="0" Spacing="4">
-                    <Button x:Name="ButtonFav" Text="Ajouter aux favoris" Style="{StaticResource buttonFavsInfo}"/>
+                    <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/PageInfoBateau.xaml.cs

@@ -6,15 +6,24 @@ namespace Ohara;
 
 public partial class PageInfoBateau : ContentPage
 {
+    public Manager manager => (App.Current as App).manager;
     public ICommand AjouterFavs { get; private set; }
-    public PageInfoBateau(Bateau bateau)
+    public PageInfoBateau()
     {
         InitializeComponent();
+        if(manager.SelectedItem.EstFavori==true)
+        {
+            bouttonFav.IsEnabled = false;
+            bouttonFav.Text = "Ajouté au favoris";
+        }
+        BindingContext=manager.SelectedItem;
 
-        BindingContext=bateau;
-        AjouterFavs = new Command(() => bateau.EstFavori = true);
-        ButtonFav.Command = AjouterFavs;
     }
 
-    
+    private void AjouterFav_Clicked(object sender, EventArgs e)
+    {
+       manager.AddFavoris(manager.SelectedItem);
+       bouttonFav.IsEnabled = false;
+       bouttonFav.Text = "Ajouté au favoris";
+    }
 }

Sources/Ohara/Resources/Styles/Styles.xaml

@@ -671,6 +671,15 @@
                             <Setter Property="Padding" Value="17"/>
                         </VisualState.Setters>
                     </VisualState>
+                    <VisualState x:Name="Disabled">
+                    <VisualState.Setters>
+                            <Setter Property="BackgroundColor" Value="Grey"/>
+                            <Setter Property="TextColor" Value="White"/>
+                            <Setter Property="FontSize" Value="20"/>
+                            <Setter Property="Padding" Value="17"/>
+                            
+                        </VisualState.Setters>
+                    </VisualState>
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>

Sources/TestConsole/Program.cs

@@ -7,20 +7,14 @@ var manager = new Manager();
 var xml = new XML_Serializer();
 
 
-Bestiaire luffy = new Bestiaire("test", "", "", "");
+Bateau luffy = new Bateau("Sunny", "", 15, 15,"","");
-/*
+ObjetOhara b = luffy;
-xml.SetPersonnage(manager.GetPersonnages().ToList());
+Console.WriteLine(luffy.EstFavori);
-xml.SetFDD(manager.GetFruits().ToList());
-xml.SetBateau(manager.GetBateaux().ToList());
-xml.SetBestiaire(manager.GetBestiaires().ToList());
-xml.SetEquipage(manager.GetEquipages().ToList());
-xml.SetIle(manager.GetIles().ToList());
-*/
 
+manager.AddFavoris(b);
 
-Type t = luffy.GetType();
+foreach(Bateau s in manager.Bateaux)
-if (t.Equals(typeof(Bestiaire)))
+{
-    Console.WriteLine(luffy.Nom);
+    Console.WriteLine(s.Nom);
-
+    Console.WriteLine(s.EstFavori);
-    
+}
-Console.WriteLine(t.Equals(typeof(Bestiaire)));