From 3f52cb2e789766fd143d12d57012bfb126ebc333 Mon Sep 17 00:00:00 2001 From: lobroda Date: Fri, 13 Oct 2023 19:48:18 +0100 Subject: [PATCH] ADD : ButtonsCommand Header Pages + Delete ok (bug nb pages int, navigation after delete) --- LivreLand/View/ALirePlusTardView.xaml | 2 ++ LivreLand/View/DetailsLivreView.xaml | 35 ++++++++++++++++++++++---- LivreLand/View/EmpruntsPretsView.xaml | 2 ++ LivreLand/View/FavorisView.xaml | 2 ++ LivreLand/View/FiltrageAuteurView.xaml | 4 ++- LivreLand/View/FiltrageDateView.xaml | 2 ++ LivreLand/View/FiltrageNoteView.xaml | 4 ++- LivreLand/View/StatutLectureView.xaml | 2 ++ LivreLand/View/TousView.xaml | 8 +++--- LivreLand/ViewModel/DetailsLivreVM.cs | 32 +++++++++++++++++++++++ ViewModels/ManagerVM.cs | 5 +++- 11 files changed, 87 insertions(+), 11 deletions(-) diff --git a/LivreLand/View/ALirePlusTardView.xaml b/LivreLand/View/ALirePlusTardView.xaml index 1bdaa68..dbfe0b9 100644 --- a/LivreLand/View/ALirePlusTardView.xaml +++ b/LivreLand/View/ALirePlusTardView.xaml @@ -18,6 +18,8 @@ HeaderBackButtonText="Mes livres" HeaderPlusButtonVisible="True" HeaderSwitchButtonVisible="True" + ButtonPlusTappedCommand="{Binding ALirePlusTardVM.Navigator.PopupHomePlusNavigationCommand}" + ButtonBackTappedCommand="{Binding ALirePlusTardVM.Navigator.PopupBackButtonNavigationCommand}" Grid.Row="0"/> diff --git a/LivreLand/View/DetailsLivreView.xaml b/LivreLand/View/DetailsLivreView.xaml index 459bd3b..22038f0 100644 --- a/LivreLand/View/DetailsLivreView.xaml +++ b/LivreLand/View/DetailsLivreView.xaml @@ -5,6 +5,7 @@ xmlns:view="clr-namespace:LivreLand.View" xmlns:contentView="clr-namespace:LivreLand.View.ContentViews" xmlns:viewModel="clr-namespace:ViewModels;assembly=ViewModels" + xmlns:model="clr-namespace:Model;assembly=Model" x:Class="LivreLand.View.DetailsLivreView" Title="DetailsLivreView"> @@ -19,7 +20,9 @@ HeaderBackButtonText="Tous" HeaderPlusButtonVisible="False" HeaderSwitchButtonVisible="False" - HeaderColor="{StaticResource HeaderGray}"/> + HeaderColor="{StaticResource HeaderGray}" + ButtonPlusTappedCommand="{Binding DetailsLivreVM.Navigator.PopupHomePlusNavigationCommand}" + ButtonBackTappedCommand="{Binding DetailsLivreVM.Navigator.PopupBackButtonNavigationCommand}"/> @@ -299,7 +302,8 @@ - + + @@ -316,7 +320,7 @@ - @@ -325,14 +329,35 @@ + ButtonCommand="{Binding DetailsLivreVM.ShowPickerCommand}"/> + + + + + - + + + + + + + + + + diff --git a/LivreLand/View/EmpruntsPretsView.xaml b/LivreLand/View/EmpruntsPretsView.xaml index a34b977..f282311 100644 --- a/LivreLand/View/EmpruntsPretsView.xaml +++ b/LivreLand/View/EmpruntsPretsView.xaml @@ -20,6 +20,8 @@ HeaderBackButtonText="Mes livres" HeaderPlusButtonVisible="True" HeaderSwitchButtonVisible="True" + ButtonPlusTappedCommand="{Binding EmpruntsPretsVM.Navigator.PopupHomePlusNavigationCommand}" + ButtonBackTappedCommand="{Binding EmpruntsPretsVM.Navigator.PopupBackButtonNavigationCommand}" Grid.Row="0"/> diff --git a/LivreLand/View/FiltrageAuteurView.xaml b/LivreLand/View/FiltrageAuteurView.xaml index d52d985..7b8ef6c 100644 --- a/LivreLand/View/FiltrageAuteurView.xaml +++ b/LivreLand/View/FiltrageAuteurView.xaml @@ -21,7 +21,9 @@ HeaderTitle="Auteur" HeaderBackButtonText="Mes livres" HeaderPlusButtonVisible="False" - HeaderSwitchButtonVisible="True"/> + HeaderSwitchButtonVisible="True" + ButtonPlusTappedCommand="{Binding FiltrageAuteurVM.Navigator.PopupHomePlusNavigationCommand}" + ButtonBackTappedCommand="{Binding FiltrageAuteurVM.Navigator.PopupBackButtonNavigationCommand}"/> + HeaderSwitchButtonVisible="True" + ButtonPlusTappedCommand="{Binding FiltrageNoteVM.Navigator.PopupHomePlusNavigationCommand}" + ButtonBackTappedCommand="{Binding FiltrageNoteVM.Navigator.PopupBackButtonNavigationCommand}"/> diff --git a/LivreLand/View/TousView.xaml b/LivreLand/View/TousView.xaml index cdb1a4f..fd602f2 100644 --- a/LivreLand/View/TousView.xaml +++ b/LivreLand/View/TousView.xaml @@ -22,9 +22,9 @@ HeaderBackButtonText="Mes livres" HeaderPlusButtonVisible="True" HeaderSwitchButtonVisible="True" - Grid.Row="0" ButtonPlusTappedCommand="{Binding TousVM.Navigator.PopupHomePlusNavigationCommand}" - ButtonBackTappedCommand="{Binding TousVM.Navigator.PopupBackButtonNavigationCommand}"/> + ButtonBackTappedCommand="{Binding TousVM.Navigator.PopupBackButtonNavigationCommand}" + Grid.Row="0"/> @@ -153,7 +153,9 @@ Rotation="180" Command="{Binding TousVM.Manager.PreviousCommand}" Grid.Column="1"/> -