Update (Back-end): Ajout de VM

Sources/BookApp/AppShell.xaml

@@ -19,11 +19,11 @@
         </Tab>
         <Tab Title="My Readings"
             Icon="bookmark_fill.svg">
-            <ShellContent ContentTemplate="{DataTemplate local:MainPage}" />
+            <ShellContent ContentTemplate="{DataTemplate pages:Tous}" />
         </Tab>
         <Tab Title="Search"
             Icon="magnifyingglass.svg">
-            <ShellContent ContentTemplate="{DataTemplate local:MainPage}" />
+            <ShellContent ContentTemplate="{DataTemplate pages:Filtrage}" />
         </Tab>
     </TabBar>
 

Sources/BookApp/BookApp.csproj

@@ -76,6 +76,7 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\Model\Model.csproj" />
 	  <ProjectReference Include="..\Stub\Stub.csproj" />
+	  <ProjectReference Include="..\ToolKit\ToolKit.csproj" />
 	  <ProjectReference Include="..\VMWrapper\VMWrapper.csproj" />
 	</ItemGroup>
 

Sources/BookApp/Composants/GroupCollection.xaml

@@ -43,21 +43,21 @@
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Image Grid.Column="0"
-                        Source="{Binding ImageBook}"
+                        Source="{Binding ImageLarge}"
                         HeightRequest="125"
                         WidthRequest="125"
                         Margin="0,10,0,10"/>
                         <StackLayout Grid.Column="1">
-                            <Label Text="{Binding Name}"
+                            <Label Text="{Binding Title}"
                             FontFamily="SF-Compact-Display-Bold"
                             FontSize="18"
                             TextColor="Black"/>
-                            <Label Text="{Binding Auteur.Name}"
+                            <Label Text="{Binding Authors}"
                             FontFamily="SF-Compact-Display-Semibold"
                             TextColor="Black"/>
                             <Label 
                             TextColor="SlateGray"
-                            Text="{Binding Statut}"/>
+                            Text="{Binding Status}"/>
                            
                             <StackLayout Margin="0,10" Orientation="Horizontal" VerticalOptions="EndAndExpand">
                                 <Image Source="empty_star.svg" WidthRequest="25" HeightRequest="25"/>

Sources/BookApp/Composants/GroupCollection.xaml.cs

@@ -1,5 +1,5 @@
 using BookApp.Pages;
-using BookApp.ViewModel;
+using Model;
 
 namespace BookApp.Composants
 {
@@ -12,10 +12,10 @@ namespace BookApp.Composants
 
         private async void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            /*if (e.CurrentSelection.FirstOrDefault() is Book selectedItem)
+            if (e.CurrentSelection.FirstOrDefault() is Book selectedItem)
             {
                 await Navigation.PushAsync(new DetailBook(selectedItem));
-            }*/
+            }
         }
     }
 }

Sources/BookApp/MainPage.xaml

@@ -40,7 +40,8 @@
     <StackLayout>
         <Label FontSize="35" FontFamily="SF-Pro-Display-Bold" Padding="10">Mes livres</Label>
         <Rectangle  HeightRequest="1" BackgroundColor="black" VerticalOptions="End" />
-        <CollectionView ItemsSource="{Binding MyCollections1}"  Margin="25,0,0,0" BackgroundColor="#F9F9F9">
+        <CollectionView ItemsSource="{Binding MyCollections1}" SelectionMode="Single" SelectionChanged="OnSelectionChanged" Margin="25,0,0,0" BackgroundColor="#F9F9F9">
+
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid RowDefinitions="Auto" >
@@ -69,12 +70,10 @@
                                    VerticalOptions="Center"
                                    Margin="0,0,40,0"
                                    HorizontalOptions="End"/>
-                            <Button Grid.Column="2"
+                            <Image Grid.Column="2"
-                                    ImageSource="chevron_right.svg"
+                                    Source="chevron_right.svg"
-                                    HeightRequest="35"
+                                    HeightRequest="25"
-                                    WidthRequest="35"
+                                    WidthRequest="25"
-                                    BackgroundColor="#F9F9F9"
-                                    Clicked="ButtonTous"
                                     HorizontalOptions="End"/>
                         </Grid>
                         <Rectangle Grid.ColumnSpan="4" HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="End">
@@ -127,7 +126,6 @@
                                 HeightRequest="35"
                                 WidthRequest="35"
                                 BackgroundColor="#F9F9F9"
-                                Clicked="ButtonAuteur"
                                 HorizontalOptions="End"/>
                         </Grid>
                         <Rectangle Grid.ColumnSpan="4" HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="End">

Sources/BookApp/MainPage.xaml.cs

@@ -1,59 +1,17 @@
 using BookApp.Pages;
 using System.Collections.ObjectModel;
+using BookApp.ViewModel;
 
 namespace BookApp
 {
     public partial class MainPage : ContentPage
     {
-        public class ObjetTemp
+        public MainPage(NavigationViewModel data)
-        {
-            public string Name { get; set; }
-            public string Icone { get; set; }
-            public int Number { get; set; }
-            public bool IsLastItem { get; set; }
-
-            public ObjetTemp(string name, string icone, int number, bool isLastItem = false)
-            {
-                Name = name;
-                Icone = icone;
-                Number = number;
-                IsLastItem = isLastItem;
-            }
-        }
-
-        public ObservableCollection<ObjetTemp> MyCollections1 { get; set; }
-        public ObservableCollection<ObjetTemp> MyCollections2 { get; set; }
-
-        public MainPage()
         {
             InitializeComponent();
-            MyCollections1 = new ObservableCollection<ObjetTemp>()
+            BindingContext = data;
-            {
-                new ObjetTemp("Tous", "./Reources/Images/tray_2_fill.svg", 250),
-                new ObjetTemp("En prêt", "./Reources/Images/person_badge_clock_fill.svg", 250),
-                new ObjetTemp("À lire plus tard", "./Reources/Images/arrow_forward.svg", 250),
-                new ObjetTemp("Statut de lecture", "./Reources/Images/eyeglasses.svg", 250),
-                new ObjetTemp("Favoris", "./Reources/Images/heart_fill.svg", 250),
-                new ObjetTemp("Étiquettes", "./Reources/Images/tag_fill.svg", 250, true),
-            };
-
-            MyCollections2 = new ObservableCollection<ObjetTemp>()
-            {
-                new ObjetTemp("Auteur", "./Reources/Images/person_fill.svg", 250),
-                new ObjetTemp("Date de publication", "./Reources/Images/calendar.svg", 250),
-                new ObjetTemp("Note", "./Reources/Images/sparkles.svg", 250, true),
-            };
-            BindingContext = this;
         }
 
-        async void ButtonTous(object sender, EventArgs args)
+        private async void OnSelectionChanged(object sender, SelectionChangedEventArgs e) { }
-        {
-            await Shell.Current.GoToAsync("TousPage");
-        }
-
-        async void ButtonAuteur(object sender, EventArgs args)
-        {
-            await Shell.Current.GoToAsync("FiltragePage");
-        }
     }
 }

Sources/BookApp/MauiProgram.cs

@@ -30,9 +30,12 @@ namespace BookApp
 #endif
             builder.Services.AddSingleton<ILibraryManager, LibraryStub>();
             builder.Services.AddSingleton<BookViewModel>();
-            builder.Services.AddSingleton<ViewModel.ViewModelManager>();
+            builder.Services.AddSingleton<ViewModelManager>();
             builder.Services.AddSingleton<Filtrage>();
             builder.Services.AddSingleton<CollectionFiltrage>();
+            builder.Services.AddSingleton<Tous>();
+            builder.Services.AddSingleton<MainPage>();
+            builder.Services.AddSingleton<NavigationViewModel>();
 
             // transient pour recharger la data à l'execute
 

Sources/BookApp/Pages/DetailBook.xaml.cs

@@ -9,7 +9,7 @@ public partial class DetailBook : ContentPage
 
     public Book BookDetail { get; set; }
     */
-    public DetailBook() //Book ItemBook)
+    public DetailBook(Model.Book selectedItem) //Book ItemBook)
     {
         InitializeComponent();
 

Sources/BookApp/Pages/Tous.xaml.cs

@@ -1,13 +1,14 @@
 using BookApp.ViewModel;
+using VMWrapper;
 
 namespace BookApp.Pages
 {
     public partial class Tous : ContentPage
     {
-        public Tous()
+        public Tous(BookViewModel data)
         {
             InitializeComponent();
-            //BindingContext = new TousViewModel();
+            BindingContext = data;
         }
 
         async void BackButton(object sender, EventArgs args)

Sources/BookApp/ViewModel/ViewModelManager.cs

@@ -10,40 +10,8 @@ public class ViewModelManager
     BookViewModel _viewModel;
     public ObservableCollection<Author> Authors { get; set; } = new ObservableCollection<Author>();
 
-    /* public ObservableCollection<AuteurGroup> AuteurGroups { get; private set; } =
-         new ObservableCollection<AuteurGroup>();*/
-
     public ViewModelManager(BookViewModel viewModel)
     {
         _viewModel = viewModel;
-        //GetAuthors();
-        /* ObservableCollection<Auteur> auteurs = new Stub().CreateStubData();
-         foreach (Auteur auteur in auteurs)
-         {
-             AuteurGroups.Add(new AuteurGroup(auteur.Name, auteur.Books));
-         }*/
     }
-
-    //fireandforget
-    /*public async void GetAuthors()
-    {
-        
-        var authors1 = await _viewModel.GetAuthors();
-        Authors.Clear();
-        foreach (var author in authors1)
-        {
-            Authors.Add(author);
-        }
-    }*/
 }
-
-/*public class AuteurGroup : ObservableCollection<Book>
-{
-    public string Name { get; private set; }
-
-    public AuteurGroup(string name, ObservableCollection<Book> books)
-        : base(books)
-    {
-        Name = name;
-    }
-}*/

Sources/BookApp/ViewModel/ViewModelMenu.cs

@@ -0,0 +1,67 @@
+using System.Collections.ObjectModel;
+
+namespace BookApp.ViewModel
+{
+    public class ViewModelMenu
+    {
+        public string Name { get; set; }
+        public string Icone { get; set; }
+        public int Number { get; set; }
+        public string Route { get; set; }
+        public bool IsLastItem { get; set; }
+
+        public ViewModelMenu(
+            string name,
+            string icone,
+            int number,
+            string route,
+            bool isLastItem = false
+        )
+        {
+            Name = name;
+            Icone = icone;
+            Number = number;
+            Route = route;
+            IsLastItem = isLastItem;
+        }
+
+        public ObservableCollection<ViewModelMenu> MyCollections1 { get; set; } =
+            new ObservableCollection<ViewModelMenu>()
+            {
+                new ViewModelMenu("Tous", "./Resources/Images/tray_2_fill.svg", 250, "Tous"),
+                new ViewModelMenu(
+                    "En prêt",
+                    "./Resources/Images/person_badge_clock_fill.svg",
+                    250,
+                    "EmpruntsPrets"
+                ),
+                new ViewModelMenu(
+                    "À lire plus tard",
+                    "./Resources/Images/arrow_forward.svg",
+                    250,
+                    ""
+                ),
+                new ViewModelMenu(
+                    "Statut de lecture",
+                    "./Resources/Images/eyeglasses.svg",
+                    250,
+                    ""
+                ),
+                new ViewModelMenu("Favoris", "./Resources/Images/heart_fill.svg", 250, ""),
+                new ViewModelMenu("Étiquettes", "./Resources/Images/tag_fill.svg", 250, "", true),
+            };
+
+        public ObservableCollection<ViewModelMenu> MyCollections2 { get; set; } =
+            new ObservableCollection<ViewModelMenu>()
+            {
+                new ViewModelMenu("Auteur", "./Resources/Images/person_fill.svg", 250, "Filtrage"),
+                new ViewModelMenu(
+                    "Date de publication",
+                    "./Resources/Images/calendar.svg",
+                    250,
+                    ""
+                ),
+                new ViewModelMenu("Note", "./Resources/Images/sparkles.svg", 250, "", true),
+            };
+    }
+}

Sources/BookApp/ViewModel/ViewModelNavigation.cs

@@ -1,10 +1,43 @@
-using System;
+using ToolKit;
-using System.Collections.Generic;
+using System.Windows.Input;
-using System.Linq;
+using System.Collections.ObjectModel;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BookApp.ViewModel
 {
-    internal class ViewModelNavigation { }
+    public class NavigationViewModel : BaseViewModel
+    {
+        public NavigationViewModel() { }
+
+        private async void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.CurrentSelection.FirstOrDefault() is ViewModelMenu selectedItem)
+            {
+                if (!string.IsNullOrWhiteSpace(selectedItem.Route))
+                {
+                    Type pageType = Type.GetType("BookApp.Pages." + selectedItem.Route);
+                    if (pageType == null)
+                    {
+                        return;
+                    }
+
+                    Page pageInstance = (Page)Activator.CreateInstance(pageType);
+                    // await Navigation.PushAsync(pageInstance);
+                }
+                else
+                {
+                    Console.WriteLine("Erreur trouvé");
+                }
+            }
+        }
+
+        async void ButtonTous(object sender, EventArgs args)
+        {
+            await Shell.Current.GoToAsync("TousPage");
+        }
+
+        async void ButtonAuteur(object sender, EventArgs args)
+        {
+            await Shell.Current.GoToAsync("FiltragePage");
+        }
+    }
 }

Sources/ToolKit/BaseViewModel.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace ToolKit
+{
+    public class BaseViewModel : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        protected bool SetProperty<T>(
+            ref T backingField,
+            T value,
+            [CallerMemberName] string propertyName = null
+        )
+        {
+            if (EqualityComparer<T>.Default.Equals(backingField, value))
+                return false;
+
+            backingField = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+    }
+}

Sources/ToolKit/Class1.cs

@@ -1,4 +0,0 @@
-namespace ToolKit
-{
-    public class Class1 { }
-}

Sources/VMWrapper/BookViewModel.cs

@@ -8,7 +8,7 @@ using System.Xml.Linq;
 namespace VMWrapper
 {
     // All the code in this file is included in all platforms.
-    public class BookViewModel : INotifyPropertyChanged
+    public class BookViewModel
     {
         private readonly ILibraryManager data;
 
@@ -66,12 +66,5 @@ namespace VMWrapper
                 authorList.Add(author);
             }
         }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
     }
 }