From 07c7f2c88b99c80db2f1738105f658e31781a633 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sat, 13 Apr 2019 02:36:04 +0200
Subject: [PATCH] Test

---
 .../Views/PlayerCharacterEditorPage.xaml      | 27 ++++++++++---------
 .../AideDeJeu/Views/StringPickerView.xaml.cs  | 22 ++++++++-------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
index e50e75a4..dbeb96e0 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
@@ -19,18 +19,6 @@
             <tools:NullToFalseConverter x:Key="NullToFalseConverter" />
         </ResourceDictionary>
     </TabbedPage.Resources>
-    <ContentPage Title="Généralités">
-        <ScrollView Orientation="Vertical">
-            <StackLayout>
-                <Entry Placeholder="Nom" Text="{Binding Name}" Keyboard="Text" />
-                <!--<Picker Title="Alignement" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" ItemsSource="{Binding Alignments.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding AlignmentSelectedIndex, Mode=TwoWay}" />-->
-                <views:ItemPickerView BindingContext="{Binding}" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" Title="Alignement" ItemsSource="{Binding Alignments.Result}" SelectedItem="{Binding SelectedAlignment, Mode=TwoWay}" />
-
-                <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Alignment.Description}" />-->
-                <Picker Title="Niveau" HorizontalOptions="FillAndExpand" ItemsSource="{Binding Levels}" ItemDisplayBinding="{Binding StringFormat='Niveau : {0}'}" />
-            </StackLayout>
-        </ScrollView>
-    </ContentPage>
     <ContentPage Title="Race">
         <ScrollView Orientation="Vertical">
             <StackLayout>
@@ -59,6 +47,9 @@
                 <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}" />
 
+                <!-- test -->
+                <!--<views:StringPickerView BindingContext="{Binding}" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}" Title="Compétences" SelectedItem="{Binding PreferedBackground.Abilities}" />-->
+
                 <Frame BorderColor="Black" Padding="2" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Compétences" />
@@ -121,6 +112,18 @@
             </StackLayout>
         </ScrollView>
     </ContentPage>
+    <ContentPage Title="Finalisation">
+        <ScrollView Orientation="Vertical">
+            <StackLayout>
+                <Entry Placeholder="Nom" Text="{Binding Name}" Keyboard="Text" />
+                <!--<Picker Title="Alignement" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" ItemsSource="{Binding Alignments.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding AlignmentSelectedIndex, Mode=TwoWay}" />-->
+                <views:ItemPickerView BindingContext="{Binding}" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" Title="Alignement" ItemsSource="{Binding Alignments.Result}" SelectedItem="{Binding SelectedAlignment, Mode=TwoWay}" />
+
+                <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Alignment.Description}" />-->
+                <Picker Title="Niveau" HorizontalOptions="FillAndExpand" ItemsSource="{Binding Levels}" ItemDisplayBinding="{Binding StringFormat='Niveau : {0}'}" />
+            </StackLayout>
+        </ScrollView>
+    </ContentPage>
     <ContentPage Title="Résumé">
         <ScrollView Orientation="Vertical">
             <StackLayout>
diff --git a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
index bfeb2ec9..c820b93c 100644
--- a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
@@ -86,15 +86,19 @@ namespace AideDeJeu.Views
         }
         private async Task<string> ExecuteStringPickerCommandAsync(System.Collections.IEnumerable strings)
         {
-            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();
-            await Main.Navigator.Navigation.PopModalAsync(true);
-            return result;
+            if (strings != null)
+            {
+                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();
+                await Main.Navigator.Navigation.PopModalAsync(true);
+                return result;
+            }
+            return SelectedItem;
         }
     }
 }
\ No newline at end of file