From bdab1bb44d40bc214aada756b3e06f0f6c051e0f Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sat, 13 Apr 2019 01:14:22 +0200
Subject: [PATCH] Equipement, maitrises, ...

---
 .../PlayerCharacterEditorViewModel.cs         | 10 ++++++++
 AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml |  7 +++---
 .../Views/PlayerCharacterEditorPage.xaml      | 24 +++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
index 977c5ba2..409a01fb 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
@@ -223,6 +223,7 @@ namespace AideDeJeu.ViewModels
             set
             {
                 SetProperty(ref _SelectedBackground, value);
+                OnPropertyChanged(nameof(PreferedBackground));
                 NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(Task.Run(() => LoadBackgroundAsync(_SelectedBackground)));
             }
         }
@@ -309,6 +310,7 @@ namespace AideDeJeu.ViewModels
             set
             {
                 SetProperty(ref _SelectedSubBackground, value);
+                OnPropertyChanged(nameof(PreferedBackground));
                 NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(Task.Run(() => LoadSubBackgroundAsync(SelectedSubBackground)));
             }
         }
@@ -342,6 +344,14 @@ namespace AideDeJeu.ViewModels
             return subbackground;
         }
 
+        public BackgroundItem PreferedBackground
+        {
+            get
+            {
+                return SelectedSubBackground ?? SelectedBackground;
+            }
+        }
+
         private List<string> _PersonalityTraits = null;
         public List<string> PersonalityTraits
         {
diff --git a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml b/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml
index 053a0b42..b6995317 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml
@@ -14,15 +14,14 @@
     <Frame BorderColor="Black" Padding="2">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="10" />
             </Grid.ColumnDefinitions>
             <mdview:MarkdownView Grid.Column="0" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Title, Source={x:Reference this}, StringFormat='# {0}'}" IsEnabled="False" />
-            <mdview:MarkdownView Grid.Column="1" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedItem.Name, Source={x:Reference this}, StringFormat='# : {0}'}" />
-            <Image Grid.Column="2" WidthRequest="32" HeightRequest="32" Source="click.png" />
-            <mdview:MarkdownView Grid.Row="1" Grid.ColumnSpan="3" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedItem.Description, Source={x:Reference this}}" />
+            <Image Grid.Column="1" WidthRequest="32" HeightRequest="32" Source="click.png" />
+            <mdview:MarkdownView Grid.Row="1" Grid.ColumnSpan="3" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedItem.Name, Source={x:Reference this}, StringFormat='## {0}'}" />
+            <mdview:MarkdownView Grid.Row="2" Grid.ColumnSpan="3" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedItem.Description, Source={x:Reference this}}" />
         </Grid>
     </Frame>
     <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedItem, Source={x:Reference this}}" />-->
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
index 41346de5..e50e75a4 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
@@ -59,6 +59,30 @@
                 <views:ItemPickerView BindingContext="{Binding}" Title="Historique" ItemsSource="{Binding Backgrounds.Result}" SelectedItem="{Binding SelectedBackground, Mode=TwoWay}" />
                 <views:ItemPickerView BindingContext="{Binding}" Title="Variante" ItemsSource="{Binding SubBackgrounds}" SelectedItem="{Binding SelectedSubBackground, Mode=TwoWay}" />
 
+                <Frame BorderColor="Black" Padding="2" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}">
+                    <StackLayout Padding="0">
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Compétences" />
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.Abilities}" />
+                    </StackLayout>
+                </Frame>
+                <Frame BorderColor="Black" Padding="2" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}">
+                    <StackLayout Padding="0">
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Outils maîtrisés" />
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.MasteredTools}" />
+                    </StackLayout>
+                </Frame>
+                <Frame BorderColor="Black" Padding="2" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}">
+                    <StackLayout Padding="0">
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Langues maîtrisées" />
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.MasteredLanguages}" />
+                    </StackLayout>
+                </Frame>
+                <Frame BorderColor="Black" Padding="2" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}">
+                    <StackLayout Padding="0">
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Équipement" />
+                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.Equipment}" />
+                    </StackLayout>
+                </Frame>
                 <Frame BorderColor="Black" Padding="2" IsVisible="{Binding HasBackgroundSkill}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackgroundSkill.Name, StringFormat='# {0}'}" />