mbabienco/MayShow
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: Add iOS version #10

Draft
Deadpikle wants to merge 67 commits from feature/ios into main
pull from: feature/ios
merge into: mbabienco:main
Conversation 0 Commits 67 Files Changed 92
+4 -3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 236eccf3d1 - Show all commits
src/MayShow.Shared/ViewModels/CreatePDFReportViewModel.cs
+4 -3
View File
@@ -458,8 +458,9 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
try try
{ {
var outputFilePath = await DeterminePDFSaveLocation(); var outputFilePath = await DeterminePDFSaveLocation();
if (outputFilePath == null) if (outputFilePath == null && _settings.PDFOutputSaveLocation != PDFSaveLocation.AlwaysAsk)
{ {
// if always ask and output is null, they probably hit cancel.
await DialogHost.Show(new WarningViewModel("Error: Output file path could not be determined. Current save location set in settings: " + Enum.GetName(_settings.PDFOutputSaveLocation))); await DialogHost.Show(new WarningViewModel("Error: Output file path could not be determined. Current save location set in settings: " + Enum.GetName(_settings.PDFOutputSaveLocation)));
} }
else if (_settings.PDFOutputSaveLocation == PDFSaveLocation.OtherChosenDir && else if (_settings.PDFOutputSaveLocation == PDFSaveLocation.OtherChosenDir &&
@@ -467,7 +468,7 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
{ {
await DialogHost.Show(new WarningViewModel("Error: Output directory not found! Please adjust the application Settings before continuing. Output directory: " + _settings.OutputPdfDir)); await DialogHost.Show(new WarningViewModel("Error: Output directory not found! Please adjust the application Settings before continuing. Output directory: " + _settings.OutputPdfDir));
} }
else else if (outputFilePath != null)
{ {
await Task.Run(() => CreatePDF(outputFilePath)); await Task.Run(() => CreatePDF(outputFilePath));
} }
@@ -550,7 +551,7 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
SuggestedFileName = ReportTitle + ".pdf" SuggestedFileName = ReportTitle + ".pdf"
}); });
if (result.File is not null) if (result.File != null)
{ {
// Console.WriteLine("1: {0}", result.File.Path.AbsolutePath); // HTML escaped?! // Console.WriteLine("1: {0}", result.File.Path.AbsolutePath); // HTML escaped?!
// Console.WriteLine("2: {0}", result.File.Path.AbsoluteUri); // starts with file:// // Console.WriteLine("2: {0}", result.File.Path.AbsoluteUri); // starts with file://