Nouvelle police majuscules

AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj

@@ -432,6 +432,13 @@
     <AndroidAsset Include="Assets\pdfjs\web\locale\zh-CN\viewer.properties" />
     <AndroidAsset Include="Assets\pdfjs\web\locale\zh-TW\viewer.properties" />
     <AndroidAsset Include="Assets\pdfjs\web\locale\zu\viewer.properties" />
+    <AndroidAsset Include="Assets\MarcellusSC-Regular.ttf" />
+    <AndroidAsset Include="Assets\Cinzel-Black.otf" />
+    <AndroidAsset Include="Assets\Cinzel-Bold.otf" />
+    <AndroidAsset Include="Assets\CinzelDecorative-Black.otf" />
+    <AndroidAsset Include="Assets\CinzelDecorative-Bold.otf" />
+    <AndroidAsset Include="Assets\CinzelDecorative-Regular.otf" />
+    <AndroidAsset Include="Assets\Cinzel-Regular.otf" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>

AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj

@@ -309,6 +309,13 @@
     <Content Include="Assets\pdfjs\web\cmaps\V.bcmap" />
     <Content Include="Assets\pdfjs\web\cmaps\WP-Symbol.bcmap" />
     <Content Include="Assets\pdfjs\web\compressed.tracemonkey-pldi-09.pdf" />
+    <Content Include="Assets\Fonts\Cinzel-Black.otf" />
+    <Content Include="Assets\Fonts\Cinzel-Bold.otf" />
+    <Content Include="Assets\Fonts\CinzelDecorative-Black.otf" />
+    <Content Include="Assets\Fonts\CinzelDecorative-Bold.otf" />
+    <Content Include="Assets\Fonts\CinzelDecorative-Regular.otf" />
+    <Content Include="Assets\Fonts\Cinzel-Regular.otf" />
+    <Content Include="Assets\Fonts\MarcellusSC-Regular.ttf" />
     <None Include="Assets\pdfjs\web\locale\ach\viewer.properties" />
     <None Include="Assets\pdfjs\web\locale\af\viewer.properties" />
     <None Include="Assets\pdfjs\web\locale\ak\viewer.properties" />

AideDeJeu/AideDeJeu/App.xaml

@@ -24,26 +24,26 @@
             
             <OnPlatform x:Key="LinuxLibertineCapitals" x:TypeArguments="x:String">
                 <On Platform="iOS" Value="Linux Libertine Capitals" />
-                <On Platform="Android" Value="LinLibertine_aS.ttf#Linux Libertine Capitals" />
+                <On Platform="Android" Value="Cinzel-Regular.otf#Cinzel" />
-                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
+                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/Cinzel-Regular.otf#Cinzel" />
             </OnPlatform>
 
             <OnPlatform x:Key="LinuxLibertineCapitalsBold" x:TypeArguments="x:String">
                 <On Platform="iOS" Value="Linux Libertine Capitals" />
-                <On Platform="Android" Value="LinLibertine_aBS.ttf#Linux Libertine Capitals" />
+                <On Platform="Android" Value="Cinzel-Bold.otf#Cinzel Bold" />
-                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
+                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/Cinzel-Bold.otf#Cinzel Bold" />
             </OnPlatform>
 
             <OnPlatform x:Key="LinuxLibertineCapitalsItal" x:TypeArguments="x:String">
                 <On Platform="iOS" Value="Linux Libertine Capitals" />
-                <On Platform="Android" Value="LinLibertine_aSI.ttf#Linux Libertine Capitals" />
+                <On Platform="Android" Value="Cinzel-Regular.otf#Cinzel" />
-                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
+                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/Cinzel-Regular.otf#Cinzel" />
             </OnPlatform>
 
             <OnPlatform x:Key="LinuxLibertineCapitalsBoldItal" x:TypeArguments="x:String">
                 <On Platform="iOS" Value="Linux Libertine Capitals" />
-                <On Platform="Android" Value="LinLibertine_aSZI.ttf#Linux Libertine Capitals" />
+                <On Platform="Android" Value="Cinzel-Bold.otf#Cinzel Bold" />
-                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
+                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/Cinzel-Bold.otf#Cinzel Bold" />
             </OnPlatform>
 
             <OnPlatform x:Key="LinuxLibertine" x:TypeArguments="x:String">

AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs

@@ -206,6 +206,10 @@
                     Debug.WriteLine($"Can't render {block.GetType()} blocks.");
                     break;
             }
+            if(subviews != null)
+            {
+                views.AddRange(subviews);
+            }
 
             if (views != null)
             {
@@ -270,7 +274,8 @@
                 Spacing = this.Theme.Margin,
             };
 
-            this.Render(block.AsEnumerable());
+            var subv = this.Render(block.AsEnumerable());
+            subv.ToList().ForEach(v => stack.Children.Add(v));
 
             var horizontalStack = new StackLayout
             {

AideDeJeu/AideDeJeu/Views/AboutPage.xaml

@@ -125,9 +125,8 @@
                 <Label>
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="Le contenu provient du jeu " />
+                            <Span Text="Héros &amp; Dragons est édité par " />
-                            <Span Text="Héros &amp; Dragons" FontAttributes="Bold" />
+                            <Span Text="Black Book Editions" FontAttributes="Bold" />
-                            <Span Text=" et du SRD VO" />
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
@@ -135,6 +134,19 @@
                     </Label.GestureRecognizers>
                 </Label>
 
+                <Label>
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="Le contenu provient du DRS de " />
+                            <Span Text="Héros &amp; Dragons" FontAttributes="Bold" />
+                            <Span Text=" et du SRD de la 5è édition" />
+                        </FormattedString>
+                    </Label.FormattedText>
+                    <Label.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://heros-et-dragons.fr/" />
+                    </Label.GestureRecognizers>
+                </Label>
+
                 <Label Text="Il est soumis à la licence OGL" />
 
                 <Label Text="{Binding OGL}" />