From 58d1e5130af492555db2dcc196297533bb7c686f Mon Sep 17 00:00:00 2001
From: lodufour1 <lodufour1@IUTCLINFA1807>
Date: Wed, 11 Oct 2023 17:19:02 +0200
Subject: [PATCH] Update(Back-End): pas de manager mais encore pas stable sans

---
 .../Composants/CollectionFiltrage.xaml        |  3 +--
 .../Composants/CollectionFiltrage.xaml.cs     |  7 +++--
 .../BookApp/Composants/GroupCollection.xaml   |  7 ++---
 .../Composants/GroupCollection.xaml.cs        |  8 +++---
 Sources/BookApp/MainPage.xaml                 | 17 +++++-------
 Sources/BookApp/MainPage.xaml.cs              | 14 +++++-----
 Sources/BookApp/MauiProgram.cs                |  6 ++---
 Sources/BookApp/Pages/DetailBook.xaml.cs      |  2 +-
 Sources/BookApp/Pages/EmpruntsPrets.xaml.cs   |  5 ++--
 Sources/BookApp/Pages/Filtrage.xaml           | 11 +-------
 Sources/BookApp/Pages/Filtrage.xaml.cs        |  2 +-
 Sources/BookApp/Pages/Tous.xaml.cs            |  6 +++--
 Sources/BookApp/ViewModel/ViewModelManager.cs | 18 -------------
 Sources/BookApp/ViewModel/ViewModelMenu.cs    |  2 +-
 .../BookApp/ViewModel/ViewModelNavigation.cs  | 10 +++----
 Sources/VMWrapper/BookViewModel.cs            |  3 ---
 Sources/VMWrapper/DetailBookViewModel.cs      | 15 +++++++++++
 Sources/VMWrapper/FilterViewModel.cs          | 23 ++++++++++++++++
 Sources/VMWrapper/ManagerViewModel.cs         | 18 -------------
 Sources/VMWrapper/SearchBarViewModel.cs       | 27 ++++++++++++++++++-
 Sources/VMWrapper/VMWrapper.csproj            |  1 +
 21 files changed, 109 insertions(+), 96 deletions(-)
 delete mode 100644 Sources/BookApp/ViewModel/ViewModelManager.cs
 create mode 100644 Sources/VMWrapper/DetailBookViewModel.cs
 delete mode 100644 Sources/VMWrapper/ManagerViewModel.cs

diff --git a/Sources/BookApp/Composants/CollectionFiltrage.xaml b/Sources/BookApp/Composants/CollectionFiltrage.xaml
index 058ea6c..c4c5ef9 100644
--- a/Sources/BookApp/Composants/CollectionFiltrage.xaml
+++ b/Sources/BookApp/Composants/CollectionFiltrage.xaml
@@ -4,9 +4,8 @@
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:vm="clr-namespace:BookApp.ViewModel"
              xmlns:model="clr-namespace:Model;assembly=Model"
-             x:DataType="vm:ViewModelManager"
              x:Class="BookApp.Composants.CollectionFiltrage">
-    <CollectionView ItemsSource="{Binding VMMrg.filterVm.authorList}">
+    <CollectionView ItemsSource="{Binding authorList}">
         <CollectionView.ItemTemplate>
             <DataTemplate x:DataType="model:Author">
                 <StackLayout Padding="5">
diff --git a/Sources/BookApp/Composants/CollectionFiltrage.xaml.cs b/Sources/BookApp/Composants/CollectionFiltrage.xaml.cs
index b5e630d..3d166a3 100644
--- a/Sources/BookApp/Composants/CollectionFiltrage.xaml.cs
+++ b/Sources/BookApp/Composants/CollectionFiltrage.xaml.cs
@@ -1,9 +1,8 @@
-using Android.OS;
 using BookApp.ViewModel;
-using System.Collections.ObjectModel;
+using VMWrapper;
 
 namespace BookApp.Composants
-{ 
+{
     public partial class CollectionFiltrage : ContentView
     {
         public CollectionFiltrage()
@@ -11,7 +10,7 @@ namespace BookApp.Composants
             InitializeComponent();
         }
 
-        public CollectionFiltrage(ViewModelManager data)
+        public CollectionFiltrage(FilterViewModel data)
             : this()
         {
             BindingContext = data;
diff --git a/Sources/BookApp/Composants/GroupCollection.xaml b/Sources/BookApp/Composants/GroupCollection.xaml
index 86c4033..678c902 100644
--- a/Sources/BookApp/Composants/GroupCollection.xaml
+++ b/Sources/BookApp/Composants/GroupCollection.xaml
@@ -5,9 +5,7 @@
              xmlns:model="clr-namespace:Model;assembly=Model"
              x:Class="BookApp.Composants.GroupCollection">
 
-    <CollectionView ItemsSource="{Binding VMMrg.bookVm.AuteurGroups}" IsGrouped="True" SelectionMode="Single"
-                    SelectionChangedCommand="{Binding VMNav.BookSelected}"
-                    SelectedItem="{Binding VMNav.SelectedBook}">
+    <CollectionView ItemsSource="{Binding AuteurGroups}" IsGrouped="True" SelectionMode="Single">
         <CollectionView.GroupHeaderTemplate>
             <DataTemplate>
                 <Label Text="{Binding Name}"
@@ -21,6 +19,9 @@
             <DataTemplate>
                 <StackLayout Style="{StaticResource StyleCollectionStack}">
                     <Grid>
+                        <Grid.GestureRecognizers>
+                            <TapGestureRecognizer Command="{Binding SelectedBook}"/>
+                        </Grid.GestureRecognizers>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
diff --git a/Sources/BookApp/Composants/GroupCollection.xaml.cs b/Sources/BookApp/Composants/GroupCollection.xaml.cs
index 7484d11..d9a3613 100644
--- a/Sources/BookApp/Composants/GroupCollection.xaml.cs
+++ b/Sources/BookApp/Composants/GroupCollection.xaml.cs
@@ -1,7 +1,5 @@
-using BookApp.Pages;
-using BookApp.ViewModel;
-using Model;
-
+using VMWrapper;
+
 namespace BookApp.Composants
 {
     public partial class GroupCollection : ContentView
@@ -11,7 +9,7 @@ namespace BookApp.Composants
             InitializeComponent();
         }
 
-        public GroupCollection(ViewModelManager data)
+        public GroupCollection(BookViewModel data)
             : this()
         {
             BindingContext = data;
diff --git a/Sources/BookApp/MainPage.xaml b/Sources/BookApp/MainPage.xaml
index faa5157..2c29beb 100644
--- a/Sources/BookApp/MainPage.xaml
+++ b/Sources/BookApp/MainPage.xaml
@@ -4,6 +4,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:vm="clr-namespace:BookApp.ViewModel"
     xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    x:Name="ThisPage"
     x:Class="BookApp.MainPage">
     <Shell.TitleView>
         <Grid RowDefinitions="Auto">
@@ -41,14 +42,13 @@
     <StackLayout>
         <Label FontSize="35" FontFamily="SF-Pro-Display-Bold" Padding="10">Mes livres</Label>
         <Rectangle  HeightRequest="1" BackgroundColor="black" VerticalOptions="End" />
-        <CollectionView ItemsSource="{Binding VMMenu.MenuItemsLivre}"
-                        SelectionChangedCommand="{Binding VMNav.ItemSelectedCommandMain}"
-                        SelectedItem="{Binding VMNav.SelectedItem, Mode=TwoWay}"
-                        SelectionMode="Single" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
-
+        <CollectionView ItemsSource="{Binding MenuItemsLivre}" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
             <CollectionView.ItemTemplate>
-                <DataTemplate x:DataType="vm:ViewModelMenuItem">
+                <DataTemplate>
                     <Grid RowDefinitions="Auto" Style="{StaticResource StyleCollectionGrid}" Padding="2">
+                        <Grid.GestureRecognizers>
+                            <TapGestureRecognizer Command="{Binding Source={x:Reference ThisPage}, Path=Nav.MenuItemsCommand}"/>
+                        </Grid.GestureRecognizers>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="25"/>
                             <ColumnDefinition Width="*"/>
@@ -97,10 +97,7 @@
         <Label FontFamily="SF-Pro-Display-Heavy" FontSize="20" Padding="10">Filtres</Label>
         <Rectangle  HeightRequest="1" BackgroundColor="black" VerticalOptions="End"/>
 
-        <CollectionView ItemsSource="{Binding VMMenu.MenuItemsFiltre}" 
-                        SelectionChangedCommand="{Binding VMNav.ItemSelectedCommandFiltre}"
-                        SelectedItem="{Binding VMNav.SelectedItem, Mode=TwoWay}"
-                        SelectionMode="Single" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
+        <CollectionView ItemsSource="{Binding MenuItemsFiltre}" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="vm:ViewModelMenuItem">
                     <Grid RowDefinitions="Auto" Style="{StaticResource StyleCollectionGrid}" Padding="2">
diff --git a/Sources/BookApp/MainPage.xaml.cs b/Sources/BookApp/MainPage.xaml.cs
index 872fca1..da5ac99 100644
--- a/Sources/BookApp/MainPage.xaml.cs
+++ b/Sources/BookApp/MainPage.xaml.cs
@@ -5,11 +5,13 @@ using BookApp.ViewModel;
 namespace BookApp
 {
     public partial class MainPage : ContentPage
-    {
-        public MainPage(ViewModelManager data)
-        {
-            InitializeComponent();
-            BindingContext = data;
-        }
+    {
+        public ViewModelNavigation Nav { get; }
+
+        public MainPage(ViewModelMenu data)
+        {
+            InitializeComponent();
+            BindingContext = data;
+        }
     }
 }
diff --git a/Sources/BookApp/MauiProgram.cs b/Sources/BookApp/MauiProgram.cs
index c97f484..fa45a70 100644
--- a/Sources/BookApp/MauiProgram.cs
+++ b/Sources/BookApp/MauiProgram.cs
@@ -33,11 +33,9 @@ namespace BookApp
             builder.Services.AddSingleton<BookViewModel>();
             builder.Services.AddSingleton<FilterViewModel>();
             builder.Services.AddSingleton<SearchBarViewModel>();
-            builder.Services.AddSingleton<ManagerViewModel>();
-
-            builder.Services.AddSingleton<ViewModelManager>();
+;
             builder.Services.AddSingleton<ViewModelNavigation>();
-            builder.Services.AddTransient<ViewModelMenu>();
+            builder.Services.AddSingleton<ViewModelMenu>();
 
             builder.Services.AddSingleton<GroupCollection>();
             builder.Services.AddSingleton<CollectionFiltrage>();
diff --git a/Sources/BookApp/Pages/DetailBook.xaml.cs b/Sources/BookApp/Pages/DetailBook.xaml.cs
index a36b2ce..2d0817d 100644
--- a/Sources/BookApp/Pages/DetailBook.xaml.cs
+++ b/Sources/BookApp/Pages/DetailBook.xaml.cs
@@ -6,7 +6,7 @@ namespace BookApp.Pages;
 
 public partial class DetailBook : ContentPage
 {
-    public DetailBook(ViewModelManager data)
+    public DetailBook(DetailBook data)
     {
         InitializeComponent();
         BindingContext = data;
diff --git a/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs b/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs
index 1192ef1..146739e 100644
--- a/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs
+++ b/Sources/BookApp/Pages/EmpruntsPrets.xaml.cs
@@ -1,6 +1,7 @@
 using BookApp.ViewModel;
 using System.Windows.Input;
-
+using VMWrapper;
+
 namespace BookApp.Pages
 {
     public partial class EmpruntsPrets : ContentPage
@@ -19,7 +20,7 @@ namespace BookApp.Pages
                 }
             }*/
 
-        public EmpruntsPrets(ViewModelManager data)
+        public EmpruntsPrets(BookViewModel data)
         {
             InitializeComponent();
             BindingContext = data;
diff --git a/Sources/BookApp/Pages/Filtrage.xaml b/Sources/BookApp/Pages/Filtrage.xaml
index f63dd4a..ecb6243 100644
--- a/Sources/BookApp/Pages/Filtrage.xaml
+++ b/Sources/BookApp/Pages/Filtrage.xaml
@@ -31,19 +31,10 @@
                         <toolkit:IconTintColorBehavior TintColor="Red" />
                     </Image.Behaviors>
                 </Image>
-
-                <Label
-             Text="Auteur"
-             FontFamily="Strande2"
-             TextColor="Red"
-             FontSize="Medium"
-             VerticalTextAlignment="Center"
-             HorizontalOptions="Start"
-             Grid.Column="0" />
             </HorizontalStackLayout>
 
             <Label
-            Text="Tous"
+            Text="{Binding VMNav.SelectedItem.Name}"
             FontFamily="Strande2"
             TextColor="Black"
             FontSize="Medium"
diff --git a/Sources/BookApp/Pages/Filtrage.xaml.cs b/Sources/BookApp/Pages/Filtrage.xaml.cs
index 3b5d065..7f5491f 100644
--- a/Sources/BookApp/Pages/Filtrage.xaml.cs
+++ b/Sources/BookApp/Pages/Filtrage.xaml.cs
@@ -7,7 +7,7 @@ namespace BookApp.Pages
     {
         SearchBar searchBar = new SearchBar { Placeholder = "Search items..." };
 
-        public Filtrage(ViewModelManager data)
+        public Filtrage(FilterViewModel data)
         {
             InitializeComponent();
             BindingContext = data;
diff --git a/Sources/BookApp/Pages/Tous.xaml.cs b/Sources/BookApp/Pages/Tous.xaml.cs
index f683953..62a100c 100644
--- a/Sources/BookApp/Pages/Tous.xaml.cs
+++ b/Sources/BookApp/Pages/Tous.xaml.cs
@@ -1,12 +1,14 @@
 using BookApp.ViewModel;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-
+using VMWrapper;
+
 namespace BookApp.Pages
 {
     public partial class Tous : ContentPage
     {
-        public Tous(ViewModelManager data)
+        public ViewModelNavigation VMNav { get; }
+        public Tous(BookViewModel data)
         {
             InitializeComponent();
             BindingContext = data;
diff --git a/Sources/BookApp/ViewModel/ViewModelManager.cs b/Sources/BookApp/ViewModel/ViewModelManager.cs
deleted file mode 100644
index ca64d02..0000000
--- a/Sources/BookApp/ViewModel/ViewModelManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using ToolKit;
-using VMWrapper;
-
-namespace BookApp.ViewModel;
-
-public class ViewModelManager : BaseViewModel
-{
-    public ManagerViewModel VMMrg { get; }
-    public ViewModelMenu VMMenu { get; }
-    public ViewModelNavigation VMNav { get; }
-
-    public ViewModelManager(ManagerViewModel vMMrg, ViewModelMenu viewModelMenu, ViewModelNavigation viewModelNavigation)
-    {
-        VMMrg = vMMrg;
-        VMMenu = viewModelMenu;
-        VMNav = viewModelNavigation;
-    }
-}
diff --git a/Sources/BookApp/ViewModel/ViewModelMenu.cs b/Sources/BookApp/ViewModel/ViewModelMenu.cs
index 6e2132f..020d2bf 100644
--- a/Sources/BookApp/ViewModel/ViewModelMenu.cs
+++ b/Sources/BookApp/ViewModel/ViewModelMenu.cs
@@ -57,7 +57,7 @@ namespace BookApp.ViewModel
                     "Date de publication",
                     "../Resources/Images/calendar.svg",
                     250,
-                    ""
+                    "FiltragePage"
                 ),
                 new ViewModelMenuItem("Note", "../Resources/Images/sparkles.svg", 250, "", true),
             };
diff --git a/Sources/BookApp/ViewModel/ViewModelNavigation.cs b/Sources/BookApp/ViewModel/ViewModelNavigation.cs
index aa4eafd..6cab1a5 100644
--- a/Sources/BookApp/ViewModel/ViewModelNavigation.cs
+++ b/Sources/BookApp/ViewModel/ViewModelNavigation.cs
@@ -23,19 +23,19 @@ namespace BookApp.ViewModel
         public INavigation Navigation { get; set; }
 
         public ICommand MenuItemsFiltre { get; private set; }
-        public ICommand ItemSelectedCommandMain { get; private set; }
+        public ICommand MenuItemsCommand { get; private set; }
         public ICommand BookSelected { get; private set; }
 
         public ICommand BackButtonCommand { get; private set; }
 
         public ViewModelNavigation()
         {
-            MenuItemsFiltre = new Command(async () => await OnItemSelected(SelectedItem));
-            ItemSelectedCommandMain = new Command(async () => await OnItemSelected(SelectedItem));
+            MenuItemsFiltre = new CommandPersonnal(async () => await OnItemSelected(SelectedItem));
+            MenuItemsCommand = new CommandPersonnal(async () => await OnItemSelected(SelectedItem));
 
-            BackButtonCommand = new Command(async () => await BackButton(this, EventArgs.Empty));
+            BackButtonCommand = new CommandPersonnal(async () => await BackButton(this, EventArgs.Empty));
 
-            BookSelected = new Command(async () => await OnBookSelected(SelectedBook));
+            BookSelected = new CommandPersonnal(async () => await OnBookSelected(SelectedBook));
         }
 
         private async Task OnItemSelected(ViewModelMenuItem selectedItem)
diff --git a/Sources/VMWrapper/BookViewModel.cs b/Sources/VMWrapper/BookViewModel.cs
index 4273f28..e3dfaab 100644
--- a/Sources/VMWrapper/BookViewModel.cs
+++ b/Sources/VMWrapper/BookViewModel.cs
@@ -3,13 +3,10 @@ using System.Collections.ObjectModel;
 
 namespace VMWrapper
 {
-    // All the code in this file is included in all platforms.
     public class BookViewModel
     {
         private readonly ILibraryManager data;
 
-        public ObservableCollection<Book> bookList { get; private set; } =
-            new ObservableCollection<Book>();
         public ObservableCollection<AuteurGroup> AuteurGroups { get; private set; } =
             new ObservableCollection<AuteurGroup>();
 
diff --git a/Sources/VMWrapper/DetailBookViewModel.cs b/Sources/VMWrapper/DetailBookViewModel.cs
new file mode 100644
index 0000000..ff36e68
--- /dev/null
+++ b/Sources/VMWrapper/DetailBookViewModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VMWrapper
+{
+    public class DetailBookViewModel
+    {
+        public DetailBookViewModel()
+        {
+        }
+    }
+}
diff --git a/Sources/VMWrapper/FilterViewModel.cs b/Sources/VMWrapper/FilterViewModel.cs
index a285f2b..efb2558 100644
--- a/Sources/VMWrapper/FilterViewModel.cs
+++ b/Sources/VMWrapper/FilterViewModel.cs
@@ -15,6 +15,9 @@ namespace VMWrapper
 
         public ObservableCollection<Author> authorList { get; private set; } =
             new ObservableCollection<Author>();
+        public ObservableCollection<Book> bookList { get; private set; } =
+               new ObservableCollection<Book>();
+
 
         public FilterViewModel(ILibraryManager data)
         {
@@ -22,6 +25,26 @@ namespace VMWrapper
             GetAuthors();
         }
 
+        private async void GetDatePublish()
+        {
+            try
+            {
+                
+                var books = data.GetBooksByAuthor("", 0, 5).Result.Item2;
+
+                foreach (Book book in books)
+                {
+
+                    bookList.Add(book);
+                }
+                
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine(ex.Message);
+            }
+        }
+
         public void GetAuthors()
         {
             var objet = data.GetAuthorsByName("", 0, 10).Result.Item2;
diff --git a/Sources/VMWrapper/ManagerViewModel.cs b/Sources/VMWrapper/ManagerViewModel.cs
deleted file mode 100644
index 55b157e..0000000
--- a/Sources/VMWrapper/ManagerViewModel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Model;
-
-namespace VMWrapper
-{
-    public class ManagerViewModel
-    {
-        public FilterViewModel filterVm { get; }
-        public SearchBarViewModel searchBar { get; }
-        public BookViewModel bookVm { get; }
-
-        public ManagerViewModel(FilterViewModel filterVm, SearchBarViewModel searchBar, BookViewModel bookVm)
-        {
-            this.filterVm = filterVm;
-            this.searchBar = searchBar;
-            this.bookVm = bookVm;
-        }
-    }
-}
diff --git a/Sources/VMWrapper/SearchBarViewModel.cs b/Sources/VMWrapper/SearchBarViewModel.cs
index eeb465d..abfd9c9 100644
--- a/Sources/VMWrapper/SearchBarViewModel.cs
+++ b/Sources/VMWrapper/SearchBarViewModel.cs
@@ -1,8 +1,12 @@
 using Model;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+using ToolKit;
 
 namespace VMWrapper
 {
-    public class SearchBarViewModel
+    public class SearchBarViewModel : BaseViewModel
     {
         private readonly ILibraryManager data;
 
@@ -11,6 +15,27 @@ namespace VMWrapper
             this.data = data;
         }
 
+
+     
+      /*  public ICommand PerformSearch => new Command<string>((string query) =>
+        {
+            SearchResults = DataService.GetSearchResults(query);
+        });
+
+        private List<string> searchResults = DataService.Fruits;
+        public List<string> SearchResults
+        {
+            get
+            {
+                return searchResults;
+            }
+            set
+            {
+                searchResults = value;
+                NotifyPropertyChanged();
+            }
+        }*/
+
         public async void SearchAuthor(string nomSearch)
         {
             try
diff --git a/Sources/VMWrapper/VMWrapper.csproj b/Sources/VMWrapper/VMWrapper.csproj
index b068d6c..212ee5e 100644
--- a/Sources/VMWrapper/VMWrapper.csproj
+++ b/Sources/VMWrapper/VMWrapper.csproj
@@ -23,6 +23,7 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Model\Model.csproj" />
+	  <ProjectReference Include="..\ToolKit\ToolKit.csproj" />
 	</ItemGroup>
 
 </Project>