From f2852eee7b363640bedc1dd3819268482cd3902e Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Fri, 12 Apr 2019 11:34:06 +0200
Subject: [PATCH] Avec description

---
 AideDeJeu/AideDeJeu/ViewModels/PickerViewModel.cs   | 13 +++++++++++++
 .../AideDeJeu/Views/PlayerCharacterEditorPage.xaml  |  3 +--
 AideDeJeu/AideDeJeu/Views/StringPicker.xaml         |  5 ++++-
 AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs  | 12 ++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/PickerViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PickerViewModel.cs
index d6a11718..31682f2b 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/PickerViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/PickerViewModel.cs
@@ -20,6 +20,19 @@ namespace AideDeJeu.ViewModels
             }
         }
 
+        private string _Description = null;
+        public string Description
+        {
+            get
+            {
+                return _Description;
+            }
+            set
+            {
+                SetProperty(ref _Description, value);
+            }
+        }
+
         private System.Collections.IEnumerable _Items = null;
         public System.Collections.IEnumerable Items
         {
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
index 4d38d676..d834de5b 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
@@ -59,9 +59,8 @@
                 <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.SelectedBackgroundSkill.Name, StringFormat='# {0}'}" />
                 <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.SelectedBackgroundSkill.Description}" />
 
-                <views:StringPickerView BindingContext="{Binding}" Title="{Binding SelectedBackgroundSpecialties.Result.Name}" ItemsSource="{Binding SelectedBackgroundSpecialties.Result.BindableTable}" SelectedItem="{Binding SelectedPlayerCharacter.PickedBackgroundSpecialty, Mode=TwoWay}" />
+                <views:StringPickerView BindingContext="{Binding}" Title="{Binding SelectedBackgroundSpecialties.Result.Name}" Description="{Binding SelectedBackgroundSpecialties.Result.Description}" ItemsSource="{Binding SelectedBackgroundSpecialties.Result.BindableTable}" SelectedItem="{Binding SelectedPlayerCharacter.PickedBackgroundSpecialty, Mode=TwoWay}" />
                 <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.PickedBackgroundSpecialty}" />
-                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedBackgroundSpecialties.Result.Description}" />
                 <!--SelectedItem="{Binding SelectedPlayerCharacter.SelectedBackgroundSpecialty, Mode=TwoWay}"-->
                 <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" IsVisible="{Binding PersonalityTraits.IsSuccessfullyCompleted}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.PersonalityTrait}" />
                 <Button Visual="Material" IsVisible="{Binding SelectedBackgroundSpecialties.IsSuccessfullyCompleted}" Text="Spécialité" Command="{Binding BackgroundSpecialtyPickerCommand}" CommandParameter="{Binding SelectedBackgroundSpecialties.Result}" />
diff --git a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml b/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
index 9463fe67..6569aed5 100644
--- a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
+++ b/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
@@ -14,7 +14,10 @@
     <ContentPage.Content>
         <ListView ItemsSource="{Binding Items}" HasUnevenRows="True" SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
             <ListView.Header>
-                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding Title, StringFormat='# {0}'}" />
+                <StackLayout>
+                    <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding Title, StringFormat='# {0}'}" />
+                    <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding Description}" />
+                </StackLayout>
             </ListView.Header>
             <ListView.ItemTemplate>
                 <DataTemplate>
diff --git a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
index 08d10a6b..bfeb2ec9 100644
--- a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
@@ -37,6 +37,17 @@ namespace AideDeJeu.Views
             typeof(StringPickerView),
             defaultValue: default(string));
 
+        public string Description
+        {
+            get { return (string)GetValue(DescriptionProperty); }
+            set { SetValue(DescriptionProperty, value); }
+        }
+        public static readonly BindableProperty DescriptionProperty = BindableProperty.Create(
+            nameof(Description),
+            typeof(string),
+            typeof(StringPickerView),
+            defaultValue: default(string));
+
         public string SelectedItem
         {
             get { return (string)GetValue(SelectedItemProperty); }
@@ -78,6 +89,7 @@ namespace AideDeJeu.Views
             var picker = new Views.StringPicker();
             var vm = picker.ViewModel;
             vm.Title = Title;
+            vm.Description = Description;
             vm.Items = strings;
             await Main.Navigator.Navigation.PushModalAsync(picker, true);
             var result = await vm.PickValueAsync();