Fix(Back-End): Navigation Menu Up

Sources/BookApp/Composants/GroupCollection.xaml.cs

@@ -1,18 +1,18 @@
 using VMWrapper;
 
-namespace BookApp.Composants
+namespace BookApp.Composants
-{
+{
-    public partial class GroupCollection : ContentView
+    public partial class GroupCollection : ContentView
-    {
+    {
-        public GroupCollection()
+        public GroupCollection()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-        }
+        }
-
+
-        public GroupCollection(BookViewModel data)
+        public GroupCollection(BookViewModel data)
-            : this()
+            : this()
-        {
+        {
-            BindingContext = data;
+            BindingContext = data;
-        }
+        }
-    }
+    }
-}
+}

Sources/BookApp/MainPage.xaml

@@ -42,12 +42,15 @@
     <StackLayout>
         <Label FontSize="35" FontFamily="SF-Pro-Display-Bold" Padding="10">Mes livres</Label>
         <Rectangle  HeightRequest="1" BackgroundColor="black" VerticalOptions="End" />
-        <CollectionView ItemsSource="{Binding MenuItemsLivre}" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
+        <CollectionView ItemsSource="{Binding MenuItemsLivre}"
+                        SelectedItem="{Binding Source={x:Reference ThisPage}, Path=Nav.SelectedItem, Mode=TwoWay}"
+                        Margin="25,0,0,0" BackgroundColor="#F9F9F9">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid RowDefinitions="Auto" Style="{StaticResource StyleCollectionGrid}" Padding="2">
                         <Grid.GestureRecognizers>
-                            <TapGestureRecognizer Command="{Binding Source={x:Reference ThisPage}, Path=Nav.MenuItemsCommand}"/>
+                            <TapGestureRecognizer Command="{Binding Source={x:Reference ThisPage}, Path=Nav.ItemTappedCommand}"
+                                                  CommandParameter="{Binding .}"/>
                         </Grid.GestureRecognizers>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="25"/>

Sources/BookApp/MainPage.xaml.cs

@@ -1,17 +1,25 @@
 using BookApp.Pages;
 using System.Collections.ObjectModel;
 using BookApp.ViewModel;
+using System.Diagnostics;
 
 namespace BookApp
 {
     public partial class MainPage : ContentPage
-    {
+    {
-        public ViewModelNavigation Nav { get; }
+        public ViewModelNavigation Nav { get; } = new ViewModelNavigation();
-
+
-        public MainPage(ViewModelMenu data)
+        void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
+        {
-            InitializeComponent();
+            Debug.WriteLine(
-            BindingContext = data;
+                $"Selection Changed: Added:{e.CurrentSelection.FirstOrDefault()}, Removed:{e.PreviousSelection.FirstOrDefault()}"
-        }
+            );
+        }
+
+        public MainPage(ViewModelMenu data)
+        {
+            InitializeComponent();
+            BindingContext = data;
+        }
     }
 }

Sources/BookApp/MauiProgram.cs

@@ -33,7 +33,7 @@ namespace BookApp
             builder.Services.AddSingleton<BookViewModel>();
             builder.Services.AddSingleton<FilterViewModel>();
             builder.Services.AddSingleton<SearchBarViewModel>();
-;
+            ;
             builder.Services.AddSingleton<ViewModelNavigation>();
             builder.Services.AddSingleton<ViewModelMenu>();
 

Sources/BookApp/Pages/EmpruntsPrets.xaml.cs

@@ -1,7 +1,7 @@
 using BookApp.ViewModel;
 using System.Windows.Input;
-using VMWrapper;
+using VMWrapper;
-
+
 namespace BookApp.Pages
 {
     public partial class EmpruntsPrets : ContentPage

Sources/BookApp/Pages/Tous.xaml.cs

@@ -1,13 +1,14 @@
 using BookApp.ViewModel;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using VMWrapper;
+using VMWrapper;
-
+
 namespace BookApp.Pages
 {
     public partial class Tous : ContentPage
     {
         public ViewModelNavigation VMNav { get; }
+
         public Tous(BookViewModel data)
         {
             InitializeComponent();

Sources/BookApp/Resources/Styles/Styles.xaml

@@ -29,7 +29,7 @@
                     <VisualState x:Name="Selected">
                         <VisualState.Setters>
                             <Setter Property="BackgroundColor"
-                                            Value="Transparent" />
+                                            Value="Purple" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>

Sources/BookApp/ViewModel/ViewModelNavigation.cs

@@ -23,17 +23,24 @@ namespace BookApp.ViewModel
         public INavigation Navigation { get; set; }
 
         public ICommand MenuItemsFiltre { get; private set; }
-        public ICommand MenuItemsCommand { get; private set; }
         public ICommand BookSelected { get; private set; }
 
         public ICommand BackButtonCommand { get; private set; }
 
+        // Command du menu
+        private ICommand _itemTappedCommand;
+        public ICommand ItemTappedCommand =>
+            _itemTappedCommand ??= new CommandPersonnal<ViewModelMenuItem>(
+                async (item) => await OnItemSelected(item)
+            );
+
         public ViewModelNavigation()
         {
             MenuItemsFiltre = new CommandPersonnal(async () => await OnItemSelected(SelectedItem));
-            MenuItemsCommand = new CommandPersonnal(async () => await OnItemSelected(SelectedItem));
 
-            BackButtonCommand = new CommandPersonnal(async () => await BackButton(this, EventArgs.Empty));
+            BackButtonCommand = new CommandPersonnal(
+                async () => await BackButton(this, EventArgs.Empty)
+            );
 
             BookSelected = new CommandPersonnal(async () => await OnBookSelected(SelectedBook));
         }

Sources/VMWrapper/DetailBookViewModel.cs

@@ -8,8 +8,6 @@ namespace VMWrapper
 {
     public class DetailBookViewModel
     {
-        public DetailBookViewModel()
+        public DetailBookViewModel() { }
-        {
-        }
     }
 }

Sources/VMWrapper/FilterViewModel.cs

@@ -16,8 +16,7 @@ namespace VMWrapper
         public ObservableCollection<Author> authorList { get; private set; } =
             new ObservableCollection<Author>();
         public ObservableCollection<Book> bookList { get; private set; } =
-               new ObservableCollection<Book>();
+            new ObservableCollection<Book>();
-
 
         public FilterViewModel(ILibraryManager data)
         {
@@ -29,15 +28,12 @@ namespace VMWrapper
         {
             try
             {
-                
                 var books = data.GetBooksByAuthor("", 0, 5).Result.Item2;
 
                 foreach (Book book in books)
                 {
-
                     bookList.Add(book);
                 }
-                
             }
             catch (Exception ex)
             {

Sources/VMWrapper/SearchBarViewModel.cs

@@ -15,26 +15,24 @@ namespace VMWrapper
             this.data = data;
         }
 
-
+        /*  public ICommand PerformSearch => new Command<string>((string query) =>
-     
+          {
-      /*  public ICommand PerformSearch => new Command<string>((string query) =>
+              SearchResults = DataService.GetSearchResults(query);
-        {
+          });
-            SearchResults = DataService.GetSearchResults(query);
+  
-        });
+          private List<string> searchResults = DataService.Fruits;
-
+          public List<string> SearchResults
-        private List<string> searchResults = DataService.Fruits;
+          {
-        public List<string> SearchResults
+              get
-        {
+              {
-            get
+                  return searchResults;
-            {
+              }
-                return searchResults;
+              set
-            }
+              {
-            set
+                  searchResults = value;
-            {
+                  NotifyPropertyChanged();
-                searchResults = value;
+              }
-                NotifyPropertyChanged();
+          }*/
-            }
-        }*/
 
         public async void SearchAuthor(string nomSearch)
         {