readme création des classes pour diagramme de classe + début CI

CI.drone.yml

@@ -0,0 +1,26 @@
+kind: pipeline
+type: docker
+name: CI_Ohara
+
+trigger:
+  event:
+    - push
+
+steps:
+  - name: build
+    image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest
+    commands:
+      - cd Sources/
+      - dotnet restore Ohara.sln
+      - dotnet build Ohara.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
+      - dotnet publish Ohara/Ohara.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk
+
+  - name: tests
+    image: mcr.microsoft.com/dotnet/sdk:7.0
+    commands:
+      - cd Sources/
+      - dotnet restore Ohara.sln
+      - dotnet test Ohara.sln --no-restore
+    depends_on: [build]
+
+

README.md

@@ -1,2 +1,61 @@
 # Ohara_MAUI
-Test
+```mermaid
+classDiagram
+    class Bateau{
+        -NomRomanise : string
+        -PremierChap : int
+        -PremierEp : int
+        -Description : string
+        -Caracteristique : string
+    }
+
+    class Bestiaire {
+        -Origine : string
+        -Description : string
+        -Caracteristique : string
+    }
+
+    class Equipage {
+        -NomRomanise : string
+        -Region : string
+        -PremierChap : int
+        -PremierEp : int
+        -Statut : bool
+        -Description : string
+    }
+
+    class FruitDuDemon {
+        -NomRomanise : string
+        -Type : string
+        -PremierChap : int
+        -PremierEp : int 
+        -Description : string
+        -Forces : string
+        -Faiblesses : string
+    }
+
+    class Ile {
+        -NomRomanise : string
+        -Region : string
+        -PremierChap : int
+        -PremierEp : int
+        -Description : string
+        Geographie : string
+    }
+
+    class Personnage {
+        -Prime : double
+        -Epithete : string
+        -Age : int
+        -Taille : double
+        -Origine : string
+        -Biographie : string
+        -Citation : string
+    }
+
+    class ObjetOhara {
+        -Nom : string
+        -Image : string?
+    }
+```
+

Sources/Model/Bateau.cs

@@ -6,27 +6,27 @@ using System.Threading.Tasks;
 
 namespace Model
 {
-    public class Bateau
+    public class Bateau : ObjetOhara
     {
-        public string Nom { get; set; }
+       
         public string NomRomanise { get; set; }
         public Equipage? Affiliation { get; set; }
         public int PremierChap { get; set; }
         public int PremierEp { get; set; }
         public string Description { get; set; }
         public string Caracteristique { get; set; }
-        public string? Image { get; set; }
+       
         
         
-        public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image) 
+        public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image) : base(nom,image)
         {
-            Nom = nom;
+           
             NomRomanise = nomRomanise;
             PremierChap = premierChap;
             PremierEp = premierEp;
             Description = description;
             Caracteristique = caracteristique;
-            Image= image;
+          
         }
 
         public Bateau(string nom, string nomRomanise, Equipage affiliation, int premierChap, int premierEp, string description, string caracteristique, string image) : this(nom,nomRomanise,premierChap,premierEp,description,caracteristique,image)

Sources/Model/Bestiaire.cs

@@ -7,25 +7,21 @@ using System.Threading.Tasks;
 
 namespace Model
 {
-    public class Bestiaire
+    public class Bestiaire : ObjetOhara
     {
-        public string Nom { get; set; }
+       
         public string Origine { get; set; }
         public string Description { get; set; }
         public string Caracteristique { get; set; }
-        public string? Image { get; set; }
+        
 
-        public Bestiaire(string nom, string origine, string description, string caracteristique)
+        public Bestiaire(string nom, string origine, string description, string caracteristique,string image) : base(nom, image)
         {
-            Nom = nom;
             Origine = origine;
             Description = description;
             Caracteristique = caracteristique;
         }
 
-        public Bestiaire(string nom, string origine, string description, string caracteristique,string image) : this(nom,origine,description,caracteristique)
+        
-        {
-            Image = image;
-        }
     }
 }

Sources/Model/Equipage.cs

@@ -6,11 +6,10 @@ using System.Threading.Tasks;
 
 namespace Model
 {
-    public class Equipage
+    public class Equipage : ObjetOhara
     {
-        public string Nom { get; set; }
+       
         public string NomRomanise { get; set; }
-        
         public string Region { get; set; }
         public int PremierChap { get; set; }
         public int PremierEp { get; set; }
@@ -19,18 +18,18 @@ namespace Model
         public Personnage? Capitaine { get; set; }
         public List<Personnage> Membre { get; set; } = new List<Personnage>();
         public List<Equipage> Allie { get; set; } = new List<Equipage>();
-        public string? Image { get; set; }
+        
 
-        public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description,string image) 
+        public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description,string image) : base(nom,image)
         { 
-            Nom = nom;
+            
             NomRomanise = nomRomanise;
             Region = region;
             PremierChap = premierChap;
             PremierEp = premierEp;
             Statut = statut;
             Description = description;
-            Image = image;
+           
         }
     }
 }

Sources/Model/FruitDuDemon.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace Model
 {
-    public class FruitDuDemon
+    public class FruitDuDemon : ObjetOhara
     {
-        public string Nom { get; set; }
+        
         public string NomRomanise { get; set; }
         public string Type { get; set; }
         public int PremierChap { get; set; }
@@ -17,11 +17,12 @@ namespace Model
         public string Forces { get; set; }
         public string Faiblesses { get; set; }
         public List<Personnage> Utilisateur { get; set; }= new List<Personnage>();
-        public string? Image { get; set; }
+        
+        
 
-        public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses)
+        public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses, string image) : base(nom,image)
         {
-            Nom = nom;
+           
             NomRomanise = nomRomanise;
             Type = type;
             PremierChap = premierChap;
@@ -29,13 +30,9 @@ namespace Model
             Description = description;
             Forces = forces;
             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<Personnage> utilisateur) : this( nom,  nomRomanise,  type,  premierChap,  premierEp,  description,  forces,  faiblesses) 
+       
+        public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses,string image, List<Personnage> utilisateur) : this( nom,  nomRomanise,  type,  premierChap,  premierEp,  description,  forces,  faiblesses, image) 
         {
             Utilisateur = utilisateur;
         }

Sources/Model/IDataManager.cs

@@ -8,11 +8,11 @@ namespace Model
 {
     public interface IDataManager
     {
-        IEnumerable<Bateau> RecupererBateau();
+        IEnumerable<Bateau> GetBateaux();
-        IEnumerable<Bestiaire> RecupererBestiaire();
+        IEnumerable<Bestiaire> GetBestiaires();
-        IEnumerable<Equipage> RecupererEquipage();
+        IEnumerable<Equipage> GetEquipages();
-        IEnumerable<FruitDuDemon> RecupererFruit();
+        IEnumerable<FruitDuDemon> GetFruits();
-        IEnumerable<Ile> RecupererIle();
+        IEnumerable<Ile> GetIles();
-        IEnumerable<Personnage> RecupererPersonnage();
+        IEnumerable<Personnage> GetPersonnages();
     }
 }

Sources/Model/Ile.cs

@@ -6,28 +6,28 @@ using System.Threading.Tasks;
 
 namespace Model
 {
-    public class Ile
+    public class Ile : ObjetOhara
     {
-        public string Nom { get; set; }
+       
         public string NomRomanise { get; set; }
         public string Region { get; set; }
         public int PremierChap { get; set; }
         public int PremierEp { get; set; }
         public string Description { get; set; }
         public string Geographie { get; set; }
-        public string? Image { get; set; }
+        
 
 
-        public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie, string image) 
+        public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie, string image) : base(nom,image)
         {
-            Nom = nom;
+         
             NomRomanise = nomRomanise;
             Region = region;
             PremierChap = premierChap;
             PremierEp = premierEp;
             Description = description;
             Geographie = geographie;
-            Image = image;
+            
         } 
     }
 }

Sources/Model/Manager.cs

@@ -1,12 +1,59 @@
-using System;
+using Model.Stub;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Model
+    
 {
-    internal class Manager
+    public class Manager
     {
+        public IDataManager DataManager { get; set; }
+
+
+
+        public Manager() {
+            DataManager = new StubManager();
+        }
+
+        public List<Personnage> GetPersonnages()
+        {
+            return DataManager.GetPersonnages().ToList();
+        }
+        public List<FruitDuDemon> GetFruits()
+        {
+            return DataManager.GetFruits().ToList();
+        }
+        public List<Equipage> GetEquipages()
+        {
+            return DataManager.GetEquipages().ToList();
+        }
+        public List<Bateau> GetBateaux()
+        {
+            return DataManager.GetBateaux().ToList();
+        }
+        public List<Bestiaire> GetBestiaires()
+        {
+            return DataManager.GetBestiaires().ToList();
+        }
+        public List<Ile> GetIles()
+        {
+            return DataManager.GetIles().ToList();
+        }
+
+        public List<FruitDuDemon> FiltrerFDD(string type)
+        {
+            List<FruitDuDemon> fdd = GetFruits();
+            foreach(FruitDuDemon f in fdd.ToList())
+            {
+                if(f.Type != type)
+                {
+                    fdd.Remove(f);
+                }
+            }
+            return fdd;
+        }
     }
 }

Sources/Model/ObjetOhara.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class ObjetOhara
+    {
+        public string Nom { get; set; }
+        public string? Image { get; set;} 
+
+        public ObjetOhara(string nom,string image) {
+            Nom = nom;
+            Image = image;
+        }
+    }
+}

Sources/Model/Personnage.cs

@@ -1,8 +1,8 @@
 namespace Model
 {
-    public class Personnage
+    public class Personnage : ObjetOhara
     {
-        public string Nom { get; set; }
+        
         public double Prime { get; set; }
         public string Epithete { get; set; }
         public int Age { get; set; } 
@@ -12,13 +12,13 @@
         public string Citation { get; set; }
         public Equipage? Equipage { get; set; }
         public List<FruitDuDemon> Fruit { get; set; } = new List<FruitDuDemon>();
-        public string? Image { get; set; }
+        
 
 
 
-        public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image) 
+        public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image) : base(nom,image)
         {
-            Nom = nom;
+           
             Prime = prime;
             Epithete = epithete;
             Age = age;
@@ -26,7 +26,7 @@
             Origine = origine;
             Biographie = biographie;
             Citation = citation;  
-            Image = image;
+            
             
         }
         public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation,string image ,Equipage equipage,List<FruitDuDemon> fruit) : this(nom,prime,epithete,age,taille,origine,biographie,citation,image)

Sources/Model/Stub/StubBateau.cs

@@ -7,9 +7,9 @@ using static System.Net.Mime.MediaTypeNames;
 
 namespace Model.Stub
 {
-    public static class StubBateau
+    public class StubBateau
     {
-        public static IEnumerable<Bateau> RecupererBateau()
+        public IEnumerable<Bateau> RecupererBateau()
         {
             List<Bateau> bateau = new List<Bateau>()
             {

Sources/Model/Stub/StubBestiaire.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace Model.Stub
 {
-    public static class StubBestiaire
+    public class StubBestiaire
     {
-        public static IEnumerable<Bestiaire> RecupererBestiaire()
+        public IEnumerable<Bestiaire> RecupererBestiaire()
         {
             List<Bestiaire> best = new List<Bestiaire>()
             {

Sources/Model/Stub/StubEquipage.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace Model.Stub
 {
-    public static class StubEquipage
+    public class StubEquipage
     {
-        public static IEnumerable<Equipage> RecupererEquipage()
+        public IEnumerable<Equipage> RecupererEquipage()
         {
             List<Equipage> Lequipage = new List<Equipage>()
             {

Sources/Model/Stub/StubFruitDuDemon.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace Model.Stub
 {
-    public static class StubFruitDuDemon
+    public class StubFruitDuDemon
     {
-        public static IEnumerable<FruitDuDemon> RecupererFruit()
+        public IEnumerable<FruitDuDemon> RecupererFruit()
         {
             List<FruitDuDemon> fdd = new List<FruitDuDemon>()
             {

Sources/Model/Stub/StubIle.cs

@@ -7,9 +7,9 @@ using static System.Net.Mime.MediaTypeNames;
 
 namespace Model.Stub
 {
-    public static class StubIle
+    public class StubIle
     {
-        public static IEnumerable<Ile> RecupererIle()
+        public IEnumerable<Ile> RecupererIle()
         {
             List<Ile> ile = new List<Ile>()
             {

Sources/Model/Stub/StubManager.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.Stub
+{
+    public class StubManager : IDataManager
+    {
+        
+        public StubPersonnage StubPersonnage { get; set; }
+        public StubFruitDuDemon StubFruitDuDemon { get; set; }
+        public StubEquipage StubEquipage { get; set; }
+        public StubBateau StubBateau { get; set; } 
+        public StubBestiaire StubBestiaire { get; set; }
+        public StubIle StubIle { get; set; }
+        
+        public StubManager()
+        {
+            StubPersonnage = new StubPersonnage();
+            StubFruitDuDemon = new StubFruitDuDemon();
+            StubEquipage = new StubEquipage();
+            StubBateau = new StubBateau();
+            StubBestiaire = new StubBestiaire();
+            StubIle = new StubIle();
+        }
+       
+
+        public IEnumerable<Personnage> GetPersonnages()
+        {
+            return StubPersonnage.RecupererPersonnage();
+        }
+
+        public IEnumerable<FruitDuDemon> GetFruits()
+        {
+            return StubFruitDuDemon.RecupererFruit();
+        }
+        public IEnumerable<Equipage> GetEquipages()
+        {
+            return StubEquipage.RecupererEquipage();
+        }
+        public IEnumerable<Bateau> GetBateaux()
+        {
+            return StubBateau.RecupererBateau();
+        }
+        public IEnumerable<Bestiaire> GetBestiaires()
+        {
+            return StubBestiaire.RecupererBestiaire();
+        }
+        public IEnumerable<Ile> GetIles()
+        {
+            return StubIle.RecupererIle();
+        }
+    }
+}

Sources/Model/Stub/StubPersonnage.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace Model.Stub
 {
-    public static class StubPersonnage
+    public class StubPersonnage
     {
-        public static IEnumerable<Personnage> RecupererPersonnage()
+        public IEnumerable<Personnage> RecupererPersonnage()
         {
             List<Personnage> perso = new List<Personnage>()
             {

Sources/Ohara/AppShell.xaml

@@ -13,7 +13,7 @@
     
     
     <ShellContent
-        ContentTemplate="{DataTemplate local:PageInfoPersonnage}"
+        ContentTemplate="{DataTemplate local:PageFDD}"
         Route="PageInfoBestiaire" />   
             
 

Sources/Ohara/PageBateau.xaml

@@ -54,7 +54,7 @@
             </Grid>
 
             <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
-                <CollectionView x:Name="listeBateau" ItemsLayout="HorizontalList">
+                <CollectionView x:Name="listeBateau" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé.">
                     <CollectionView.ItemTemplate>
                         <DataTemplate>
 

Sources/Ohara/PageBateau.xaml.cs

@@ -12,17 +12,10 @@ public partial class PageBateau : ContentPage
     public PageBateau(IAudioManager audioManager)
 	{
 		InitializeComponent();
-        List<Bateau> bateau = StubBateau.RecupererBateau().ToList();
+        var manager = new Manager();
+        
 
-        listeBateau.ItemsSource = bateau;
+        listeBateau.ItemsSource = manager.GetBateaux();
-        this.audioManager = audioManager;
-    }
-
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
     }
 
     private async void Hyperlink_FDD(object sender, EventArgs e)

Sources/Ohara/PageBestiaire.xaml

@@ -50,7 +50,7 @@
                 </Frame>
             </Grid>
 
-            <CollectionView x:Name="listeBest" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4">
+            <CollectionView x:Name="listeBest" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé.">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
                         <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">

Sources/Ohara/PageBestiaire.xaml.cs

@@ -10,10 +10,10 @@ public partial class PageBestiaire : ContentPage
     {
         InitializeComponent();
 
-        List<Bestiaire> Lbest = StubBestiaire.RecupererBestiaire().ToList();
+        var manager = new Manager();
 
 
-        listeBest.ItemsSource = Lbest;
+        listeBest.ItemsSource = manager.GetBestiaires();
     }
     private async void Hyperlink_Accueil(object sender, EventArgs e)
     {

Sources/Ohara/PageEquipage.xaml

@@ -52,7 +52,7 @@
                     </Frame>
                 </Grid>
 
-                <CollectionView x:Name="listeEquip"  ItemsLayout="VerticalGrid, 4">
+                <CollectionView x:Name="listeEquip"  ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé.">
                     <CollectionView.ItemTemplate>
                         <DataTemplate>
                             <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">

Sources/Ohara/PageEquipage.xaml.cs

@@ -7,12 +7,12 @@ public partial class PageEquipage : ContentPage
 	public PageEquipage()
 	{
 		InitializeComponent();
-        List<Equipage> Lequipage = StubEquipage.RecupererEquipage().ToList();
+        var manager = new Manager();
-        listeEquip.ItemsSource = Lequipage;
+         listeEquip.ItemsSource = manager.GetEquipages();
     }
     private async void Hyperlink_Accueil(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+        await Navigation.PushAsync(new MainPage());
     }
 
     private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -31,7 +31,7 @@ public partial class PageEquipage : ContentPage
     }
     private async void Hyperlink_Bateau(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+        await Navigation.PushAsync(new PageBateau());
     }
 
     private async void Hyperlink_Bestiaire(object sender, EventArgs e)

Sources/Ohara/PageFDD.xaml

@@ -4,7 +4,7 @@
              x:Class="Ohara.PageFDD"
              Title="PageFDD"
              BackgroundColor="#e2edf1">
-
+    
 
     <Grid>
 
@@ -15,25 +15,25 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="90*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
+            <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
 
-            <Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
+                <Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
-                <Image.Clip>
+                    <Image.Clip>
-                    <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
+                        <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
-                </Image.Clip>
+                    </Image.Clip>
-            </Image>
+                </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
+                <Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
+                <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+            </VerticalStackLayout>
-        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
+            <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
                 <Grid.RowDefinitions>
                     <RowDefinition Height="10*"/>
@@ -46,21 +46,21 @@
                 </Grid.ColumnDefinitions>
                 <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0" x:Name="searchBar" />
 
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                <Button Text="Filtrer" x:Name="Logia" 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>
 
-            <CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4">
+            <CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé.">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20"  >
+                        <Grid Padding="20"  >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="25*"/>
+                                <ColumnDefinition Width="33*"/>
                               
                             </Grid.ColumnDefinitions>
                            

Sources/Ohara/PageFDD.xaml.cs

@@ -1,19 +1,26 @@
-namespace Ohara;
+namespace Ohara;
+
 
 using Model;
 using Model.Stub;
+using System.Windows.Input;
+
 public partial class PageFDD : ContentPage
 {
-
+    public ICommand FiltrerType { get; private set; }
 	public PageFDD()
 	{
-      
+       
-        InitializeComponent();
+        InitializeComponent();
-		List<FruitDuDemon> fdd = StubFruitDuDemon.RecupererFruit().ToList();
+
-
+        var manager = new Manager();
-
+       
-        listeFDD.ItemsSource = fdd;
+
-	}
+        listeFDD.ItemsSource = manager.GetFruits();
+        FiltrerType = new Command(() => listeFDD.ItemsSource = manager.FiltrerFDD("Logia"));
+        Logia.Command = FiltrerType;
+           
+    }
 
     private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
     {

Sources/Ohara/PageIle.xaml

@@ -54,7 +54,7 @@
             </Grid>
 
             <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
-                <CollectionView x:Name="listeIle" ItemsLayout="HorizontalList">
+                <CollectionView x:Name="listeIle" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé.">
                     <CollectionView.ItemTemplate>
                         <DataTemplate>
 

Sources/Ohara/PageIle.xaml.cs

@@ -8,10 +8,10 @@ public partial class PageIle : ContentPage
 	public PageIle()
 	{
 		InitializeComponent();
-        List<Ile> ile = StubIle.RecupererIle().ToList();
+        var manager = new Manager();
 
 
-        listeIle.ItemsSource = ile;
+        listeIle.ItemsSource = manager.GetIles();
     }
 
     private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)

Sources/Ohara/PageInfoBestiaire.xaml.cs

@@ -8,10 +8,10 @@ public partial class PageInfoBestiaire : ContentPage
 	public PageInfoBestiaire()
 	{
 		InitializeComponent();
-        List<Bestiaire> Lbest = StubBestiaire.RecupererBestiaire().ToList();
+        var manager = new Manager();
-
+
-
+
-        listeBest.ItemsSource = Lbest;
+         listeBest.ItemsSource = manager.GetBestiaires();
     }
 
     private async void Hyperlink_Accueil(object sender, EventArgs e)

Sources/Ohara/PageInfoEquipage.xaml.cs

@@ -8,12 +8,12 @@ public partial class PageInfoEquipage : ContentPage
 	public PageInfoEquipage()
 	{
 		InitializeComponent();
-       
 
-        List<Equipage> Lequipage = StubEquipage.RecupererEquipage().ToList();
 
+        var manager = new Manager();
 
-        listeEquip.ItemsSource = Lequipage;
+
+       listeEquip.ItemsSource = manager.GetEquipages();
     }
     private async void Hyperlink_Accueil(object sender, EventArgs e)
     {

Sources/Ohara/PageInfoFdd.xaml.cs

@@ -8,8 +8,8 @@ public partial class PageInfoFdd : ContentPage
 	public PageInfoFdd()
 	{
 		InitializeComponent();
-        List<FruitDuDemon> fdd = StubFruitDuDemon.RecupererFruit().ToList();
+        var manager = new Manager();
-        listObj.ItemsSource = fdd;
+        listObj.ItemsSource = manager.GetFruits();
     }
 
     private async void Hyperlink_Accueil(object sender, EventArgs e)

Sources/Ohara/PagePersonnage.xaml

@@ -57,7 +57,7 @@
             </Grid>
 
             <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
-                <CollectionView x:Name="listePerso" ItemsLayout="HorizontalList">
+                <CollectionView x:Name="listePerso" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé.">
                     <CollectionView.ItemTemplate>
                         <DataTemplate>
 

Sources/Ohara/PagePersonnage.xaml.cs

@@ -9,10 +9,10 @@ public partial class PagePersonnage : ContentPage
     {
 
         InitializeComponent();
-        List<Personnage> perso = StubPersonnage.RecupererPersonnage().ToList();
+        var manager = new Manager();
 
 
-        listePerso.ItemsSource = perso;
+        listePerso.ItemsSource = manager.GetPersonnages();
     }
 
     private async void Hyperlink_Accueil(object sender, EventArgs e)

Sources/TestConsole/Program.cs

@@ -1,3 +1,8 @@
 // See https://aka.ms/new-console-template for more information
 using Model;
 
+var manager = new Manager();
+
+foreach (Bateau b in manager.GetBateaux()){
+    Console.WriteLine(b.Nom);
+}