From bd9a1535f021318677609eaea2006e87f23c9e5a Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Thu, 9 May 2019 00:39:17 +0200
Subject: [PATCH] Nouvelle ergo pc

---
 AideDeJeu/AideDeJeu/App.xaml.cs               |  2 +
 .../PlayerCharacterEditorViewModel.cs         | 75 ++++++++++++-------
 .../PlayerCharacterEditorPage.xaml            |  6 +-
 .../PlayerCharacterEditorPage.xaml.cs         | 25 ++++---
 4 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/App.xaml.cs b/AideDeJeu/AideDeJeu/App.xaml.cs
index d3b369e0..ac96cb1e 100644
--- a/AideDeJeu/AideDeJeu/App.xaml.cs
+++ b/AideDeJeu/AideDeJeu/App.xaml.cs
@@ -1,5 +1,6 @@
 using AideDeJeu.ViewModels;
 using AideDeJeu.ViewModels.Library;
+using AideDeJeu.ViewModels.PlayerCharacter;
 using AideDeJeu.Views;
 using AideDeJeuLib;
 using System.Linq;
@@ -20,6 +21,7 @@ namespace AideDeJeu
             DependencyService.Register<MainViewModel>();
             DependencyService.Register<BookmarksViewModel>();
             DependencyService.Register<StoreViewModel>();
+            DependencyService.Register<PlayerCharacterEditorViewModel>();
             var vm = DependencyService.Get<MainViewModel>();
             var titlered = (Color)Resources["HDRed"];
             var bgtan = (Color)Resources["HDWhite"];
diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
index 170f0643..a4b4dc7e 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
@@ -21,37 +21,54 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
     public class PlayerCharacterEditorViewModel : BaseViewModel
     {
         private Random _Random;
+
+        public ICommand ResetPlayerCharacterCommand
+        {
+            get
+            {
+                return new Command(async() => await ExecuteResetPlayerCharacterCommandAsync());
+            }
+        }
+
+        private async Task ExecuteResetPlayerCharacterCommandAsync()
+        {
+            await Task.Run(() =>
+            {
+                _Random = new Random(DateTime.Now.Millisecond);
+
+                SelectedPlayerCharacter = new PlayerCharacterViewModel() { Background = new BackgroundViewModel(), Abilities = new AbilitiesViewModel() };
+                SelectedPlayerCharacter.PropertyChanged += SelectedPlayerCharacter_PropertyChanged;
+
+
+                ResetAlignments();
+                Races = new NotifyTaskCompletion<List<RaceViewModel>>(Task.Run(() => LoadRacesAsync()));
+                Classes = new NotifyTaskCompletion<List<ClassViewModel>>(Task.Run(() => LoadClassesAsync()));
+
+                Backgrounds = new NotifyTaskCompletion<List<BackgroundItem>>(Task.Run(() => LoadBackgroundsAsync()));
+                SelectedBackground = null;
+                //NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(null);
+                SubBackgrounds = null;
+                SelectedSubBackground = null;
+                //NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(null);
+                PersonalityTraits = null;
+                PersonalityIdeals = null;
+                PersonalityLinks = null;
+                PersonalityDefects = null;
+                SelectedPersonalityTrait = null;
+                SelectedPersonalityIdeal = null;
+                SelectedPersonalityLink = null;
+                SelectedPersonalityDefect = null;
+                BackgroundSpecialties = null;
+                SubBackgroundSpecialties = null;
+                BackgroundSpecialty = null;
+                BackgroundSkill = null;
+                SubBackgroundSkill = null;
+            });
+        }
+
         public PlayerCharacterEditorViewModel()
         {
-            _Random = new Random(DateTime.Now.Millisecond);
-
-            SelectedPlayerCharacter = new PlayerCharacterViewModel() { Background = new BackgroundViewModel(), Abilities = new AbilitiesViewModel() };
-            SelectedPlayerCharacter.PropertyChanged += SelectedPlayerCharacter_PropertyChanged;
-
-
-            ResetAlignments();
-            Races = new NotifyTaskCompletion<List<RaceViewModel>>(Task.Run(() => LoadRacesAsync()));
-            Classes = new NotifyTaskCompletion<List<ClassViewModel>>(Task.Run(() => LoadClassesAsync()));
-
-            Backgrounds = new NotifyTaskCompletion<List<BackgroundItem>>(Task.Run(() => LoadBackgroundsAsync()));
-            SelectedBackground = null;
-            //NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(null);
-            SubBackgrounds = null;
-            SelectedSubBackground = null;
-            //NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(null);
-            PersonalityTraits = null;
-            PersonalityIdeals = null;
-            PersonalityLinks = null;
-            PersonalityDefects = null;
-            SelectedPersonalityTrait = null;
-            SelectedPersonalityIdeal = null;
-            SelectedPersonalityLink = null;
-            SelectedPersonalityDefect = null;
-            BackgroundSpecialties = null;
-            SubBackgroundSpecialties = null;
-            BackgroundSpecialty = null;
-            BackgroundSkill = null;
-            SubBackgroundSkill = null;
+            ExecuteResetPlayerCharacterCommandAsync();
         }
 
         private void SelectedPlayerCharacter_PropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
index ac927c01..61f69e71 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
@@ -52,9 +52,9 @@
             <tools:NullToFalseConverter x:Key="NullToFalseConverter" />
         </ResourceDictionary>
     </CarouselPage.Resources>
-    <CarouselPage.ToolbarItems>
+    <!--<CarouselPage.ToolbarItems>
         <ToolbarItem Text="Ouvrir en PDF avec..." Command="{Binding GenerateAndOpenPdfCommand}" Order="Secondary" />
-    </CarouselPage.ToolbarItems>
+    </CarouselPage.ToolbarItems>-->
     <ContentPage x:Name="Race" Title="Race">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -68,6 +68,7 @@
             
             <pcviews:RaceView Grid.ColumnSpan="2" BindingContext="{Binding}" />
 
+            <Button Grid.Column="0" Grid.Row="1" Text="Nouveau" Command="{Binding ResetPlayerCharacterCommand}"/>
             <Button Grid.Column="1" Grid.Row="1" Text="Classe" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Class}"/>
         </Grid>
     </ContentPage>
@@ -170,6 +171,7 @@
             <pcviews:ResumeView Grid.ColumnSpan="2" BindingContext="{Binding}" />
 
             <Button Grid.Column="0" Grid.Row="1" Text="Finalisation" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Finalize}"/>
+            <Button Grid.Column="1" Grid.Row="1" Text="Ouvrir en PDF" Command="{Binding GenerateAndOpenPdfCommand}" />
         </Grid>
     </ContentPage>
 </CarouselPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
index 03b07c6d..a8bcd545 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
@@ -17,21 +17,26 @@ namespace AideDeJeu.Views.PlayerCharacter
     {
         public PlayerCharacterEditorPage()
         {
-            BindingContext = new PlayerCharacterEditorViewModel();
+            //if(DependencyService.Get<PlayerCharacterEditorViewModel>() == null)
+            //{
+            //    DependencyService.Register<PlayerCharacterEditorViewModel>();
+            //}
+
+            BindingContext = DependencyService.Get<PlayerCharacterEditorViewModel>(); // new PlayerCharacterEditorViewModel();
 
             InitializeComponent();
 
         }
 
-        protected override bool OnBackButtonPressed()
-        {
-            Device.BeginInvokeOnMainThread(async () => {
-                var result = await this.DisplayAlert("Attention", "Si vous revenez au menu, vous perdrez le personnage en cours de création", "Menu", "Annuler");
-                if (result) await this.Navigation.PopAsync();
-            });
-            return true;
-            //return base.OnBackButtonPressed();
-        }
+        //protected override bool OnBackButtonPressed()
+        //{
+        //    Device.BeginInvokeOnMainThread(async () => {
+        //        var result = await this.DisplayAlert("Attention", "Si vous revenez au menu, vous perdrez le personnage en cours de création", "Menu", "Annuler");
+        //        if (result) await this.Navigation.PopAsync();
+        //    });
+        //    return true;
+        //    //return base.OnBackButtonPressed();
+        //}
 
         public Command ChangePageCommand
         {