diff --git a/LivreLand.sln b/LivreLand.sln index 104fd74..9e8b91f 100644 --- a/LivreLand.sln +++ b/LivreLand.sln @@ -4,8 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LivreLand", "LivreLand\LivreLand.csproj", "{0E95A11F-0D16-4CC3-82CD-E3BE44C28B2B}" + ProjectSection(ProjectDependencies) = postProject + {7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E} = {7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E} + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj", "{7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ViewModels", "ViewModels\ViewModels.csproj", "{72B707A3-3797-4F15-80BC-9D5ECA7B67EE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,6 +28,10 @@ Global {7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DB41B43-9DAA-48C8-8D41-EF2F06FDD33E}.Release|Any CPU.Build.0 = Release|Any CPU + {72B707A3-3797-4F15-80BC-9D5ECA7B67EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72B707A3-3797-4F15-80BC-9D5ECA7B67EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72B707A3-3797-4F15-80BC-9D5ECA7B67EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72B707A3-3797-4F15-80BC-9D5ECA7B67EE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LivreLand/LivreLand.csproj b/LivreLand/LivreLand.csproj index 0380f02..29bc9f7 100644 --- a/LivreLand/LivreLand.csproj +++ b/LivreLand/LivreLand.csproj @@ -78,6 +78,9 @@ MSBuild:Compile + + MSBuild:Compile + MSBuild:Compile diff --git a/LivreLand/MauiProgram.cs b/LivreLand/MauiProgram.cs index e3fe3ab..071a52d 100644 --- a/LivreLand/MauiProgram.cs +++ b/LivreLand/MauiProgram.cs @@ -23,8 +23,10 @@ public static class MauiProgram .AddSingleton() .AddSingleton(); + //Ajouter des Singletons , Manager et ManagerVm + #if DEBUG - builder.Logging.AddDebug(); + builder.Logging.AddDebug(); #endif return builder.Build(); diff --git a/LivreLand/View/BibliothequeView.xaml b/LivreLand/View/BibliothequeView.xaml index f63ff8d..e8a4ca0 100644 --- a/LivreLand/View/BibliothequeView.xaml +++ b/LivreLand/View/BibliothequeView.xaml @@ -22,7 +22,8 @@ - + diff --git a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml index e3c7480..cf9db6a 100644 --- a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml +++ b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml @@ -118,6 +118,9 @@ + + + diff --git a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs index 11b931d..8fe2889 100644 --- a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs +++ b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs @@ -1,12 +1,27 @@ using CommunityToolkit.Maui.Views; +using LivreLand.ViewModel; namespace LivreLand.View.ContentViews; public partial class PopupHomePlusButtonView : Popup { - public PopupHomePlusButtonView() + + #region Properties + + public NavigatorVM Navigator { get; private set; } + + #endregion + + + #region Constructor + + public PopupHomePlusButtonView(NavigatorVM navigatorVM) { - InitializeComponent(); + Navigator = navigatorVM; + InitializeComponent(); Size = new Size(0.8 * (DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density), 0.5 * (DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density)); - } + BindingContext = this; + } + + #endregion } \ No newline at end of file diff --git a/LivreLand/View/ContentViews/PopupISBNView.xaml b/LivreLand/View/ContentViews/PopupISBNView.xaml new file mode 100644 index 0000000..4190417 --- /dev/null +++ b/LivreLand/View/ContentViews/PopupISBNView.xaml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LivreLand/View/ContentViews/PopupISBNView.xaml.cs b/LivreLand/View/ContentViews/PopupISBNView.xaml.cs new file mode 100644 index 0000000..75a9dac --- /dev/null +++ b/LivreLand/View/ContentViews/PopupISBNView.xaml.cs @@ -0,0 +1,12 @@ +using CommunityToolkit.Maui.Views; + +namespace LivreLand.View.ContentViews; + +public partial class PopupISBNView : Popup +{ + public PopupISBNView() + { + InitializeComponent(); + Size = new Size(0.8 * (DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density), 0.5 * (DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density)); + } +} \ No newline at end of file diff --git a/LivreLand/View/HeaderHome.xaml b/LivreLand/View/HeaderHome.xaml index c7b9740..4b31410 100644 --- a/LivreLand/View/HeaderHome.xaml +++ b/LivreLand/View/HeaderHome.xaml @@ -2,9 +2,11 @@ + x:Class="LivreLand.View.HeaderHome" + x:Name="this"> -