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

Refactor mime types, apple type identifiers, file picker type filter

Browse Source
This commit is contained in:
Michael Babienco
2026-04-22 17:20:19 +09:00
parent 287ef24113
commit ed26989678
3 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MayShow.Shared/Helpers/Constants.cs
+3
View File
@@ -11,6 +11,9 @@ class Constants
public static string[] AllowedFileExtensionPatterns = [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
public static string[] AllowedFileExtensionsNoStar = [ "png", "jpg", "jpeg", "gif", "bmp", "webp", "pdf", "heic", ];
public static string[] FilePickerMimeTypes = [ "image/*", "application/pdf", "image/heic" ];
public static string[] FilePickerAppleTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ];
public static string ReportSavedDataFileName = "report_data.json";
public static List<DateDisplayFormat> GetDateDisplayFormats()
src/MayShow.Shared/Helpers/Utilities.cs
+21
View File
@@ -9,6 +9,7 @@ using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Avalonia.Platform.Storage;
using MayShow.Models;
namespace MayShow.Helpers;
@@ -140,4 +141,24 @@ class Utilities
var json = await reader.ReadToEndAsync();
await File.WriteAllTextAsync(path, json);
}
public static FilePickerFileType[] GetReportFilePickerFileTypes()
{
return [
new FilePickerFileType("All Types")
{
Patterns = Constants.AllowedFileExtensionPatterns,
AppleUniformTypeIdentifiers = Constants.FilePickerAppleTypeIdentifiers,
MimeTypes = Constants.FilePickerMimeTypes,
},
FilePickerFileTypes.ImageAll,
new FilePickerFileType("HEIC Images")
{
Patterns = [ "*.heic" ],
AppleUniformTypeIdentifiers = [ "public.heic" ],
MimeTypes = [ "image/heic" ]
},
FilePickerFileTypes.Pdf,
];
}
}
src/MayShow.Shared/ViewModels/CreatePDFReportViewModel.cs
+2 -32
View File
@@ -296,22 +296,7 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
{
Title = "Choose image or PDF files...",
AllowMultiple = true,
FileTypeFilter = [
new FilePickerFileType("All Types")
{
Patterns = Constants.AllowedFileExtensionPatterns,
AppleUniformTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ],
MimeTypes = [ "image/*", "application/pdf", "image/heic" ]
},
FilePickerFileTypes.ImageAll,
new FilePickerFileType("HEIC Images")
{
Patterns = [ "*.heic" ],
AppleUniformTypeIdentifiers = [ "public.heic" ],
MimeTypes = [ "image/heic" ]
},
FilePickerFileTypes.Pdf,
],
FileTypeFilter = Utilities.GetReportFilePickerFileTypes(),
});
if (files.Count > 0)
{
@@ -401,22 +386,7 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
{
Title = "Choose image or PDF file...",
AllowMultiple = false,
FileTypeFilter = [
new FilePickerFileType("All Types")
{
Patterns = Constants.AllowedFileExtensionPatterns,
AppleUniformTypeIdentifiers = [ "public.image", "com.adobe.pdf", "public.heic" ],
MimeTypes = [ "image/*", "application/pdf", "image/heic" ]
},
FilePickerFileTypes.ImageAll,
new FilePickerFileType("HEIC Images")
{
Patterns = [ "*.heic" ],
AppleUniformTypeIdentifiers = [ "public.heic" ],
MimeTypes = [ "image/heic" ]
},
FilePickerFileTypes.Pdf,
],
FileTypeFilter = Utilities.GetReportFilePickerFileTypes(),
});
if (files.Count > 0)
{