Début manager

Sources/Model/IDataManager.cs

@@ -8,11 +8,11 @@ namespace Model
 {
     public interface IDataManager
     {
-        IEnumerable<Bateau> RecupererBateau();
+        //IEnumerable<Bateau> GetsBateaux();
-        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/Manager.cs

@@ -1,12 +1,57 @@
-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 List<Personnage> Personnages { get; set; }
+        public List<FruitDuDemon> Fruits { get; set; }
+        public List<Equipage> Equipages { get; set; }
+        public List<Bateau> Bateaux { get; set; }
+        public List<Bestiaire> Bestiaires { get; set; }
+        public List<Ile> Iles { get; set; }
+
+        public Manager() {
+            DataManager = new StubManager();
+            //Personnages =  DataManager.GetPersonnages();
+            //Fruits = DataManager.GetFruits();
+            //Equipages = Stub.GetEquipages();
+            //Bateaux = Stub.GetBateaux();
+            //Bestiaires = Stub.GetBestiaires();
+            //Iles = Stub.GetIles();
+        }
+
+        public List<Personnage> GetPersonnages()
+        {
+            return Personnages;
+        }
+        public List<FruitDuDemon> GetFruits()
+        {
+            return Fruits;
+        }
+        public List<Equipage> GetEquipages()
+        {
+            return Equipages;
+        }
+        public List<Bateau> GetBateaux()
+        {
+            return Bateaux;
+        }
+        public List<Bestiaire> GetBestiaires()
+        {
+            return Bestiaires;
+        }
+        public List<Ile> GetIles()
+        {
+            return Iles;
+        }
     }
 }

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 List<Personnage> GetPersonnages()
+        {
+            return StubPersonnage.RecupererPersonnage().ToList();
+        }
+
+        public List<FruitDuDemon> GetFruits()
+        {
+            return StubFruitDuDemon.RecupererFruit().ToList();
+        }
+        public List<Equipage> GetEquipages()
+        {
+            return StubEquipage.RecupererEquipage().ToList();
+        }
+        public List<Bateau> GetBateaux()
+        {
+            return StubBateau.RecupererBateau().ToList();
+        }
+        public List<Bestiaire> GetBestiaires()
+        {
+            return StubBestiaire.RecupererBestiaire().ToList();
+        }
+        public List<Ile> GetIles()
+        {
+            return StubIle.RecupererIle().ToList();
+        }
+    }
+}

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:PageInfoBestiaire}"
+        ContentTemplate="{DataTemplate local:PageFDD}"
         Route="PageInfoBestiaire" />   
             
 

Sources/Ohara/PageFDD.xaml

@@ -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*"/>
@@ -58,9 +58,9 @@
             <CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20"  >
+                        <Grid Padding="20"  >
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="25*"/>
+                                <ColumnDefinition Width="33*"/>
                               
                             </Grid.ColumnDefinitions>