diff --git a/Sources/IHM/App.xaml.cs b/Sources/IHM/App.xaml.cs
index c5f7639..2f0051b 100644
--- a/Sources/IHM/App.xaml.cs
+++ b/Sources/IHM/App.xaml.cs
@@ -10,15 +10,13 @@ namespace IHM
{
InitializeComponent();
- MainPage = new AppShell();
-
- if(OperatingSystem.IsWindows())
+ if(OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
{
- MainPage = new UI_Windows.MainPage_Windows();
+ MainPage = new AppShellDesktop();
}
- else if(OperatingSystem.IsAndroid() || OperatingSystem.IsIOS())
+ else
{
- MainPage = new MainPage();
+ MainPage = new AppShell();
}
}
diff --git a/Sources/IHM/AppShell.xaml b/Sources/IHM/AppShell.xaml
index cdeba6e..f5e6baf 100644
--- a/Sources/IHM/AppShell.xaml
+++ b/Sources/IHM/AppShell.xaml
@@ -3,7 +3,7 @@
x:Class="IHM.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
- xmlns:local="clr-namespace:IHM"
+ xmlns:local="clr-namespace:IHM.Mobile"
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False">
diff --git a/Sources/IHM/AppShell.xaml.cs b/Sources/IHM/AppShell.xaml.cs
index 4c9338a..4ab868a 100644
--- a/Sources/IHM/AppShell.xaml.cs
+++ b/Sources/IHM/AppShell.xaml.cs
@@ -1,4 +1,5 @@
-using Model;
+using IHM.Mobile;
+using Model;
namespace IHM
{
diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
new file mode 100644
index 0000000..a1e8bdc
--- /dev/null
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
new file mode 100644
index 0000000..5193cab
--- /dev/null
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -0,0 +1,19 @@
+using IHM.Desktop;
+using Model;
+
+namespace IHM
+{
+ public partial class AppShellDesktop : Shell
+ {
+ public Manager Mgr => (App.Current as App).Manager;
+
+ public AppShellDesktop()
+ {
+ InitializeComponent();
+ }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/MainPage_Windows.xaml b/Sources/IHM/Desktop/MainPage_Windows.xaml
index 2357a9a..35e5964 100644
--- a/Sources/IHM/Desktop/MainPage_Windows.xaml
+++ b/Sources/IHM/Desktop/MainPage_Windows.xaml
@@ -1,13 +1,10 @@
-
+
diff --git a/Sources/IHM/Desktop/MainPage_Windows.xaml.cs b/Sources/IHM/Desktop/MainPage_Windows.xaml.cs
index a9e298e..d098707 100644
--- a/Sources/IHM/Desktop/MainPage_Windows.xaml.cs
+++ b/Sources/IHM/Desktop/MainPage_Windows.xaml.cs
@@ -1,7 +1,7 @@
using Model;
using System.Windows.Input;
-namespace IHM.UI_Windows;
+namespace IHM.Desktop;
public partial class MainPage_Windows : ContentPage
{
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index a4e594d..4c6f59b 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -77,6 +77,15 @@
+
+ AppShellDesktop.xaml
+
+
+
+
+
+ MSBuild:Compile
+
MSBuild:Compile
diff --git a/Sources/IHM/Mobile/ChangePassword.xaml b/Sources/IHM/Mobile/ChangePassword.xaml
index 673404d..a9703dc 100644
--- a/Sources/IHM/Mobile/ChangePassword.xaml
+++ b/Sources/IHM/Mobile/ChangePassword.xaml
@@ -1,7 +1,7 @@