Refactoring, misc.

src/PicView.Avalonia.MacOS/App.axaml.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
+using System.Diagnostics;
 using System.Runtime;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -318,7 +314,12 @@ public void ShowAboutWindow()
         // TODO: Implement CutFile
         return false;
     }
-    
+
+    public Task CopyImageToClipboard()
+    {
+        return Task.CompletedTask;
+    }
+
     public Task<bool> ExtractWithLocalSoftwareAsync(string path, string tempDirectory)
     {
         // TODO: Implement ExtractWithLocalSoftwareAsync

src/PicView.Avalonia.Win32/App.axaml.cs

@@ -20,10 +20,11 @@ using PicView.WindowsNT.Lockscreen;
 using PicView.WindowsNT.Taskbar;
 using PicView.WindowsNT.Wallpaper;
 using Dispatcher = Avalonia.Threading.Dispatcher;
+using Win32Clipboard = PicView.WindowsNT.Copy.Win32Clipboard;
 
 namespace PicView.Avalonia.Win32;
 
-public class App : Application, IPlatformSpecificService
+public partial class App : Application, IPlatformSpecificService
 {
     private WinMainWindow? _mainWindow;
     private ExifWindow? _exifWindow;
@@ -403,6 +404,11 @@ public class App : Application, IPlatformSpecificService
     {
         return Win32Clipboard.CopyFileToClipboard(true, path);
     }
+
+    public Task CopyImageToClipboard()
+    {
+        return Task.CompletedTask;
+    }
     
     public async Task<bool> ExtractWithLocalSoftwareAsync(string path, string tempDirectory)
     {

src/PicView.Avalonia/Clipboard/ClipboardHelper.cs

@@ -64,7 +64,7 @@ public static class ClipboardHelper
         }
     }
 
-    public static async Task CopyImageToClipboard()
+    public static async Task CopyImageToClipboard(MainViewModel vm)
     {
         // TODO: Implement CopyImageToClipboard
     }

src/PicView.Avalonia/Interfaces/IPlatformSpecificService.cs

@@ -43,6 +43,8 @@ public interface IPlatformSpecificService
     
     bool CutFile(string path);
     
+    Task CopyImageToClipboard();
+    
     Task<bool> ExtractWithLocalSoftwareAsync(string path, string tempDirectory);
 
     string DefaultJsonKeyMap();

src/PicView.Avalonia/UI/FunctionsHelper.cs

@@ -700,7 +700,11 @@ public static class FunctionsHelper
 
     public static async Task CopyImage()
     {
-        await ClipboardHelper.CopyImageToClipboard();
+        if (Vm is null)
+        {
+            return;
+        }
+        await ClipboardHelper.CopyImageToClipboard(Vm);
     }
 
     public static async Task CopyBase64()

src/PicView.WindowsNT/FileHandling/Win32Clipboard.cs → src/PicView.WindowsNT/Copy/Win32Clipboard.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace PicView.WindowsNT.FileHandling;
+namespace PicView.WindowsNT.Copy;
 
 public static partial class Win32Clipboard
 {

src/PicView.WindowsNT/PicView.WindowsNT.csproj

@@ -28,10 +28,6 @@
     <PlatformTarget>ARM64</PlatformTarget>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Copy\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PicView.Core\PicView.Core.csproj" />
   </ItemGroup>