diff --git a/AideDeJeu/AideDeJeu/Pdf/PdfService.cs b/AideDeJeu/AideDeJeu/Pdf/PdfService.cs index 95ad6b3f..a6f62793 100644 --- a/AideDeJeu/AideDeJeu/Pdf/PdfService.cs +++ b/AideDeJeu/AideDeJeu/Pdf/PdfService.cs @@ -137,8 +137,8 @@ namespace AideDeJeu.Pdf string fontPath = fontName; if(Xamarin.Essentials.DeviceInfo.Platform != Xamarin.Essentials.DevicePlatform.Unknown) { - fontPath = Path.Combine(Xamarin.Essentials.FileSystem.AppDataDirectory, fontPath); - //fontPath = Path.Combine(Xamarin.Essentials.FileSystem.CacheDirectory, fontPath); + //fontPath = Path.Combine(Xamarin.Essentials.FileSystem.AppDataDirectory, fontPath); + fontPath = Path.Combine(Xamarin.Essentials.FileSystem.CacheDirectory, fontPath); } using (var inFont = AideDeJeu.Tools.Helpers.GetResourceStream($"AideDeJeu.Pdf.{fontName}")) { @@ -149,8 +149,8 @@ namespace AideDeJeu.Pdf } FontFactory.Register(fontPath); - //return iTextSharp.text.pdf.BaseFont.CreateFont(fontPath, iTextSharp.text.pdf.BaseFont.IDENTITY_H, iTextSharp.text.pdf.BaseFont.EMBEDDED, true, null, null, true, true); - return iTextSharp.text.pdf.BaseFont.CreateFont(); + return iTextSharp.text.pdf.BaseFont.CreateFont(fontPath, iTextSharp.text.pdf.BaseFont.IDENTITY_H, iTextSharp.text.pdf.BaseFont.EMBEDDED); + //return iTextSharp.text.pdf.BaseFont.CreateFont(); } BaseFont _CinzelRegular = null; diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 4b2680f7..7953ac87 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -1268,16 +1268,16 @@ namespace AideDeJeu.ViewModels.PlayerCharacter var form = stamper.AcroFields; var fields = form.Fields; #if DEBUG - foreach (DictionaryEntry field in fields) - { - var item = field.Value as AcroFields.Item; - Debug.WriteLine(field.Key); - if (field.Key.ToString().Equals("Portrait")) - { - Debug.WriteLine("Portrait"); - } - form.SetField(field.Key.ToString(), field.Key.ToString()); - } + //foreach (DictionaryEntry field in fields) + //{ + // var item = field.Value as AcroFields.Item; + // Debug.WriteLine(field.Key); + // if (field.Key.ToString().Equals("Portrait")) + // { + // Debug.WriteLine("Portrait"); + // } + // form.SetField(field.Key.ToString(), field.Key.ToString()); + //} #endif // DEBUG form.SetField("Nom", SelectedPlayerCharacter?.Name ?? string.Empty); @@ -1379,6 +1379,27 @@ namespace AideDeJeu.ViewModels.PlayerCharacter }; #endregion Level + + + public Command PdfViewCommand + { + get + { + return new Command(async (pc) => await ExecutePdfViewCommandAsync(pc)); + } + } + + public async Task ExecutePdfViewCommandAsync(PlayerCharacterViewModel pc) + { + //var vm = BindingContext as PlayerCharacterEditorViewModel; + var page = new Views.PlayerCharacter.PdfViewPage(); + page.PdfFile = new Tools.NotifyTaskCompletion(Task.Run(async () => await GeneratePdfAsync(pc))); + page.BindingContext = page; + //Navigation.PushModalAsync(page, true); + await Shell.Current.Navigation.PushAsync(page, true); + } + + } } diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml index ad1df53f..3d69c9c1 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml @@ -4,8 +4,10 @@ xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" + xmlns:pcvm="clr-namespace:AideDeJeu.ViewModels.PlayerCharacter" x:Class="AideDeJeu.Views.PlayerCharacter.RacePage" - x:Name="This"> + x:Name="This" + x:DataType="pcvm:PlayerCharacterEditorViewModel"> @@ -13,7 +15,7 @@ - + @@ -46,8 +48,8 @@ - - +