💄 Mise en place des fonts (le mieux possible)

sources/PocketBook/MauiProgram.cs

@@ -13,8 +13,29 @@ public static class MauiProgram
             .UseMauiCommunityToolkit()
             .ConfigureFonts(fonts =>
             {
-                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                fonts.AddFont("SF-Compact-Display-Black.otf", "Compact-Display-Black");
-                fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                fonts.AddFont("SF-Compact-Display-Bold.otf", "Compact-Display-Bold");
+                fonts.AddFont("SF-Compact-Display-Heavy.otf", "Compact-Display-Heavy");
+                fonts.AddFont("SF-Compact-Display-Semibold.otf", "Compact-Display-Semibold");
+
+                fonts.AddFont("SF-Pro-Display-Black.otf", "Pro-Display-Black");
+                fonts.AddFont("SF-Pro-Display-Bold.otf", "Pro-Display-Bold");
+                fonts.AddFont("SF-Pro-Display-Heavy.otf", "Pro-Display-Heavy");
+                fonts.AddFont("SF-Pro-Display-Semibold.otf", "Pro-Display-Semibold");
+
+                fonts.AddFont("SF-Compact-Text-Black.otf", "Compact-Text-Black");
+                fonts.AddFont("SF-Compact-Text-Bold.otf", "Compact-Text-Bold");
+                fonts.AddFont("SF-Compact-Text-Heavy.otf", "Compact-Text-Heavy");
+                fonts.AddFont("SF-Compact-Text-Semibold.otf", "Compact-Text-Semibold");
+
+                fonts.AddFont("SF-Pro-Text-Black.otf", "Pro-Text-Black");
+                fonts.AddFont("SF-Pro-Text-Bold.otf", "Pro-Text-Bold");
+                fonts.AddFont("SF-Pro-Text-Heavy.otf", "Pro-Text-Heavy");
+                fonts.AddFont("SF-Pro-Text-Semibold.otf", "Pro-Text-Semibold");
+
+                fonts.AddFont("SFUIDisplay-Light.ttf", "SF-Light");
+                fonts.AddFont("SFUIDisplay-Bold.ttf", "SF-Bold");
+
             });
 
 #if DEBUG

sources/PocketBook/Pages/BookDetail.xaml

@@ -32,14 +32,14 @@
                 <StackLayout Orientation="Horizontal" Margin="15,0,0,20">
                     <Image x:Name="bookImage" Source="buveurencre.jpg" Margin="0,0,10,0" WidthRequest="90" HeightRequest="160"/>
                     <StackLayout Orientation="Vertical">
-                        <Label x:Name="titreBook" FontAttributes="Bold" FontSize="20" Margin="0,15,0,0"/>
+                        <Label x:Name="titreBook" FontFamily="Pro-Display-Semibold" FontSize="17" Margin="0,15,0,0"/>
                         <local:Stars NbStars="1" Margin="0,90,0,0"/>
                     </StackLayout>
                 </StackLayout>
                 <StackLayout Margin="15,0,0,0">
                     <Line BackgroundColor="{StaticResource LineColor1}"/>
                     <StackLayout Orientation="Horizontal">
-                        <Label Text="Infos en ligne" FontSize="20" HorizontalOptions="StartAndExpand" Margin="10,10,0,10"/>
+                        <Label Text="Infos en ligne" FontFamily="Pro-Display-Semibold" FontSize="18" HorizontalOptions="StartAndExpand" Margin="10,10,0,10"/>
                         <Image Source="chevron_right.png" HorizontalOptions="Start" Scale="0.6"/>
                     </StackLayout>
                     <Line BackgroundColor="{StaticResource LineColor1}"/>
@@ -55,7 +55,7 @@
                     <Line BackgroundColor="{StaticResource LineColor1}"/>
                     <StackLayout Margin="0,0,0,10">
                         <Label Text="Résumé" Style="{StaticResource LabelStyleDetailBook3}"/>
-                        <Label x:Name="bookResume" TextColor="#9D9D9D" Margin="10,10,20,0" FontSize="13" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sodales viverra justo, nec rutrum ligula elementum vitae. Suspendisse sit amet mi nec nulla pretium vulputate. Nam pretium volutpat ante, at viverra ex elementum quis. Pellentesque egestas nisl ac enim sollicitudin blandit. Mauris id scelerisque augue. Curabitur dui nibh, convallis quis sagittis eu, pretium vel erat. Sed ut aliquet mi. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum eget lacus quis nisl auctor semper. Vestibulum feugiat ut tortor vel ultrices.
+                        <Label x:Name="bookResume" TextColor="{StaticResource FontColor2}" FontFamily="Pro-Display-Semibold" Margin="10,10,20,0" FontSize="13" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sodales viverra justo, nec rutrum ligula elementum vitae. Suspendisse sit amet mi nec nulla pretium vulputate. Nam pretium volutpat ante, at viverra ex elementum quis. Pellentesque egestas nisl ac enim sollicitudin blandit. Mauris id scelerisque augue. Curabitur dui nibh, convallis quis sagittis eu, pretium vel erat. Sed ut aliquet mi. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum eget lacus quis nisl auctor semper. Vestibulum feugiat ut tortor vel ultrices.
                         Curabitur tempus erat nec sapien aliquam venenatis. In ornare odio in lacus ornare finibus. Maecenas semper nulla non tortor gravida tincidunt ut ut arcu. Sed magna sem, semper quis justo vitae, lacinia laoreet ex. Curabitur at mauris a velit pharetra fringilla commodo non elit. Quisque sollicitudin, ipsum id dapibus consectetur, sapien tortor mattis lectus, vitae tempor nisl nisl sed ipsum. In in orci nec odio hendrerit posuere a vel libero."/>
                     </StackLayout>
                     <Line BackgroundColor="{StaticResource LineColor1}"/>

sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml

@@ -10,6 +10,6 @@
                 <toolkit:IconTintColorBehavior TintColor="{StaticResource Primary}"/>
             </Image.Behaviors>
         </Image>
-        <Label x:Name="propertyName" TextColor="{StaticResource Primary}" FontAttributes="Bold" VerticalOptions="Center" Margin="15,0,0,0"/>
+        <Label x:Name="propertyName" FontFamily="Compact-Text-Semibold" TextColor="{StaticResource Primary}" VerticalOptions="Center" Margin="15,0,0,0"/>
     </StackLayout>
 </ContentView>

sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml

@@ -8,9 +8,9 @@
         <StackLayout Orientation="Horizontal" Margin="0,5,0,0">
             <Image x:Name="bookImage" Margin="0,0,10,0" WidthRequest="75" HeightRequest="110"/>
             <StackLayout Orientation="Vertical">
-                <Label x:Name="bookName" FontAttributes="Bold"/>
+                <Label x:Name="bookName" FontFamily="Pro-Text-Bold"  FontAttributes="Bold"/>
-                <Label x:Name="autorName" FontSize="12"/>
+                <Label x:Name="autorName" FontFamily="Pro-Text-Semibold"  FontSize="12"/>
-                <Label x:Name="bookStatus" FontSize="12" TextColor="#AFAFAF"/>
+                <Label x:Name="bookStatus" FontFamily="Pro-Text-Semibold" FontSize="12" TextColor="#AFAFAF"/>
                 <StackLayout Orientation="Horizontal" Margin="0,30,0,0">
                     <local:Stars NbStars="1" Margin="0,0,0,5"/>
                 </StackLayout>

sources/PocketBook/Pages/Composants/ContentView/ContentViewFilter.xaml

@@ -5,8 +5,8 @@
     <VerticalStackLayout>
         <StackLayout Orientation="Horizontal" BackgroundColor="{StaticResource TopBackgroundGrey}" Padding="0,5,0,5">
             <Image WidthRequest="20" HeightRequest="20" x:Name="filterImage" Margin="20,0,10,0"/>
-            <Label x:Name="filterNameLabel" Margin="5,0,0,0" VerticalTextAlignment="Center" HorizontalOptions="StartAndExpand"/>
+            <Label x:Name="filterNameLabel" FontFamily="SF-Light" Margin="5,0,0,0" VerticalTextAlignment="Center" HorizontalOptions="StartAndExpand"/>
-            <Label x:Name="filterNumLabel" VerticalTextAlignment="Center" TextColor="{StaticResource FontColor2}"/>
+            <Label x:Name="filterNumLabel" FontFamily="SF-Light" VerticalTextAlignment="Center" TextColor="{StaticResource FontColor2}"/>
             <Image Source="chevron_right.png" Scale="0.5" HorizontalOptions="End" Margin="0,0,5,0"/>
         </StackLayout>
     </VerticalStackLayout>

sources/PocketBook/Pages/Composants/ContentView/Filtrage.xaml

@@ -10,8 +10,8 @@
             </Image.Behaviors>
 
         </Image>
-        <Label VerticalOptions="Center" HorizontalOptions="StartAndExpand" Margin="15,0,0,0" x:Name="dataname"/>
+        <Label VerticalOptions="Center"  HorizontalOptions="StartAndExpand" Margin="15,0,0,0" x:Name="dataname"/>
-        <Label x:Name="numberData" VerticalTextAlignment="Center" TextColor="{StaticResource FontColor2}" FontSize="16"/>
+        <Label x:Name="numberData" FontFamily="Pro-Display-Semibold" VerticalTextAlignment="Center" TextColor="{StaticResource FontColor2}" FontSize="16"/>
         <Image Source="chevron_right.png" Scale="0.5" HorizontalOptions="End" Margin="0,0,5,0"/>
     </StackLayout>
 </ContentView>

sources/PocketBook/Pages/Composants/ContentView/TitledAuthor.xaml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="PocketBook.TitledAuthor">
-    <StackLayout BackgroundColor="{StaticResource BackgroundMainPage}" Padding="5">
+    <StackLayout BackgroundColor="{StaticResource BackgroundMainPage}" Padding="0,5,5,5">
-        <Label x:Name="nameText" TextColor="{StaticResource FontColor2}" FontAttributes="Bold" Margin="15,0,0,0" />
+        <Label x:Name="nameText" FontFamily="Pro-Text-Bold" TextColor="{StaticResource FontColor1}" Margin="15,0,0,0" />
     </StackLayout>
 </ContentView>

sources/PocketBook/Pages/DatePublic.xaml

@@ -24,7 +24,7 @@
         </ImageButton.Behaviors>
         </ImageButton>
         </StackLayout>
-        <Line BackgroundColor="#E6E6E6"/>
+        <Line BackgroundColor="{StaticResource LineColor1}"/>
 
         </StackLayout>
 

sources/PocketBook/Pages/LikePage.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-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"
              x:Class="PocketBook.LikePage"
@@ -34,7 +34,7 @@
                     </ImageButton>
                 </StackLayout>
             </StackLayout>
-            <Line BackgroundColor="#E6E6E6"/>
+            <Line BackgroundColor="{StaticResource LineColor1}"/>
 
         </VerticalStackLayout>
 

sources/PocketBook/Pages/StatutPage.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-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"
              x:Class="PocketBook.StatutPage"
@@ -35,7 +35,7 @@
                     </ImageButton>
                 </StackLayout>
             </StackLayout>
-            <Line BackgroundColor="#E6E6E6"/>
+            <Line BackgroundColor="{StaticResource LineColor1}"/>
 
         </StackLayout>
 

sources/PocketBook/Pages/TousPage.xaml

@@ -8,7 +8,7 @@
     <Grid RowDefinitions="auto, *">
 
     <StackLayout Orientation="Vertical">
-    <StackLayout Orientation="Horizontal" Padding="5,10,0,10" >
+    <StackLayout Orientation="Horizontal" Padding="5,0,0,5" >
         <StackLayout Orientation="Horizontal" HorizontalOptions="StartAndExpand">
             <StackLayout.GestureRecognizers>
                     <TapGestureRecognizer Tapped="RetourMainMenu"/>