refactor: move context menu creation from ViewModels to Views (PART 10)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/App.axaml.cs

@@ -17,7 +17,6 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
-using Avalonia.Platform.Storage;
 using Avalonia.Styling;
 using Avalonia.Threading;
 
@@ -344,14 +343,6 @@ public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
             return icon;
         }
 
-        public static IStorageProvider GetStorageProvider()
-        {
-            if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                return desktop.MainWindow?.StorageProvider;
-
-            return null;
-        }
-
         public static ViewModels.Launcher GetLauncher()
         {
             return Current is App app ? app._launcher : null;

src/ViewModels/Conflict.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
@@ -101,19 +102,19 @@ public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
             }
         }
 
-        public void UseTheirs()
+        public async Task UseTheirsAsync()
         {
-            _wc.UseTheirs([_change]);
+            await _wc.UseTheirsAsync([_change]);
         }
 
-        public void UseMine()
+        public async Task UseMineAsync()
         {
-            _wc.UseMine([_change]);
+            await _wc.UseMineAsync([_change]);
         }
 
-        public async void OpenExternalMergeTool()
+        public async Task OpenExternalMergeToolAsync()
         {
-            await _wc.UseExternalMergeTool(_change);
+            await _wc.UseExternalMergeToolAsync(_change);
         }
 
         private WorkingCopy _wc = null;