Toolkit pour le boutton Animaux

Sources/Model/Animal.cs

@@ -18,7 +18,7 @@ namespace Model
         public Espece Espece { get; set; } 
         public Race? Race { get; set; }
 
-        public Animal(string nom, string dateNaissance = "", string sexe = "", string dateAdpotion = "", float? taille = null, float? poids = null, string alimentation = "", Race? race = null)
+        public Animal(string nom, string dateNaissance = "Inconnue", string sexe = "Inconnu", string dateAdpotion = "Inconnue", float? taille = null, float? poids = null, string alimentation = "Inconnue", Race? race = null)
         {
             Nom = nom;
             DateNaissance = dateNaissance;

Sources/Model/Stub.cs

@@ -29,6 +29,10 @@ namespace Model
 
             listeAnimaux.Add(new("Kiki"));
             listeAnimaux.Add(new("PouetPouet"));
+            listeAnimaux.Add(new("Chouchou"));
+            listeAnimaux.Add(new("Pupuce"));
+            listeAnimaux.Add(new("AucuneIdée"));
+            listeAnimaux.Add(new("Minou"));
 
             return listeAnimaux;
         }

Sources/Views/Animaux.xaml

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentPage x:Class="Views.Animaux"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Views.Animaux"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              Title="Vos animaux">
+    <ScrollView>
+        <toolkit:DockLayout>
+            <Button Text="+" 
+                FontSize="Large"
+                Background="{StaticResource Primary}"
+                    toolkit:DockLayout.DockPosition="Bottom"
+                VerticalOptions="End"
+                HorizontalOptions="End"
+                Margin="20"/>
             <VerticalStackLayout>
                 <Grid RowDefinitions="Auto, *" 
-              RowSpacing="20" 
+                  RowSpacing="20">
-              Padding="20">
                     <ListView ItemsSource="{Binding ListeAnimaux}" 
                   Grid.Row="1">
                         <ListView.ItemTemplate>
@@ -19,20 +28,22 @@
                                     Padding="10" 
                                     BackgroundColor="{StaticResource Primary}">
                                             <Grid ColumnDefinitions="Auto, *" 
-                                          RowDefinitions="3*, *, *"
+                                      RowDefinitions="3*"
                                       ColumnSpacing="15">
                                                 <Frame Grid.RowSpan="3" 
-                                               WidthRequest="80" 
+                                           HeightRequest="60" 
-                                               HeightRequest="80" 
+                                           WidthRequest="60" 
                                            Padding="0" 
                                            Margin="10"
                                            BorderColor="{StaticResource Primary}">
                                                     <Image Source="{Binding Image}"/>
                                                 </Frame>
+                                                <VerticalStackLayout Grid.Column="1">
                                                     <Label Text="{Binding Nom}" 
-                                               Grid.Column="1" 
+                                               FontSize="Large"/>
-                                               Grid.Row="0"
+                                                    <Label Text="{Binding NomScientifique}"
-                                               FontSize="Medium"/>
+                                               FontSize="12"/>
+                                                </VerticalStackLayout>
                                             </Grid>
                                         </Border>
                                     </Grid>
@@ -41,11 +52,7 @@
                         </ListView.ItemTemplate>
                     </ListView>
                 </Grid>
-        <Button Text="+" 
-                FontSize="Large"
-                Background="{StaticResource Primary}"
-                VerticalOptions="End"
-                HorizontalOptions="End"
-                Margin="20"/>
             </VerticalStackLayout>
+        </toolkit:DockLayout>
+    </ScrollView>
 </ContentPage>

Sources/Views/Animaux.xaml.cs

@@ -1,3 +1,4 @@
+using CommunityToolkit.Maui.Layouts;
 using Model;
 
 namespace Views;
@@ -10,4 +11,11 @@ public partial class Animaux : ContentPage
 		InitializeComponent();
 		BindingContext = (App.Current as App).Theque.Zootheque;
 	}
+
+    public void OnClick(object sender, ItemTappedEventArgs e)
+    {
+        (App.Current as App).AnimalSelectionner = e.Item as Animal;
+        Navigation.PushAsync(new DetailAnimal());
     }
+}
+

Sources/Views/App.xaml.cs

@@ -7,16 +7,14 @@ namespace Views
     public partial class App : Application, INotifyPropertyChanged
     {
         public Theque Theque { get; set; } = new Theque();
-        public Animal AnimalSelectionner;
+        public Animal AnimalSelectionner { get; set; }
-        public Espece EspeceSelectionner;
+        public Espece EspeceSelectionner { get; set; }
-        public Race RaceSelectionner;
+        public Race RaceSelectionner { get; set; }
 
         public App()
         {
             InitializeComponent();
-
             MainPage = new AppShell();
-
         }
     }
 }

Sources/Views/DetailAnimal.xaml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Views.DetailAnimal"
+             Title="{Binding Nom}">
+    <ScrollView>
+        <VerticalStackLayout>
+            <Image Source="{Binding Image}"
+                   MaximumWidthRequest="300"
+                   Margin="20"
+                   HorizontalOptions="Center"/>
+            <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
+                        Margin="20"
+                        Padding="10" 
+                        Background="{StaticResource Primary}"
+                        VerticalOptions="Start"
+                        Grid.Column="1">
+                <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+                          ColumnDefinitions="*, *"
+                          RowSpacing="8">
+                    <Label FontAttributes="Bold"
+                               Text="Date de naissance"/>
+                    <Label Grid.Column="1"
+                               HorizontalOptions="End"
+                               Text="{Binding DateNaissance}"/>
+                    <Label Grid.Row="1"
+                               FontAttributes="Bold"
+                               Text="Sexe"/>
+                    <Label Grid.Column="2"
+                               Grid.Row="1"
+                               HorizontalOptions="End"
+                               Text="{Binding Sexe}"/>
+                    <Label Grid.Row="2"
+                               FontAttributes="Bold"
+                               Text="Date d'adoption"/>
+                    <Label Grid.Column="2"
+                               Grid.Row="2"
+                               HorizontalOptions="End"
+                               Text="{Binding DateAdoption}"/>
+                    <Label Grid.Row="3"
+                               FontAttributes="Bold"
+                               Text="Taille"/>
+                    <Label Grid.Column="2"
+                               Grid.Row="3"
+                               HorizontalOptions="End"
+                               Text="{Binding Taille}"/>
+                    <Label Grid.Row="4"
+                               FontAttributes="Bold"
+                               Text="Poids"/>
+                    <Label Grid.Column="2"
+                               Grid.Row="4"
+                               HorizontalOptions="End"
+                               Text="{Binding Poids}"/>
+                    <Label Grid.Row="5"
+                               FontAttributes="Bold"
+                               Text="Alimentation"/>
+                    <Label Grid.Column="2"
+                               Grid.Row="5"
+                               HorizontalOptions="End"
+                               Text="{Binding Alimentation}"/>
+                </Grid>
+            </Border>
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>

Sources/Views/DetailAnimal.xaml.cs

@@ -0,0 +1,10 @@
+namespace Views;
+
+public partial class DetailAnimal : ContentPage
+{
+	public DetailAnimal()
+	{
+		InitializeComponent();
+		BindingContext = (App.Current as App).AnimalSelectionner;
+	}
+}

Sources/Views/DetailEspece.xaml

@@ -125,7 +125,7 @@ FontSize="Large"/>
                        FontSize="Large"/>
                 <ListView ItemsSource="{Binding ListeRaces}" 
                           Grid.Row="1"
-                          ItemSelected="OnClick">
+                          ItemTapped="OnClick">
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>

Sources/Views/DetailEspece.xaml.cs

@@ -11,9 +11,9 @@ public partial class DetailEspece : ContentPage
 		BindingContext = (App.Current as App).EspeceSelectionner;
 	}
 
-    public async void OnClick(object sender, SelectedItemChangedEventArgs e)
+    public async void OnClick(object sender, ItemTappedEventArgs e)
     {
-        (App.Current as App).RaceSelectionner = e.SelectedItem as Race;
+        (App.Current as App).RaceSelectionner = e.Item as Race;
         await Navigation.PushAsync(new DetailRace());
     }
 }

Sources/Views/DetailRace.xaml

@@ -16,15 +16,14 @@
                         Background="{StaticResource Primary}"
                         VerticalOptions="Start"
                         Grid.Column="1">
-                <Grid RowDefinitions="Auto, *, *, *, *"
+                <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *"
-                      RowSpacing="10">
+                          RowSpacing="8">
                     <Label FontAttributes="Bold"
-                           Text="Nom Scientifique"/>
+                               Text="Nom scientifique"/>
                     <Label Grid.Column="1"
                                HorizontalOptions="End"
                                Text="{Binding NomScientifique}"/>
-
                     <Label Grid.Row="1"
                                FontAttributes="Bold"
                                Text="Espérance de vie"/>
@@ -32,7 +31,6 @@
                                Grid.Row="1"
                                HorizontalOptions="End"
                                Text="{Binding EsperanceVie}"/>
-
                     <Label Grid.Row="2"
                                FontAttributes="Bold"
                                Text="Poids moyen"/>
@@ -40,7 +38,6 @@
                                Grid.Row="2"
                                HorizontalOptions="End"
                                Text="{Binding PoidsMoyen}"/>
-
                     <Label Grid.Row="3"
                                FontAttributes="Bold"
                                Text="Taille moyenne"/>
@@ -55,54 +52,70 @@
                 Margin="20">
                 <Label Text="Comportement"
                    FontSize="Large"/>
-                <Label Text="{Binding Comportement}"
+                <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
                         Padding="10"
-                   Background="{StaticResource Primary}"/>
+                        Background="{StaticResource Primary}">
+                    <Label Text="{Binding Comportement}"/>
+                </Border>
             </VerticalStackLayout>
 
             <VerticalStackLayout
                 Margin="20">
                 <Label Text="Santé"
                    FontSize="Large"/>
-                <Label Text="{Binding Sante}"
+                <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
                         Padding="10"
-                   Background="{StaticResource Primary}"/>
+                        Background="{StaticResource Primary}">
+                    <Label Text="{Binding Sante}"/>
+                </Border>
             </VerticalStackLayout>
 
             <VerticalStackLayout
                 Margin="20">
                 <Label Text="Education"
                    FontSize="Large"/>
-                <Label Text="{Binding Education}"
+                <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
                         Padding="10"
-                   Background="{StaticResource Primary}"/>
+                        Background="{StaticResource Primary}">
+                    <Label Text="{Binding Education}"/>
+                </Border>
             </VerticalStackLayout>
 
             <VerticalStackLayout
                 Margin="20">
                 <Label Text="Entretien"
                    FontSize="Large"/>
-                <Label Text="{Binding Entretien}"
+                <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
                         Padding="10"
-                   Background="{StaticResource Primary}"/>
+                        Background="{StaticResource Primary}">
+                    <Label Text="{Binding Entretien}"/>
+                </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
+            <VerticalStackLayout Margin="20">
-                Margin="20">
                 <Label Text="Coût potentiel"
                    FontSize="Large"/>
-                <Label Text="{Binding Cout}"
+                <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
                         Padding="10"
-                   Background="{StaticResource Primary}"/>
+                        Background="{StaticResource Primary}">
+                    <Label Text="{Binding Cout}"/>
+                </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
+            <VerticalStackLayout Margin="20">
-                Margin="20">
                 <Label Text="Conseils"
 FontSize="Large"/>
-                <Label Text="{Binding Conseil}"
+                <Border Stroke="{StaticResource Secondary}"
+                        StrokeThickness="2"
                         Padding="10"
-                   Background="{StaticResource Primary}"/>
+                        Background="{StaticResource Primary}">
+                    <Label Text="{Binding Conseil}"/>
+                </Border>
             </VerticalStackLayout>
         </VerticalStackLayout>
     </ScrollView>

Sources/Views/Especes.xaml

@@ -8,7 +8,7 @@
           Padding="20">
         <ListView ItemsSource="{Binding ListeEspeces}" 
                   Grid.Row="1"
-                  ItemSelected="OnClick">
+                  ItemTapped="OnClick">
             <ListView.ItemTemplate>
                     <DataTemplate>
                     <ViewCell>

Sources/Views/Especes.xaml.cs

@@ -12,9 +12,9 @@ public partial class Especes : ContentPage
         BindingContext = (App.Current as App).Theque.Especetheque;
 	}
 
-	public void OnClick(object sender, SelectedItemChangedEventArgs e)
+	public void OnClick(object sender, ItemTappedEventArgs e)
     { 
-        (App.Current as App).EspeceSelectionner = e.SelectedItem as Espece;       
+        (App.Current as App).EspeceSelectionner = e.Item as Espece;       
         Navigation.PushAsync(new DetailEspece());
     }
 }

Sources/Views/MainPage.xaml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:local="clr-namespace:Views"
              x:Class="Views.MainPage">
+    
 </ContentPage>

Sources/Views/MauiProgram.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using CommunityToolkit.Maui;
 
 namespace Views
 {
@@ -9,6 +10,7 @@ namespace Views
             var builder = MauiApp.CreateBuilder();
             builder
                 .UseMauiApp<App>()
+                .UseMauiCommunityToolkit()
                 .ConfigureFonts(fonts =>
                 {
                     fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

Sources/Views/Views.csproj

@@ -49,6 +49,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Maui" Version="5.1.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
 
@@ -66,6 +67,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="DetailAnimal.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="DetailEspece.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>