Forráskód Böngészése

Implemented Android and Desktop ImageToPdf stubs
Fixed PAckage version sync issues

frankvandenbos 2 hete
szülő
commit
aee31b7c08

+ 1 - 1
InABox.Avalonia.Platform.Android/InABox.Avalonia.Platform.Android.csproj

@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="Avalonia.Android" Version="11.2.2" />
       <PackageReference Include="bblanchon.PDFium.Android" Version="136.0.7073" />
-      <PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.70" />
+      <PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.71" />
       <PackageReference Include="PDFtoImage" Version="4.1.1" />
     </ItemGroup>
 

+ 8 - 3
InABox.Avalonia.Platform.Android/PdfRenderer.Android.cs

@@ -9,7 +9,7 @@ public class Android_PdfRenderer : IPdfRenderer
         
     public Logger? Logger { get; set; }
     
-    public byte[]? RenderPdf(byte[]? pdf, int page, int dpi)
+    public byte[]? PdfToImage(byte[]? pdf, int page, int dpi)
     {
         if (pdf?.Any() != true)
             return null;
@@ -19,7 +19,12 @@ public class Android_PdfRenderer : IPdfRenderer
         return ms.ToArray();
     }
 
-    public Task<byte[]?> RenderPdfAsync(byte[]? pdf, int page, int dpi)
-        => Task.Run(() => RenderPdf(pdf, page, dpi));
+    public Task<byte[]?> PdfToImageAsync(byte[]? pdf, int page, int dpi)
+        => Task.Run(() => PdfToImage(pdf, page, dpi));
 
+
+    public byte[]? ImageToPdf(byte[]? image) => null;
+
+    public Task<byte[]?> ImageToPdfAsync(byte[]? image)
+        => Task.Run(() => ImageToPdf(image));
 }

+ 9 - 3
InABox.Avalonia.Platform.Desktop/Desktop.PdfRenderer.cs

@@ -6,7 +6,7 @@ namespace InABox.Avalonia.Platform.Desktop;
 
 public class Desktop_PdfRenderer : IPdfRenderer
 {
-    public byte[]? RenderPdf(byte[]? pdf, int page, int dpi)
+    public byte[]? PdfToImage(byte[]? pdf, int page, int dpi)
     {
         if (pdf?.Any() != true)
             return null;
@@ -17,8 +17,14 @@ public class Desktop_PdfRenderer : IPdfRenderer
         return ms.ToArray();
     }
 
-    public Task<byte[]?> RenderPdfAsync(byte[]? pdf, int page, int dpi)
-        => Task.Run(() => RenderPdf(pdf, page, dpi));
+    public Task<byte[]?> PdfToImageAsync(byte[]? pdf, int page, int dpi)
+        => Task.Run(() => PdfToImage(pdf, page, dpi));
+
+    public byte[]? ImageToPdf(byte[]? image)
+        => null;
+
+    public Task<byte[]?> ImageToPdfAsync(byte[]? image)
+        => Task.Run(() => ImageToPdf(image));
 
     public Logger? Logger { get; set; }
 }

+ 1 - 1
InABox.Avalonia.Platform.Desktop/InABox.Avalonia.Platform.Desktop.csproj

@@ -16,7 +16,7 @@
 
     <ItemGroup>
         <PackageReference Include="bblanchon.PDFium.Win32" Version="135.0.7019" />
-        <PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.70" />
+        <PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.71" />
         <PackageReference Include="PDFtoImage" Version="4.1.1" />
         <PackageReference Include="SkiaSharp" Version="2.88.9" />
     </ItemGroup>

+ 1 - 4
InABox.Avalonia/Components/Modules/ModuleList/AvaloniaModuleCollection.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;

+ 1 - 1
InABox.Avalonia/InABox.Avalonia.csproj

@@ -22,11 +22,11 @@
     </ItemGroup>
 
     <ItemGroup>
-<<<<<<< HEAD
       <PackageReference Include="Autofac" Version="8.3.0" />
       <PackageReference Include="Avalonia" Version="11.2.2" />
       <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.2" />
       <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.2" />
+      <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
       <PackageReference Include="AvaloniaDialogs" Version="3.6.1" />
       <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
       <PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.71" />

+ 1 - 1
InABox.Client.Local/InABox.Client.Local.csproj

@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+      <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
     </ItemGroup>
 
 </Project>

+ 1 - 1
InABox.Database/InABox.Database.csproj

@@ -11,7 +11,7 @@
         <PackageReference Include="Newtonsoft.Json">
             <Version>13.0.3</Version>
         </PackageReference>
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
     </ItemGroup>
 
     <ItemGroup>

+ 1 - 2
InABox.Integration/InABox.Integration.csproj

@@ -2,8 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <Nullable>enable</Nullable>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
 </Project>

+ 1 - 1
inabox.client.ipc/InABox.Client.IPC.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="H.Formatters.BinaryFormatter" Version="2.0.59" />
     <PackageReference Include="H.Pipes" Version="2.0.59" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+    <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
inabox.database.sqlite/InABox.Database.SQLite.csproj

@@ -29,7 +29,7 @@
 
     <ItemGroup>
         <PackageReference Include="Quickenshtein" Version="1.5.1" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
         <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
     </ItemGroup>
 

+ 1 - 1
inabox.ipc.shared/InABox.IPC.Shared.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="H.Pipes" Version="2.0.59" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+    <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
inabox.scripting/InABox.Scripting.csproj

@@ -15,7 +15,7 @@
         <PackageReference Include="RoslynPad.Roslyn" Version="4.8.0" />
         <PackageReference Include="SixLabors.Fonts" Version="2.1.3" />
         <PackageReference Include="SixLabors.ImageSharp" Version="3.1.8" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
     </ItemGroup>
 

+ 1 - 1
inabox.wpf/InABox.Wpf.csproj

@@ -159,7 +159,7 @@
         <PackageReference Include="Syncfusion.SfSpreadsheet.WPF" Version="29.2.7" />
         <PackageReference Include="Syncfusion.Tools.WPF.Classic" Version="19.4.0.56" />
         <PackageReference Include="Syncfusion.XlsIO.Wpf" Version="29.2.7" />
-        <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
     </ItemGroup>