From 999a6d4f87190ac23fefc35e199939b81b6b84b0 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Sun, 12 May 2019 22:00:37 +0200 Subject: [PATCH] Ouvrir avec --- .../PlayerCharacter/PlayerCharacterEditorViewModel.cs | 10 +++++----- .../Views/PlayerCharacter/PdfViewPage.xaml.cs | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 7731a5d9..106c8adf 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -1224,8 +1224,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter public async Task ExecuteGenerateAndOpenPdfCommandAsync() { - await GeneratePdfAsync(SelectedPlayerCharacter); - await OpenPdfAsync(); + var filename = await GeneratePdfAsync(SelectedPlayerCharacter); + await OpenPdfAsync(filename); } public string BasePdfDirectory @@ -1305,10 +1305,10 @@ namespace AideDeJeu.ViewModels.PlayerCharacter }); } - async Task OpenPdfAsync() + public async Task OpenPdfAsync(string filename) { - var testfile = Path.Combine(Xamarin.Essentials.FileSystem.CacheDirectory, "test.pdf"); - await DependencyService.Get().LaunchFileAsync("hophop", "coucou", testfile); + var filepath = Path.Combine(BasePdfDirectory, filename); + await DependencyService.Get().LaunchFileAsync("hophop", "coucou", filepath); } private int PickAbility(ref List mins, ref List maxs, string name) diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs index 85408ba9..7a2e3572 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs @@ -2,7 +2,9 @@ using AideDeJeu.ViewModels.PlayerCharacter; using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; using System.Windows.Input; @@ -45,6 +47,12 @@ namespace AideDeJeu.Views.PlayerCharacter private async Task ExecuteShareCommandAsync() { var result = await DisplayActionSheet("Actions", "Annuler", null, "Envoyer vers...", "Ouvrir avec..."); + if(result == "Ouvrir avec...") + { + string filePath = Path.Combine(Xamarin.Essentials.FileSystem.CacheDirectory, Path.Combine("pdf", WebUtility.UrlEncode(PdfFile.Result))); + await DependencyService.Get().OpenPdfAsync(filePath); + + } } } } \ No newline at end of file