From 57798713bfe99b6dab0cc9c1572ecfb9f22fa1ef Mon Sep 17 00:00:00 2001
From: lodufour1 <lodufour1@IUTCLINFA1801>
Date: Wed, 13 Sep 2023 17:32:16 +0200
Subject: [PATCH] =?UTF-8?q?Update=20(Front-End):=20d=C3=A9but=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BookApp/AppShell.xaml            |  5 ---
 src/BookApp/BookApp.csproj           |  3 +-
 src/BookApp/MainPage.xaml            | 20 ++++++----
 src/BookApp/MainPage.xaml.cs         | 25 ++++++++-----
 src/BookApp/MauiProgram.cs           | 56 ++++++++++++++--------------
 src/BookApp/Pages/DetailBook.xaml    |  1 +
 src/BookApp/Pages/Filtrage.xaml      | 11 ++++--
 src/BookApp/Pages/Filtrage.xaml.cs   |  3 +-
 src/BookApp/Pages/Tous.xaml          | 14 -------
 src/TestFrontEnd/TestFrontEnd.csproj |  1 +
 10 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/src/BookApp/AppShell.xaml b/src/BookApp/AppShell.xaml
index a07b727..3990516 100644
--- a/src/BookApp/AppShell.xaml
+++ b/src/BookApp/AppShell.xaml
@@ -5,10 +5,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:BookApp"
     Shell.FlyoutBehavior="Disabled">
-
-    
-
-    
     <TabBar>
         <Tab Title="My Library"
             Icon="books_vertical_fill.svg">
@@ -29,5 +25,4 @@
             <ShellContent ContentTemplate="{DataTemplate local:Pages.Filtrage}" />
         </Tab>
     </TabBar>
-
 </Shell>
diff --git a/src/BookApp/BookApp.csproj b/src/BookApp/BookApp.csproj
index bce1c9e..ae57a42 100644
--- a/src/BookApp/BookApp.csproj
+++ b/src/BookApp/BookApp.csproj
@@ -67,8 +67,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-		<PackageReference Include="SimpleRatingControl.MAUI" Version="0.0.3" />
+		<PackageReference Include="SimpleRatingControl.MAUI" Version="0.1.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/BookApp/MainPage.xaml b/src/BookApp/MainPage.xaml
index 6b541a5..7e3dc0e 100644
--- a/src/BookApp/MainPage.xaml
+++ b/src/BookApp/MainPage.xaml
@@ -20,8 +20,8 @@
     </ContentPage.ToolbarItems>
     <StackLayout>
         <Label FontSize="35" Padding="10" FontAttributes="Bold" >Mes livres</Label>
-        <BoxView  HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="End" />
-        <CollectionView ItemsSource="{Binding MyCollections1}" BackgroundColor="Gray">
+        <BoxView  HeightRequest="1" BackgroundColor="#F9F9F9" VerticalOptions="End" />
+        <CollectionView ItemsSource="{Binding MyCollections1}" BackgroundColor="#F9F9F9">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid RowDefinitions="Auto"  Margin="25,0,0,0">
@@ -45,20 +45,26 @@
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
                             <Label Grid.Column="2"
-                                   Text="{Binding Name}"
+                                   Text="{Binding Number}"
                                    FontAttributes="Bold"
                                    Padding="5"
                                    VerticalOptions="Center"
-                                   Margin="0,0,30,0"/>
+                                   Margin="0,0,20,0"/>
                             <Button Grid.Column="2"
                                     ImageSource="chevron_right.svg"
                                     HeightRequest="35"
                                     WidthRequest="35"
+                                    BackgroundColor="#F9F9F9"
                                     Clicked="OnButtonClicked"
                                     HorizontalOptions="End"/>
                         </Grid>
-                        <!-- Si veiw cela vaudra peut-être le coup de faire une content view (équiavalent de user control) -->
-                        <BoxView Grid.ColumnSpan="4" HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="End" />
+                        <BoxView Grid.ColumnSpan="4" HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="End">
+                            <BoxView.Triggers>
+                                <DataTrigger TargetType="BoxView" Binding="{Binding IsLastItem}" Value="true">
+                                    <Setter Property="IsVisible" Value="False"/>
+                                </DataTrigger>
+                            </BoxView.Triggers>
+                        </BoxView>
                     </Grid>
                 </DataTemplate>
             </CollectionView.ItemTemplate>
@@ -101,12 +107,10 @@
                                     BackgroundColor="White"
                                     HorizontalOptions="End"/>
                         </Grid>
-                        <!-- Si veiw cela vaudra peut-être le coup de faire une content view (équiavalent de user control) -->
                     </Grid>
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>
         <BoxView HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="EndAndExpand" />
     </StackLayout>
-    <!--Pour l'opti on peut préciser le type du bind en aller tout en haut du fichier et faisent x:class ...-->
 </ContentPage>
diff --git a/src/BookApp/MainPage.xaml.cs b/src/BookApp/MainPage.xaml.cs
index 14342d5..005aed9 100644
--- a/src/BookApp/MainPage.xaml.cs
+++ b/src/BookApp/MainPage.xaml.cs
@@ -9,14 +9,18 @@ namespace BookApp
         {
             public string Name { get; set; }
             public string Icone { get; set; }
+            public int Number { get; set; }
 
-            public ObjetTemp(string name, string icone)
+            public ObjetTemp(string name, string icone, int number)
             {
                 Name = name;
                 Icone = icone;
+                Number = number;
             }
         }
 
+        public bool IsLastItem { get; set; } //TO DO
+
         public ObservableCollection<ObjetTemp> MyCollections1 { get; set; }
         public ObservableCollection<ObjetTemp> MyCollections2 { get; set; }
 
@@ -25,22 +29,23 @@ namespace BookApp
             InitializeComponent();
             MyCollections1 = new ObservableCollection<ObjetTemp>()
             {
-                new ObjetTemp("Item1", "./Reources/Images/tray_2_fill.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/person_badge_clock_fill.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/arrow_forward.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/eyeglasses.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/heart_fill.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/tag_fill.svg"),
+                new ObjetTemp("Item1", "./Reources/Images/tray_2_fill.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/person_badge_clock_fill.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/arrow_forward.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/eyeglasses.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/heart_fill.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/tag_fill.svg", 250),
             };
             MyCollections2 = new ObservableCollection<ObjetTemp>()
             {
-                new ObjetTemp("Item1", "./Reources/Images/person_fill.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/calendar.svg"),
-                new ObjetTemp("Item1", "./Reources/Images/sparkles.svg"),
+                new ObjetTemp("Item1", "./Reources/Images/person_fill.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/calendar.svg", 250),
+                new ObjetTemp("Item1", "./Reources/Images/sparkles.svg", 250),
             };
             BindingContext = this;
         }
 
+        // Commande with view model pour le futur
         async void OnButtonClicked(object sender, EventArgs args)
         {
             await Shell.Current.GoToAsync(nameof(Tous));
diff --git a/src/BookApp/MauiProgram.cs b/src/BookApp/MauiProgram.cs
index 7c7f210..328f4bd 100644
--- a/src/BookApp/MauiProgram.cs
+++ b/src/BookApp/MauiProgram.cs
@@ -1,27 +1,29 @@
-using Microsoft.Extensions.Logging;
-using SimpleRatingControlMaui;
-
-namespace BookApp
-{
-    public static class MauiProgram
-    {
-        public static MauiApp CreateMauiApp()
-        {
-            var builder = MauiApp.CreateBuilder();
-            builder
-                .UseMauiApp<App>()
-                .UseSimpleRatingControl()
-                .ConfigureFonts(fonts =>
-                {
-                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-                });
-
-#if DEBUG
-            builder.Logging.AddDebug();
-#endif
-
-            return builder.Build();
-        }
-    }
-}
+using CommunityToolkit.Maui;
+using Microsoft.Extensions.Logging;
+using SimpleRatingControlMaui;
+
+namespace BookApp
+{
+    public static class MauiProgram
+    {
+        public static MauiApp CreateMauiApp()
+        {
+            var builder = MauiApp.CreateBuilder();
+            builder
+                .UseMauiApp<App>()
+                .UseMauiCommunityToolkit()
+                .UseSimpleRatingControl()
+                .ConfigureFonts(fonts =>
+                {
+                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                });
+
+#if DEBUG
+            builder.Logging.AddDebug();
+#endif
+
+            return builder.Build();
+        }
+    }
+}
diff --git a/src/BookApp/Pages/DetailBook.xaml b/src/BookApp/Pages/DetailBook.xaml
index 29335a8..8bdc52f 100644
--- a/src/BookApp/Pages/DetailBook.xaml
+++ b/src/BookApp/Pages/DetailBook.xaml
@@ -39,6 +39,7 @@
                     ImageSource="chevron_right.svg"
                     HeightRequest="35"
                     WidthRequest="35"
+                    BackgroundColor="White"
                     HorizontalOptions="End"/>
                 </Grid>
                 <BoxView Margin="25,0,0,10" HeightRequest="1" BackgroundColor="LightGray" VerticalOptions="End" />
diff --git a/src/BookApp/Pages/Filtrage.xaml b/src/BookApp/Pages/Filtrage.xaml
index 53416a2..36794ef 100644
--- a/src/BookApp/Pages/Filtrage.xaml
+++ b/src/BookApp/Pages/Filtrage.xaml
@@ -2,8 +2,9 @@
 <ContentPage
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookApp.Pages.Filtrage"
-             Title="Filtrage">
+    xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    x:Class="BookApp.Pages.Filtrage"
+    Title="Filtrage">
     <Shell.BackButtonBehavior>
         <BackButtonBehavior 
                          IconOverride="chevron_left.svg"
@@ -40,7 +41,11 @@
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
                                 <Image Grid.Column="0" HeightRequest="30"
-                                    WidthRequest="30" Source="Book.svg"/>
+                                    WidthRequest="30" Source="Book.svg">
+                                    <Image.Behaviors>
+                                        <toolkit:IconTintColorBehavior TintColor="Red" />
+                                    </Image.Behaviors>
+                                </Image>
                                 <Label Grid.Column="1" Margin="10,0,0,0"  VerticalTextAlignment="Center" Text="LALALA"/>
                                 <Label Grid.Column="2"  VerticalTextAlignment="Center" Margin="0,0,40,0" HorizontalTextAlignment="End" Text="100"/>
                                 <Button Grid.Column="2"
diff --git a/src/BookApp/Pages/Filtrage.xaml.cs b/src/BookApp/Pages/Filtrage.xaml.cs
index 97786b6..204f3e3 100644
--- a/src/BookApp/Pages/Filtrage.xaml.cs
+++ b/src/BookApp/Pages/Filtrage.xaml.cs
@@ -4,13 +4,12 @@ namespace BookApp.Pages;
 
 public partial class Filtrage : ContentPage
 {
-
     SearchBar searchBar = new SearchBar { Placeholder = "Search items..." };
     public TousViewModel Data = new TousViewModel();
+
     public Filtrage()
     {
         InitializeComponent();
         BindingContext = Data;
     }
-
 }
diff --git a/src/BookApp/Pages/Tous.xaml b/src/BookApp/Pages/Tous.xaml
index 6c9bde3..4c198c0 100644
--- a/src/BookApp/Pages/Tous.xaml
+++ b/src/BookApp/Pages/Tous.xaml
@@ -5,11 +5,6 @@
 	xmlns:usecase="clr-namespace:BookApp.UseCase"
 	xmlns:composants="clr-namespace:BookApp.Composants"
     x:Class="BookApp.Tous">
-    <Shell.BackButtonBehavior>
-        <BackButtonBehavior 
-            IconOverride="chevron_left.svg"
-            TextOverride="Tous"/>
-    </Shell.BackButtonBehavior>
     <Shell.TitleView>
         <Label
             Text="Tous"
@@ -21,15 +16,6 @@
             FontSize="Medium" 
             HorizontalTextAlignment="Center"/>
     </Shell.TitleView>
-    <ContentPage.ToolbarItems>
-        <ToolbarItem IconImageSource="plus_icone.svg" Priority="1" Order="Primary" StyleClass="PlusButton"/>
-        <ToolbarItem IconImageSource="arrow_up_arrow_down.svg" Priority="1" Order="Primary" />
-    </ContentPage.ToolbarItems>
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <usecase:RatingToStarImageConverter x:Key="RatingToStarConverter"/>
-        </ResourceDictionary>
-    </ContentPage.Resources>
     <ContentPage.Content>
         <CollectionView ItemsSource="{Binding BookCollection}">
             <CollectionView.ItemTemplate>
diff --git a/src/TestFrontEnd/TestFrontEnd.csproj b/src/TestFrontEnd/TestFrontEnd.csproj
index e74a85a..4045434 100644
--- a/src/TestFrontEnd/TestFrontEnd.csproj
+++ b/src/TestFrontEnd/TestFrontEnd.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />