dossiers pour ranger les classes et les managers

Sources/Model/Classes/Bateau.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "bateau")]
     public class Bateau : ObjetOhara
@@ -50,12 +50,12 @@ namespace Model
             Caracteristique = caracteristique;
 
         }
-        public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image ) : this(nom,nomRomanise,premierChap,premierEp,description,caracteristique)
+        public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image) : this(nom, nomRomanise, premierChap, premierEp, description, 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)
+        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)
         {
             Affiliation = affiliation;
         }

Sources/Model/Classes/Bestiaire.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "bestiaire")]
     public class Bestiaire : ObjetOhara
@@ -28,9 +28,9 @@ namespace Model
             Caracteristique = caracteristique;
         }
 
-        public Bestiaire(string nom, string origine, string description, string caracteristique,string image ) : this(nom,origine,description,caracteristique)
+        public Bestiaire(string nom, string origine, string description, string caracteristique, string image) : this(nom, origine, description, caracteristique)
         {
-            Image=image;
+            Image = image;
         }
 
 

Sources/Model/Classes/Equipage.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "equipage")]
     public class Equipage : ObjetOhara
@@ -36,7 +36,7 @@ namespace Model
 
             NomRomanise = nomRomanise;
             Region = region;
-            if(premierEp < 0)
+            if (premierEp < 0)
             {
                 PremierEp = 0;
             }
@@ -44,7 +44,7 @@ namespace Model
             {
                 PremierEp = premierEp;
             }
-            if(premierChap  < 0)
+            if (premierChap < 0)
             {
                 premierChap = 0;
             }
@@ -57,7 +57,7 @@ namespace Model
 
         }
 
-        public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description, string image) : this(nom, nomRomanise,region,premierChap,premierEp,statut,description)
+        public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description, string image) : this(nom, nomRomanise, region, premierChap, premierEp, statut, description)
         {
 
             Image = image;

Sources/Model/Classes/FruitDuDemon.cs

@@ -6,12 +6,12 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "fruitdudemon")]
     public class FruitDuDemon : ObjetOhara
     {
-        [DataMember (Name = "nomromanise")]
+        [DataMember(Name = "nomromanise")]
         public string NomRomanise { get; set; }
         [DataMember(Name = "type")]
         public string Type { get; set; }
@@ -25,8 +25,8 @@ namespace Model
         public string Forces { get; set; }
         [DataMember(Name = "faiblesses")]
         public string Faiblesses { get; set; }
-        [DataMember(Name = "utilisateur",EmitDefaultValue = false)]
+        [DataMember(Name = "utilisateur", EmitDefaultValue = false)]
-        public List<Personnage> Utilisateur { get; set; }= new List<Personnage>();
+        public List<Personnage> Utilisateur { get; set; } = new List<Personnage>();
 
 
 
@@ -56,13 +56,13 @@ namespace Model
             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)
+        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,string image, List<Personnage> utilisateur) : this( nom,  nomRomanise,  type,  premierChap,  premierEp,  description,  forces,  faiblesses, image) 
+        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/Classes/Ile.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "ile")]
     public class Ile : ObjetOhara
@@ -52,7 +52,7 @@ namespace Model
 
         }
 
-        public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie, string image) : this(nom,nomRomanise,region,premierChap,premierEp,description,geographie)
+        public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie, string image) : this(nom, nomRomanise, region, premierChap, premierEp, description, geographie)
         {
 
             Image = image;

Sources/Model/Classes/ObjetOhara.cs

@@ -5,19 +5,19 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "objetohara")]
     public class ObjetOhara
     {
-        [DataMember (Name = "nom")]
+        [DataMember(Name = "nom")]
         public string Nom { get; set; }
-        [DataMember (Name ="image")]
+        [DataMember(Name = "image")]
-        public string? Image { get; set;}
+        public string? Image { get; set; }
 
         public bool EstFavori { get; set; }
 
-        public ObjetOhara(string nom,string image = "baseimage.png", bool estFavori = false)
+        public ObjetOhara(string nom, string image = "baseimage.png", bool estFavori = false)
         {
             Nom = nom;
             Image = image;

Sources/Model/Classes/Personnage.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace Model
+namespace Model.Classes
 {
     [DataContract(Name = "personnage")]
     public class Personnage : ObjetOhara
@@ -19,9 +19,9 @@ namespace Model
         public string Biographie { get; set; }
         [DataMember(Name = "citation")]
         public string Citation { get; set; }
-        [DataMember(Name="equipage",EmitDefaultValue = false)]
+        [DataMember(Name = "equipage", EmitDefaultValue = false)]
         public Equipage? Equipage { get; set; }
-        [DataMember(Name="fruit",EmitDefaultValue = false)]
+        [DataMember(Name = "fruit", EmitDefaultValue = false)]
         public List<FruitDuDemon> Fruit { get; set; } = new List<FruitDuDemon>();
 
 
@@ -29,7 +29,7 @@ namespace Model
 
         public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation) : base(nom)
         {
-            if(prime < 0)
+            if (prime < 0)
             {
                 Prime = 0;
             }
@@ -39,13 +39,13 @@ namespace Model
             }
             Epithete = epithete;
             Age = age;
-            if(taille < 0)
+            if (taille < 0)
             {
                 Taille = 0;
             }
             else
             {
-                Taille= taille;
+                Taille = taille;
             }
 
             Origine = origine;
@@ -55,11 +55,11 @@ namespace Model
 
         }
 
-        public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image) : this(nom, prime,epithete,age,taille,origine,biographie,citation)
+        public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image) : this(nom, prime, epithete, age, taille, origine, biographie, 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)
+        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)
         {
             Equipage = equipage;
             Fruit = fruit;

Sources/Model/Managers/IDataManager.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 
-namespace Model
+namespace Model.Managers
 {
     public interface IDataManager
     {

Sources/Model/Managers/Manager.cs

@@ -1,11 +1,12 @@
-using Model.Stub;
+using Model.Classes;
+using Model.Stub;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Managers
 
 {
     public class Manager
@@ -14,7 +15,8 @@ namespace Model
 
 
 
-        public Manager() {
+        public Manager()
+        {
             DataManager = new StubManager();
         }
 
@@ -46,9 +48,9 @@ namespace Model
         public List<FruitDuDemon> FiltrerFDD(string type)
         {
             List<FruitDuDemon> fdd = GetFruits();
-            foreach(FruitDuDemon f in fdd.ToList())
+            foreach (FruitDuDemon f in fdd.ToList())
             {
-                if(f.Type != type)
+                if (f.Type != type)
                 {
                     fdd.Remove(f);
                 }
@@ -56,21 +58,23 @@ namespace Model
             return fdd;
         }
 
-        public List<FruitDuDemon> RechercheFDD(string text,List<FruitDuDemon> listeFDD)
+        public List<FruitDuDemon> RechercheFDD(string text, List<FruitDuDemon> listeFDD)
+        {
+            if (text == "")
             {
-            if (text == "") { 
                 return listeFDD;
             }
-            foreach(FruitDuDemon f in listeFDD.ToList())
+            foreach (FruitDuDemon f in listeFDD.ToList())
             {
                 bool correspondance = false;
                 int textPos = 0;
-                for (int i = 0; i < (f.Nom.Length); i++) {
+                for (int i = 0; i < f.Nom.Length; i++)
+                {
                     if (string.Equals(text[textPos].ToString(), f.Nom[i].ToString(), StringComparison.OrdinalIgnoreCase))
                     {
                         textPos++;
                     }
-                    if(textPos == text.Length)
+                    if (textPos == text.Length)
                     {
                         correspondance = true;
                         break;
@@ -94,7 +98,7 @@ namespace Model
             listeFavoris.AddRange(GetFruits());
             listeFavoris.AddRange(GetBestiaires());
             listeFavoris.AddRange(GetPersonnages());
-            foreach(ObjetOhara obj in listeFavoris.ToList())
+            foreach (ObjetOhara obj in listeFavoris.ToList())
             {
                 if (obj.EstFavori == true)
                 {

Sources/Model/Model.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

Sources/Model/Serializer/XML_Serializer.cs

@@ -5,6 +5,8 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using Model.Classes;
+using Model.Managers;
 
 namespace Model.Serializer
 {

Sources/Model/Stub/StubBateau.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace Model.Stub

Sources/Model/Stub/StubBestiaire.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 
 namespace Model.Stub
 {

Sources/Model/Stub/StubEquipage.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 
 namespace Model.Stub
 {

Sources/Model/Stub/StubFruitDuDemon.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 
 namespace Model.Stub
 {

Sources/Model/Stub/StubIle.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace Model.Stub

Sources/Model/Stub/StubManager.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
+using Model.Managers;
 
 namespace Model.Stub
 {

Sources/Model/Stub/StubPersonnage.cs

@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Classes;
 
 namespace Model.Stub
 {

Sources/Ohara/App.xaml.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Managers;
 using Plugin.Maui.Audio;
 
 namespace Ohara;

Sources/Ohara/PageBateau.xaml.cs

@@ -1,6 +1,7 @@
 using Model.Stub;
-using Model;
 using Plugin.Maui.Audio;
+using Model.Classes;
+using Model.Managers;
 
 namespace Ohara;
 

Sources/Ohara/PageBestiaire.xaml.cs

@@ -1,7 +1,8 @@
 using Model.Stub;
-using Model;
 using Plugin.Maui.Audio;
 using System.Windows.Input;
+using Model.Classes;
+using Model.Managers;
 
 namespace Ohara;
 

Sources/Ohara/PageEquipage.xaml.cs

@@ -1,5 +1,6 @@
 namespace Ohara;
-using Model;
+using Model.Classes;
+using Model.Managers;
 using Model.Stub;
 using Plugin.Maui.Audio;
 

Sources/Ohara/PageFDD.xaml.cs

@@ -1,7 +1,8 @@
 namespace Ohara;
 
 
-using Model;
+using Model.Classes;
+using Model.Managers;
 using Model.Stub;
 using Plugin.Maui.Audio;
 using System.Windows.Input;

Sources/Ohara/PageFavoris.xaml.cs

@@ -1,4 +1,5 @@
-using Model;
+using Model.Classes;
+using Model.Managers;
 using Plugin.Maui.Audio;
 
 namespace Ohara;

Sources/Ohara/PageIle.xaml.cs

@@ -1,6 +1,7 @@
 using Model.Stub;
-using Model;
 using Plugin.Maui.Audio;
+using Model.Classes;
+using Model.Managers;
 
 namespace Ohara;
 

Sources/Ohara/PageInfoBateau.xaml.cs

@@ -1,6 +1,6 @@
 using Model.Stub;
-using Model;
 using System.Windows.Input;
+using Model.Classes;
 
 namespace Ohara;
 

Sources/Ohara/PageInfoBestiaire.xaml.cs

@@ -1,5 +1,5 @@
 using Model.Stub;
-using Model;
+using Model.Classes;
 
 namespace Ohara;
 

Sources/Ohara/PageInfoEquipage.xaml.cs

@@ -1,5 +1,5 @@
 using Model.Stub;
-using Model;
+using Model.Classes;
 
 namespace Ohara;
 

Sources/Ohara/PageInfoFdd.xaml.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using Model.Stub;
 
 namespace Ohara;

Sources/Ohara/PageInfoIle.xaml.cs

@@ -1,5 +1,5 @@
 using Model.Stub;
-using Model;
+using Model.Classes;
 
 namespace Ohara;
 

Sources/Ohara/PageInfoPersonnage.xaml.cs

@@ -1,7 +1,6 @@
 using Model.Stub;
-using Model;
 using Plugin.Maui.Audio;
-
+using Model.Classes;
 
 namespace Ohara;
 

Sources/Ohara/PagePersonnage.xaml.cs

@@ -1,6 +1,7 @@
 namespace Ohara;
 
-using Model;
+using Model.Classes;
+using Model.Managers;
 using Model.Stub;
 
 

Sources/TestConsole/Program.cs

@@ -1,5 +1,6 @@
 // See https://aka.ms/new-console-template for more information
 using Model;
+using Model.Classes;
 using Model.Serializer;
 
 var manager = new Manager();

Sources/TestProject1/TestBateau.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Sources/TestProject1/TestBestiaire.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Sources/TestProject1/TestEquipage.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Sources/TestProject1/TestFDD.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Sources/TestProject1/TestIle.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Sources/TestProject1/TestPersonnage.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Classes;
 using System;
 using System.Collections.Generic;
 using System.Linq;