diff --git a/MangaMap/App.xaml.cs b/MangaMap/App.xaml.cs
index 902c919..e7f4845 100644
--- a/MangaMap/App.xaml.cs
+++ b/MangaMap/App.xaml.cs
@@ -1,6 +1,7 @@
-using MangaMap.Model;
+using Models;
using MangaMap.Stub;
using MangaMap.Views;
+using System.Diagnostics;
namespace MangaMap;
@@ -49,7 +50,7 @@ public partial class App : Application
if (!File.Exists(Path.Combine(FilePath, FileName)))
{
- MyManager.Persistance = new DataContractXML(); // Utilise le Stub comme moyen de persistance.
+ MyManager.Persistance = new Stub.DataContractXML(); // Utilise le Stub comme moyen de persistance.
//MyManager = new Manager(new Stub.DataContractJSON());
}
diff --git a/MangaMap/CustomHeader.xaml.cs b/MangaMap/CustomHeader.xaml.cs
index f62f384..c845dda 100644
--- a/MangaMap/CustomHeader.xaml.cs
+++ b/MangaMap/CustomHeader.xaml.cs
@@ -1,6 +1,6 @@
using MangaMap.Views;
namespace MangaMap;
-using MangaMap.Model;
+using Models;
using System.ComponentModel;
using INotifyPropertyChanged = System.ComponentModel.INotifyPropertyChanged;
diff --git a/MangaMap/MangaMap.csproj b/MangaMap/MangaMap.csproj
index d4b88f9..d11847b 100644
--- a/MangaMap/MangaMap.csproj
+++ b/MangaMap/MangaMap.csproj
@@ -1,11 +1,11 @@

- net7.0;
+ net7.0-android;net7.0-ios;net7.0-maccatalyst
$(TargetFrameworks);net7.0-windows10.0.19041.0
- Exe
+ Exe
MangaMap
true
true
@@ -50,11 +50,17 @@
+
+
+
+
+
+
@@ -129,7 +135,7 @@
-
+
\ No newline at end of file
diff --git a/MangaMap/MangaMap.sln b/MangaMap/MangaMap.sln
index c199b28..499c747 100644
--- a/MangaMap/MangaMap.sln
+++ b/MangaMap/MangaMap.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.0.31611.283
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MangaMap", "MangaMap.csproj", "{1946288E-37BA-420F-89BD-A1C3D4178344}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "..\Models\Models.csproj", "{D13B26C4-A575-4577-A735-0B04DC02BC85}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,6 +19,10 @@ Global
{1946288E-37BA-420F-89BD-A1C3D4178344}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1946288E-37BA-420F-89BD-A1C3D4178344}.Release|Any CPU.Build.0 = Release|Any CPU
{1946288E-37BA-420F-89BD-A1C3D4178344}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {D13B26C4-A575-4577-A735-0B04DC02BC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D13B26C4-A575-4577-A735-0B04DC02BC85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D13B26C4-A575-4577-A735-0B04DC02BC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D13B26C4-A575-4577-A735-0B04DC02BC85}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MangaMap/Stub/DataContract.cs b/MangaMap/Stub/DataContract.cs
index 1f3ba71..2c5f255 100644
--- a/MangaMap/Stub/DataContract.cs
+++ b/MangaMap/Stub/DataContract.cs
@@ -1,4 +1,4 @@
-using MangaMap.Model;
+using Models;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/MangaMap/Stub/DataContractJSON.cs b/MangaMap/Stub/DataContractJSON.cs
index 1adf76b..617f310 100644
--- a/MangaMap/Stub/DataContractJSON.cs
+++ b/MangaMap/Stub/DataContractJSON.cs
@@ -1,4 +1,4 @@
-using MangaMap.Model;
+using Models;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/MangaMap/Stub/DataContractXML.cs b/MangaMap/Stub/DataContractXML.cs
index 34df3bc..2def370 100644
--- a/MangaMap/Stub/DataContractXML.cs
+++ b/MangaMap/Stub/DataContractXML.cs
@@ -1,4 +1,4 @@
-using MangaMap.Model;
+using Models;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/MangaMap/Stub/DataToPersist.cs b/MangaMap/Stub/DataToPersist.cs
index 0f30580..6f79fb1 100644
--- a/MangaMap/Stub/DataToPersist.cs
+++ b/MangaMap/Stub/DataToPersist.cs
@@ -1,5 +1,5 @@
using System;
-using MangaMap.Model;
+using Models;
using System.Collections.Generic;
using System.Linq;
using System.Text;
diff --git a/MangaMap/Stub/Stub.cs b/MangaMap/Stub/Stub.cs
index db3f7b3..bb6327a 100644
--- a/MangaMap/Stub/Stub.cs
+++ b/MangaMap/Stub/Stub.cs
@@ -1,4 +1,4 @@
-using MangaMap.Model;
+using Models;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/MangaMap/Views/Composants/ListOeuvre.xaml.cs b/MangaMap/Views/Composants/ListOeuvre.xaml.cs
index 9c8d065..72a153e 100644
--- a/MangaMap/Views/Composants/ListOeuvre.xaml.cs
+++ b/MangaMap/Views/Composants/ListOeuvre.xaml.cs
@@ -1,5 +1,5 @@
namespace MangaMap.Views.Composants;
-using MangaMap.Model;
+using Models;
using System.Xml;
public partial class ListOeuvre : ContentView
diff --git a/MangaMap/Views/Composants/StyleBouton.xaml.cs b/MangaMap/Views/Composants/StyleBouton.xaml.cs
index 9ae2237..e22327b 100644
--- a/MangaMap/Views/Composants/StyleBouton.xaml.cs
+++ b/MangaMap/Views/Composants/StyleBouton.xaml.cs
@@ -1,4 +1,4 @@
-using MangaMap.Model;
+using Models;
namespace MangaMap.Views.Composants
{
diff --git a/MangaMap/Views/CreateOeuvre.xaml.cs b/MangaMap/Views/CreateOeuvre.xaml.cs
index 4fa4d98..9aec412 100644
--- a/MangaMap/Views/CreateOeuvre.xaml.cs
+++ b/MangaMap/Views/CreateOeuvre.xaml.cs
@@ -1,5 +1,5 @@
using System.Text.RegularExpressions;
-using MangaMap.Model;
+using Models;
using static System.Runtime.InteropServices.JavaScript.JSType;
using System.Threading.Tasks;
using Microsoft.Maui.Storage;
diff --git a/MangaMap/Views/FicheAnime.xaml.cs b/MangaMap/Views/FicheAnime.xaml.cs
index ab40e22..8564ae1 100644
--- a/MangaMap/Views/FicheAnime.xaml.cs
+++ b/MangaMap/Views/FicheAnime.xaml.cs
@@ -1,6 +1,6 @@
namespace MangaMap.Views
{
- using Model;
+ using Models;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/MangaMap/Views/homePage.xaml b/MangaMap/Views/homePage.xaml
index e2f52b9..ec60997 100644
--- a/MangaMap/Views/homePage.xaml
+++ b/MangaMap/Views/homePage.xaml
@@ -2,7 +2,7 @@
diff --git a/MangaMap/Views/homePage.xaml.cs b/MangaMap/Views/homePage.xaml.cs
index 8cdc9c4..86f369e 100644
--- a/MangaMap/Views/homePage.xaml.cs
+++ b/MangaMap/Views/homePage.xaml.cs
@@ -1,6 +1,6 @@
namespace MangaMap.Views
{
- using MangaMap.Model;
+ using Models;
using System.Collections.ObjectModel;
///
diff --git a/MangaMap/Views/listPage.xaml.cs b/MangaMap/Views/listPage.xaml.cs
index 2a5ed04..a64e75e 100644
--- a/MangaMap/Views/listPage.xaml.cs
+++ b/MangaMap/Views/listPage.xaml.cs
@@ -1,5 +1,5 @@
namespace MangaMap.Views;
-using MangaMap.Model;
+using Models;
using static System.Net.Mime.MediaTypeNames;
diff --git a/MangaMap/Views/loginAdminPage.xaml.cs b/MangaMap/Views/loginAdminPage.xaml.cs
index bd4f519..fe55a2d 100644
--- a/MangaMap/Views/loginAdminPage.xaml.cs
+++ b/MangaMap/Views/loginAdminPage.xaml.cs
@@ -2,7 +2,7 @@ namespace MangaMap.Views;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using MangaMap.Stub;
-using MangaMap.Model;
+using Models;
///
/// Classe représentant la page de connexion administrateur de l'application.
diff --git a/MangaMap/Views/loginPage.xaml.cs b/MangaMap/Views/loginPage.xaml.cs
index ac3565c..0253dd9 100644
--- a/MangaMap/Views/loginPage.xaml.cs
+++ b/MangaMap/Views/loginPage.xaml.cs
@@ -2,7 +2,7 @@ namespace MangaMap.Views;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using MangaMap.Stub;
-using MangaMap.Model;
+using Models;
///
/// Classe représentant la page de connexion de l'application.
diff --git a/MangaMap/Views/settingsPage.xaml.cs b/MangaMap/Views/settingsPage.xaml.cs
index 6d007c7..bbbdc24 100644
--- a/MangaMap/Views/settingsPage.xaml.cs
+++ b/MangaMap/Views/settingsPage.xaml.cs
@@ -1,5 +1,5 @@
namespace MangaMap.Views;
-using Model;
+using Models;
///
/// Classe représentant la page des paramètres de l'application.
diff --git a/MangaMap/Views/signUpPage.xaml.cs b/MangaMap/Views/signUpPage.xaml.cs
index 8c87c23..180473a 100644
--- a/MangaMap/Views/signUpPage.xaml.cs
+++ b/MangaMap/Views/signUpPage.xaml.cs
@@ -1,6 +1,6 @@
namespace MangaMap.Views;
-using MangaMap.Model;
+using Models;
using System.Text.RegularExpressions;
using static System.Runtime.InteropServices.JavaScript.JSType;
diff --git a/MangaMap/Model/Admin.cs b/Models/Admin.cs
similarity index 91%
rename from MangaMap/Model/Admin.cs
rename to Models/Admin.cs
index a78ef54..56f0154 100644
--- a/MangaMap/Model/Admin.cs
+++ b/Models/Admin.cs
@@ -1,11 +1,10 @@
-using MangaMap.Views;
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace MangaMap.Model
+namespace Models
{
///
/// Représente un administrateur dans le système de gestion de listes d'anime.
diff --git a/MangaMap/Stub/IPersistanceManager.cs b/Models/IPersistanceManager.cs
similarity index 92%
rename from MangaMap/Stub/IPersistanceManager.cs
rename to Models/IPersistanceManager.cs
index 784f4a6..54288d8 100644
--- a/MangaMap/Stub/IPersistanceManager.cs
+++ b/Models/IPersistanceManager.cs
@@ -4,9 +4,8 @@ using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using MangaMap.Model;
-namespace MangaMap.Stub
+namespace Models
{
///
/// Interface pour la gestion de la persistance des données.
diff --git a/MangaMap/Model/Liste.cs b/Models/Liste.cs
similarity index 79%
rename from MangaMap/Model/Liste.cs
rename to Models/Liste.cs
index 81d04f8..6b532d2 100644
--- a/MangaMap/Model/Liste.cs
+++ b/Models/Liste.cs
@@ -1,17 +1,16 @@
using System;
-using MangaMap.Model;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace MangaMap.Model
+namespace Models
{
class Liste
{
public string Nom { get; private set; }
public int NbAnime { get; private set; }
- public Oeuvre[] AnimeListe { get; private set; }
+ public Oeuvre[]? AnimeListe { get; private set; }
public Liste(string nom, int nbAnime)
{
diff --git a/MangaMap/Model/Manager.cs b/Models/Manager.cs
similarity index 82%
rename from MangaMap/Model/Manager.cs
rename to Models/Manager.cs
index 095f99c..e3b508f 100644
--- a/MangaMap/Model/Manager.cs
+++ b/Models/Manager.cs
@@ -6,9 +6,8 @@ using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
-using MangaMap.Stub;
-namespace MangaMap.Model
+namespace Models
{
///
/// Classe responsable de la gestion globale de l'application de gestion de listes d'anime.
@@ -50,7 +49,7 @@ namespace MangaMap.Model
public event PropertyChangedEventHandler? PropertyChanged;
- void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ void OnPropertyChanged([CallerMemberName] string? propertyName = null)
=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
///
@@ -90,21 +89,6 @@ namespace MangaMap.Model
isAdmin = false;
}
- /*public Utilisateur charger()
- {
- var donnees = Persistance.chargeDonne();
- foreach (var item in donnees.Item1)
- {
- Oeuvres.Add(item);
- }
- Utilisateurs.AddRange(donnees.Item2);
-
- // récupérer le premier utilisateur de la liste Utilisateurs :
- Utilisateur utilisateurActuel = Utilisateurs.FirstOrDefault();
-
- return utilisateurActuel; // Renvoyez l'utilisateur actuel
- }*/
-
///
/// Charge les données de l'application à partir du gestionnaire de persistance.
///
diff --git a/Models/Models.csproj b/Models/Models.csproj
new file mode 100644
index 0000000..4658cbf
--- /dev/null
+++ b/Models/Models.csproj
@@ -0,0 +1,9 @@
+
+
+
+ net7.0
+ enable
+ enable
+
+
+
diff --git a/MangaMap/Model/Oeuvre.cs b/Models/Oeuvre.cs
similarity index 97%
rename from MangaMap/Model/Oeuvre.cs
rename to Models/Oeuvre.cs
index 877adc6..6e33fc8 100644
--- a/MangaMap/Model/Oeuvre.cs
+++ b/Models/Oeuvre.cs
@@ -8,7 +8,7 @@ using System.ComponentModel;
using System.Xml.Linq;
using System.Runtime.CompilerServices;
-namespace MangaMap.Model
+namespace Models
{
///
/// Représente une oeuvre dans le système de gestion de listes d'anime.
@@ -18,7 +18,7 @@ namespace MangaMap.Model
{
public event PropertyChangedEventHandler? PropertyChanged;
- void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ void OnPropertyChanged([CallerMemberName] string? propertyName = null)
=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
///
diff --git a/MangaMap/Model/Personne.cs b/Models/Personne.cs
similarity index 94%
rename from MangaMap/Model/Personne.cs
rename to Models/Personne.cs
index 43b00d0..bc7c1da 100644
--- a/MangaMap/Model/Personne.cs
+++ b/Models/Personne.cs
@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
-namespace MangaMap.Model
+namespace Models
{
///
/// Représente une personne dans le système de gestion de listes d'anime.
@@ -17,19 +17,19 @@ namespace MangaMap.Model
/// Obtient ou définit le mot de passe de la personne.
///
[DataMember]
- public string MotDePasse { get; set; }
+ public string? MotDePasse { get; set; }
///
/// Obtient ou définit l'adresse e-mail de la personne.
///
[DataMember]
- public string Email { get; set; }
+ public string? Email { get; set; }
///
/// Obtient ou définit le pseudo de la personne.
///
[DataMember]
- public string Pseudo { get; set; }
+ public string? Pseudo { get; set; }
///
/// Modifie le mot de passe de la personne en vérifiant une confirmation.
diff --git a/MangaMap/Model/Utilisateur.cs b/Models/Utilisateur.cs
similarity index 94%
rename from MangaMap/Model/Utilisateur.cs
rename to Models/Utilisateur.cs
index bc70eff..ca3883b 100644
--- a/MangaMap/Model/Utilisateur.cs
+++ b/Models/Utilisateur.cs
@@ -6,7 +6,7 @@ using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
-namespace MangaMap.Model
+namespace Models
{
///
/// Représente un utilisateur de l'application de gestion de listes d'anime.
@@ -18,13 +18,13 @@ namespace MangaMap.Model
/// Obtient ou définit le nom de l'utilisateur.
///
[DataMember]
- public string nom { get; private set; }
+ public string? nom { get; private set; }
///
/// Obtient ou définit le prénom de l'utilisateur.
///
[DataMember]
- public string prenom { get; private set; }
+ public string? prenom { get; private set; }
///
/// Obtient ou définit l'âge de l'utilisateur.