From 4cd979acee5f0984eb2a0171168e6e844534c568 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Fri, 29 Jun 2018 17:57:39 +0200
Subject: [PATCH] Correctifs couleurs, police, barre de recherche sur nougat

---
 AideDeJeu/AideDeJeu/Tools/Converters.cs         | 2 +-
 AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs | 4 ++--
 AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs     | 3 +++
 AideDeJeu/AideDeJeu/Views/MainPage.xaml         | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs
index 88038c1d..25252701 100644
--- a/AideDeJeu/AideDeJeu/Tools/Converters.cs
+++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs
@@ -70,7 +70,7 @@ namespace AideDeJeu.Tools
                 var cstring = string.Empty;
                 foreach (var str in strings)
                 {
-                    cstring += str + "\n";
+                    cstring += str + "\n\n";
                 }
                 return cstring;
                 //    var fs = new FormattedString();
diff --git a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
index 0f53de96..fc5f0022 100644
--- a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
+++ b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
@@ -62,7 +62,7 @@ namespace AideDeJeu.Tools
                 if (block is Markdig.Syntax.ParagraphBlock)
                 {
                     var paragraphBlock = block as Markdig.Syntax.ParagraphBlock;
-                    spell.DescriptionHtml += MarkdownToHtml(paragraphBlock.ToMarkdownString());
+                    spell.DescriptionHtml += MarkdownToHtml(paragraphBlock.ToMarkdownString()) + "\n";
                     ////DumpParagraphBlock(paragraphBlock);
                     //Console.WriteLine(paragraphBlock.IsBreakable);
                     //spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString();
@@ -178,7 +178,7 @@ namespace AideDeJeu.Tools
                                     if (ininblock is Markdig.Syntax.ParagraphBlock)
                                     {
                                         var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock;
-                                        spell.DescriptionHtml += listBlock.BulletType + " " + MarkdownToHtml(paragraphBlock.ToMarkdownString());
+                                        spell.DescriptionHtml += listBlock.BulletType + " " + MarkdownToHtml(paragraphBlock.ToMarkdownString()) + "\n";
                                     }
                                 }
                             }
diff --git a/AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs b/AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs
index 5839e531..b5bf9e76 100644
--- a/AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs
+++ b/AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs
@@ -12,10 +12,13 @@ namespace AideDeJeu.Tools
             this.Margin = 0;
             var fd = FormatedTextHelpers.FontData.FromResource("content");
             //this.Paragraph.FontFamily = fd.FontFamily;
+            //this.Paragraph.FontFamily = "Droid Serif";
+            this.Paragraph.FontFamily = "serif";
             this.Paragraph.FontSize = (float)fd.FontSize;
             this.Paragraph.Attributes = fd.FontAttributes;
             this.Paragraph.ForegroundColor = fd.TextColor;
 
+            this.Paragraph.BackgroundColor = DefaultBackgroundColor;
             this.BackgroundColor = DefaultBackgroundColor;
             //this.Paragraph.ForegroundColor = DefaultTextColor;
             this.Heading1.ForegroundColor = DefaultTextColor;
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index 5ecce008..92df3b9d 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -37,7 +37,7 @@
                         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
                     </ContentPage.ToolbarItems>
                     <StackLayout Orientation="Vertical" VerticalOptions="Fill" HorizontalOptions="Fill">
-                        <SearchBar x:Name="SearchBar" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
+                        <SearchBar x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
                             <SearchBar.Behaviors>
                                 <tools:TextChangedBehavior />
                             </SearchBar.Behaviors>