From 453c07b112db6073d409489f15ebc84b34d4ead9 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Thu, 11 Apr 2019 22:31:47 +0200
Subject: [PATCH] Un peu de look

---
 AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml | 3 ++-
 AideDeJeu/AideDeJeu/Views/StringPicker.xaml              | 9 ++++++++-
 AideDeJeu/AideDeJeu/Views/StringPickerView.xaml          | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
index a926570f..23572354 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
@@ -75,7 +75,8 @@
 
 
                 <!--<views:StringPickerView Title="Trait de personnalité" IsVisible="{Binding PersonalityTraits.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityTraits.Result}" />-->
-                <views:StringPickerView BindingContext="{Binding}" Title="Trait de personnalité" IsVisible="{Binding PersonalityIdeals.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityIdeals.Result}" />
+                <views:StringPickerView BindingContext="{Binding}" Title="Trait de personnalité" IsVisible="{Binding PersonalityTraits.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityTraits.Result}" SelectedItem="{Binding SelectedPlayerCharacter.PersonalityTrait, Mode=TwoWay}" />
+                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" IsVisible="{Binding PersonalityTraits.IsSuccessfullyCompleted}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.PersonalityTrait}" />
                 <!--SelectedItem="{Binding SelectedPlayerCharacter.PersonalityTrait, Mode=TwoWay}"-->
 
                 <Button Visual="Material" IsVisible="{Binding PersonalityIdeals.IsSuccessfullyCompleted}" Text="Idéal" Command="{Binding PersonalityIdealPickerCommand}" CommandParameter="{Binding PersonalityIdeals.Result}" />
diff --git a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml b/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
index 22a840f3..20fed2ce 100644
--- a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
+++ b/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
@@ -2,14 +2,21 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
+             xmlns:tools="clr-namespace:AideDeJeu.Tools"
              x:Class="AideDeJeu.Views.StringPicker"
              Title="{Binding Title}">
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
+            <tools:NullToFalseConverter x:Key="NullToFalseConverter" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
     <ContentPage.Content>
         <ListView ItemsSource="{Binding Items}" HasUnevenRows="True" SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <ViewCell>
-                        <mdview:MarkdownView HorizontalOptions="FillAndExpand" Markdown="{Binding}" />
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding}" />
                     </ViewCell>
                 </DataTemplate>
             </ListView.ItemTemplate>
diff --git a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml
index 4ea26072..d7a0726f 100644
--- a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml
+++ b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml
@@ -13,13 +13,13 @@
     </StackLayout.Resources>
     <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Title, Source={x:Reference this}, StringFormat='## [{0}](#)'}" IsEnabled="False" />
     <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedItem, Source={x:Reference this}}" />-->
-    <StackLayout BindableLayout.ItemsSource="{Binding ItemsSource, Source={x:Reference this}}">
+    <!--<StackLayout BindableLayout.ItemsSource="{Binding ItemsSource, Source={x:Reference this}}">
         <BindableLayout.ItemTemplate>
             <DataTemplate>
                 <Label Text="{Binding}" />
             </DataTemplate>
         </BindableLayout.ItemTemplate>
-    </StackLayout>
+    </StackLayout>-->
     <StackLayout.GestureRecognizers>
         <ClickGestureRecognizer Command="{Binding PickerCommand, Source={x:Reference this}}" CommandParameter="{Binding ItemsSource, Source={x:Reference this}}" />
         <TapGestureRecognizer Command="{Binding PickerCommand, Source={x:Reference this}}" CommandParameter="{Binding ItemsSource, Source={x:Reference this}}" />