From b35d2d756375f21c9c060a995fb66e7882a26699 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sat, 13 Apr 2019 23:22:54 +0200
Subject: [PATCH] Picker race et classe

---
 .../PlayerCharacterEditorViewModel.cs         | 30 +++++++++++++++++--
 .../Views/PlayerCharacterEditorPage.xaml      | 10 ++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
index d5ab072e..8e1ae376 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
@@ -160,10 +160,23 @@ namespace AideDeJeu.ViewModels
                 SetProperty(ref _RaceSelectedIndex, value);
                 if (Races.Result.Count > _RaceSelectedIndex && _RaceSelectedIndex >= 0)
                 {
-                    SelectedPlayerCharacter.Race = Races.Result[_RaceSelectedIndex];
+                    SelectedRace = Races.Result[_RaceSelectedIndex];
                 }
             }
         }
+        private RaceItem _SelectedRace = null;
+        public RaceItem SelectedRace
+        {
+            get
+            {
+                return _SelectedRace;
+            }
+            set
+            {
+                SetProperty(ref _SelectedRace, value);
+                SelectedPlayerCharacter.Race = _SelectedRace;
+            }
+        }
 
         public async Task<List<RaceItem>> LoadRacesAsync()
         {
@@ -187,7 +200,20 @@ namespace AideDeJeu.ViewModels
             set
             {
                 SetProperty(ref _ClassSelectedIndex, value);
-                SelectedPlayerCharacter.Class = Classes.Result[_ClassSelectedIndex];
+                SelectedClass = Classes.Result[_ClassSelectedIndex];
+            }
+        }
+        private ClassItem _SelectedClass = null;
+        public ClassItem SelectedClass
+        {
+            get
+            {
+                return _SelectedClass;
+            }
+            set
+            {
+                SetProperty(ref _SelectedClass, value);
+                SelectedPlayerCharacter.Class = _SelectedClass;
             }
         }
 
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
index 643ece8a..028b6bf7 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
@@ -22,16 +22,18 @@
     <ContentPage Title="Race">
         <ScrollView Orientation="Vertical">
             <StackLayout>
-                <Picker Title="Race" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Races.IsSuccessfullyCompleted}" ItemsSource="{Binding Races.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding RaceSelectedIndex, Mode=TwoWay}" />
-                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.Markdown}" />
+                <views:ItemPickerView BindingContext="{Binding}" Title="Race" ItemsSource="{Binding Races.Result}" SelectedItem="{Binding SelectedRace, Mode=TwoWay}" />
+                <!--<Picker Title="Race" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Races.IsSuccessfullyCompleted}" ItemsSource="{Binding Races.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding RaceSelectedIndex, Mode=TwoWay}" />-->
+                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedRace.Markdown}" />
             </StackLayout>
         </ScrollView>
     </ContentPage>
     <ContentPage Title="Classe">
         <ScrollView Orientation="Vertical">
             <StackLayout>
-                <Picker Title="Classe" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Classes.IsSuccessfullyCompleted}" ItemsSource="{Binding Classes.Result}" ItemDisplayBinding="{Binding Name}"  SelectedIndex="{Binding ClassSelectedIndex, Mode=TwoWay}" />
-                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Class.Markdown}" />
+                <views:ItemPickerView BindingContext="{Binding}" Title="Classe" ItemsSource="{Binding Classes.Result}" SelectedItem="{Binding SelectedClass, Mode=TwoWay}" />
+                <!--<Picker Title="Classe" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Classes.IsSuccessfullyCompleted}" ItemsSource="{Binding Classes.Result}" ItemDisplayBinding="{Binding Name}"  SelectedIndex="{Binding ClassSelectedIndex, Mode=TwoWay}" />-->
+                <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedClass.Markdown}" />
             </StackLayout>
         </ScrollView>
     </ContentPage>