From c3e41491ef7929c6d1e4a962ed767208a3519fed Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sun, 19 May 2019 12:40:15 +0200
Subject: [PATCH] PushAsync au lieu de modal pour le pdf

---
 .../Views/PlayerCharacter/PdfViewPage.xaml    | 21 +++++--------------
 .../Views/PlayerCharacter/PdfViewPage.xaml.cs |  3 ++-
 .../PlayerCharacterEditorPage.xaml.cs         |  9 ++++----
 Data/baby_bestiary.md                         |  2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml
index fcc4d4d8..3765154e 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml
@@ -3,31 +3,20 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:views="clr-namespace:AideDeJeu.Views"
              x:Class="AideDeJeu.Views.PlayerCharacter.PdfViewPage"
-             x:Name="this">
+             x:Name="this"
+             Title="{Binding PdfFile.Result}">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Icon="share.png" Text="Partager..." Order="Primary" IsEnabled="{Binding PdfFile.IsSuccessfullyCompleted}" Command="{Binding ShareCommand, Source={x:Reference this}}" />
+    </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="auto" />
-            </Grid.ColumnDefinitions>
-            <ImageButton Grid.Column="0" BackgroundColor="White" HeightRequest="32" Margin="5" Source="cancel.png" Command="{Binding CloseCommand, Source={x:Reference this}}"/>
-            <ImageButton Grid.Column="2" BackgroundColor="White" HeightRequest="32" Margin="5" Source="share.png" Command="{Binding ShareCommand, Source={x:Reference this}}"/>
             <ActivityIndicator 
-                Grid.Row="1"
-                Grid.ColumnSpan="3"
                 IsRunning="{Binding PdfFile.IsNotCompleted}"
                 IsVisible="{Binding PdfFile.IsNotCompleted}"
                 VerticalOptions="CenterAndExpand" 
                 HorizontalOptions="CenterAndExpand" />
             
             <views:PdfView 
-                Grid.Row="1"
-                Grid.ColumnSpan="3"
                 IsVisible="{Binding PdfFile.IsSuccessfullyCompleted}" 
                 Uri="{Binding PdfFile.Result}" 
                 HorizontalOptions="FillAndExpand" 
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs
index e64078d9..74206185 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs
@@ -33,7 +33,8 @@ namespace AideDeJeu.Views.PlayerCharacter
 
         private async Task ExecuteCloseCommandAsync()
         {
-            await Navigation.PopModalAsync(true);
+            //await Navigation.PopModalAsync(true);
+            await Navigation.PopAsync(true);
         }
 
         public ICommand ShareCommand
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
index d665faab..c46d4a06 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
@@ -55,17 +55,18 @@ namespace AideDeJeu.Views.PlayerCharacter
         {
             get
             {
-                return new Command<object>(ExecutePdfViewCommand);
+                return new Command<PlayerCharacterViewModel>(async(pc) => await ExecutePdfViewCommandAsync(pc));
             }
         }
 
-        public void ExecutePdfViewCommand(object param)
+        public async Task ExecutePdfViewCommandAsync(PlayerCharacterViewModel pc)
         {
             var vm = BindingContext as PlayerCharacterEditorViewModel;
             var page = new PdfViewPage();
-            page.PdfFile = new Tools.NotifyTaskCompletion<string>(Task.Run(async() => await vm.GeneratePdfAsync(param as PlayerCharacterViewModel)));
+            page.PdfFile = new Tools.NotifyTaskCompletion<string>(Task.Run(async() => await vm.GeneratePdfAsync(pc)));
             page.BindingContext = page;
-            Navigation.PushModalAsync(page, true);
+            //Navigation.PushModalAsync(page, true);
+            await Navigation.PushAsync(page, true);
         }
     }
 }
\ No newline at end of file
diff --git a/Data/baby_bestiary.md b/Data/baby_bestiary.md
index 7a81e2b5..b03ecf28 100644
--- a/Data/baby_bestiary.md
+++ b/Data/baby_bestiary.md
@@ -1777,7 +1777,7 @@ _Touché :_ 2 (1d4) dégâts perforants et la cible doit effectuer un jet de sau
 
 - **Sens** <!--Senses-->vision dans le noir à 18 m, Perception passive +2<!--/Senses-->
 - **Langues** <!--Languages-->commun, géant<!--/Languages-->
-- **Puissance** <!--Challenge-->1 (200 PX)<!--/Challenge-->
+- **Dangerosité** <!--Challenge-->1 (200 PX)<!--/Challenge-->
 
 ## Capacités