refactor: move some codes from App to Views.ControlExtensions

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

Author: love-linger

src/App.Commands.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Windows.Input;
-
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
 namespace SourceGit
@@ -45,16 +43,6 @@ public static bool IsCheckForUpdateCommandVisible
         public static readonly Command OpenAboutCommand = new Command(async _ => await ShowDialog(new Views.About()));
         public static readonly Command CheckForUpdateCommand = new Command(_ => (Current as App)?.Check4Update(true));
         public static readonly Command QuitCommand = new Command(_ => Quit(0));
-        public static readonly Command CopyTextBlockCommand = new Command(async p =>
-        {
-            if (p is not TextBlock textBlock)
-                return;
-
-            if (textBlock.Inlines is { Count: > 0 } inlines)
-                await CopyTextAsync(inlines.Text);
-            else if (!string.IsNullOrEmpty(textBlock.Text))
-                await CopyTextAsync(textBlock.Text);
-        });
 
         public static readonly Command HideAppCommand = new Command(_ =>
         {

src/App.axaml.cs

@@ -1,19 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
-using System.Reflection;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
-using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
@@ -32,7 +28,7 @@ public static void Main(string[] args)
 
             AppDomain.CurrentDomain.UnhandledException += (_, e) =>
             {
-                LogException(e.ExceptionObject as Exception);
+                Native.OS.LogException(e.ExceptionObject as Exception);
             };
 
             TaskScheduler.UnobservedTaskException += (_, e) =>
@@ -51,7 +47,7 @@ public static void Main(string[] args)
             }
             catch (Exception ex)
             {
-                LogException(ex);
+                Native.OS.LogException(ex);
             }
         }
 
@@ -76,52 +72,9 @@ public static AppBuilder BuildAvaloniaApp()
             Native.OS.SetupApp(builder);
             return builder;
         }
-
-        public static void LogException(Exception ex)
-        {
-            if (ex == null)
-                return;
-
-            var crashDir = Path.Combine(Native.OS.DataDir, "crashes");
-            if (!Directory.Exists(crashDir))
-                Directory.CreateDirectory(crashDir);
-
-            var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
-            var file = Path.Combine(crashDir, $"{time}.log");
-            using var writer = new StreamWriter(file);
-            writer.WriteLine($"Crash::: {ex.GetType().FullName}: {ex.Message}");
-            writer.WriteLine();
-            writer.WriteLine("----------------------------");
-            writer.WriteLine($"Version: {Assembly.GetExecutingAssembly().GetName().Version}");
-            writer.WriteLine($"OS: {Environment.OSVersion}");
-            writer.WriteLine($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}");
-            writer.WriteLine($"Source: {ex.Source}");
-            writer.WriteLine($"Thread Name: {Thread.CurrentThread.Name ?? "Unnamed"}");
-            writer.WriteLine($"App Start Time: {Process.GetCurrentProcess().StartTime}");
-            writer.WriteLine($"Exception Time: {DateTime.Now}");
-            writer.WriteLine($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB");
-            writer.WriteLine("----------------------------");
-            writer.WriteLine();
-            writer.WriteLine(ex);
-            writer.Flush();
-        }
         #endregion
 
         #region Utility Functions
-        public static Control CreateViewForViewModel(object data)
-        {
-            var dataTypeName = data.GetType().FullName;
-            if (string.IsNullOrEmpty(dataTypeName) || !dataTypeName.Contains(".ViewModels.", StringComparison.Ordinal))
-                return null;
-
-            var viewTypeName = dataTypeName.Replace(".ViewModels.", ".Views.");
-            var viewType = Type.GetType(viewTypeName);
-            if (viewType != null)
-                return Activator.CreateInstance(viewType) as Control;
-
-            return null;
-        }
-
         public static Task ShowDialog(object data, Window owner = null)
         {
             if (owner == null)
@@ -135,7 +88,7 @@ public static Task ShowDialog(object data, Window owner = null)
             if (data is Views.ChromelessWindow window)
                 return window.ShowDialog(owner);
 
-            window = CreateViewForViewModel(data) as Views.ChromelessWindow;
+            window = Views.ControlExtensions.CreateFromViewModels(data) as Views.ChromelessWindow;
             if (window != null)
             {
                 window.DataContext = data;
@@ -149,7 +102,7 @@ public static void ShowWindow(object data)
         {
             if (data is not Views.ChromelessWindow window)
             {
-                window = CreateViewForViewModel(data) as Views.ChromelessWindow;
+                window = Views.ControlExtensions.CreateFromViewModels(data) as Views.ChromelessWindow;
                 if (window == null)
                     return;
 
@@ -330,19 +283,6 @@ public static void SetFonts(string defaultFont, string monospaceFont)
             }
         }
 
-        public static async Task CopyTextAsync(string data)
-        {
-            if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow.Clipboard: { } clipboard })
-                await clipboard.SetTextAsync(data ?? "");
-        }
-
-        public static async Task<string> GetClipboardTextAsync()
-        {
-            if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow.Clipboard: { } clipboard })
-                return await clipboard.TryGetTextAsync();
-            return null;
-        }
-
         public static string Text(string key, params object[] args)
         {
             var fmt = Current?.FindResource($"Text.{key}") as string;
@@ -355,19 +295,6 @@ public static string Text(string key, params object[] args)
             return string.Format(fmt, args);
         }
 
-        public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
-        {
-            var icon = new Avalonia.Controls.Shapes.Path();
-            icon.Width = 12;
-            icon.Height = 12;
-            icon.Stretch = Stretch.Uniform;
-
-            if (Current?.FindResource(key) is StreamGeometry geo)
-                icon.Data = geo;
-
-            return icon;
-        }
-
         public static ViewModels.Launcher GetLauncher()
         {
             return Current is App app ? app._launcher : null;
@@ -427,32 +354,12 @@ public override void OnFrameworkInitializationCompleted()
                 if (TryLaunchAsAskpass(desktop))
                     return;
 
-                _ipcChannel = new Models.IpcChannel();
-                if (!_ipcChannel.IsFirstInstance)
-                {
-                    var arg = desktop.Args is { Length: > 0 } ? desktop.Args[0].Trim() : string.Empty;
-                    if (!string.IsNullOrEmpty(arg))
-                    {
-                        if (arg.StartsWith('"') && arg.EndsWith('"'))
-                            arg = arg.Substring(1, arg.Length - 2).Trim();
-
-                        if (arg.Length > 0 && !Path.IsPathFullyQualified(arg))
-                            arg = Path.GetFullPath(arg);
-                    }
-
-                    _ipcChannel.SendToFirstInstance(arg);
-                    Environment.Exit(0);
-                }
-                else
-                {
-                    _ipcChannel.MessageReceived += TryOpenRepository;
-                    desktop.Exit += (_, _) => _ipcChannel.Dispose();
-                    TryLaunchAsNormal(desktop);
-                }
+                TryLaunchAsNormal(desktop);
             }
         }
         #endregion
 
+        #region Launch Ways
         private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode)
         {
             exitCode = -1;
@@ -613,6 +520,24 @@ private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
 
         private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
         {
+            _ipcChannel = new Models.IpcChannel();
+            if (!_ipcChannel.IsFirstInstance)
+            {
+                var arg = desktop.Args is { Length: > 0 } ? desktop.Args[0].Trim() : string.Empty;
+                if (!string.IsNullOrEmpty(arg))
+                {
+                    if (arg.StartsWith('"') && arg.EndsWith('"'))
+                        arg = arg.Substring(1, arg.Length - 2).Trim();
+
+                    if (arg.Length > 0 && !Path.IsPathFullyQualified(arg))
+                        arg = Path.GetFullPath(arg);
+                }
+
+                _ipcChannel.SendToFirstInstance(arg);
+                Environment.Exit(0);
+                return;
+            }
+
             Native.OS.SetupExternalTools();
             Models.AvatarManager.Instance.Start();
 
@@ -627,40 +552,26 @@ private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
             desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
             desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
 
-#if !DISABLE_UPDATE_DETECTION
-            if (pref.ShouldCheck4UpdateOnStartup())
-                Check4Update();
-#endif
-        }
-
-        private void TryOpenRepository(string repo)
-        {
-            if (!string.IsNullOrEmpty(repo) && Directory.Exists(repo))
+            _ipcChannel.MessageReceived += repo =>
             {
-                var test = new Commands.QueryRepositoryRootPath(repo).GetResult();
-                if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
+                Dispatcher.UIThread.Invoke(() =>
                 {
-                    Dispatcher.UIThread.Invoke(() =>
-                    {
-                        var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false);
-                        ViewModels.Welcome.Instance.Refresh();
-                        _launcher?.OpenRepositoryInTab(node, null);
-
-                        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: Views.Launcher wnd })
-                            wnd.BringToTop();
-                    });
+                    _launcher.TryOpenRepositoryFromPath(repo);
+                    if (desktop.MainWindow is Views.Launcher main)
+                        main.BringToTop();
+                });
+            };
 
-                    return;
-                }
-            }
+            desktop.Exit += (_, _) => _ipcChannel.Dispose();
 
-            Dispatcher.UIThread.Invoke(() =>
-            {
-                if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: Views.Launcher launcher })
-                    launcher.BringToTop();
-            });
+#if !DISABLE_UPDATE_DETECTION
+            if (pref.ShouldCheck4UpdateOnStartup())
+                Check4Update();
+#endif
         }
+        #endregion
 
+        #region Check for Updates
         private void Check4Update(bool manually = false)
         {
             Task.Run(async () =>
@@ -716,6 +627,7 @@ private void ShowSelfUpdateResult(object data)
                 // Ignore exceptions.
             }
         }
+        #endregion
 
         private string FixFontFamilyName(string input)
         {

src/Native/OS.cs

@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
-
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 
@@ -153,6 +154,35 @@ public static void SetupForWindow(Window window)
             _backend.SetupWindow(window);
         }
 
+        public static void LogException(Exception ex)
+        {
+            if (ex == null)
+                return;
+
+            var crashDir = Path.Combine(DataDir, "crashes");
+            if (!Directory.Exists(crashDir))
+                Directory.CreateDirectory(crashDir);
+
+            var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
+            var file = Path.Combine(crashDir, $"{time}.log");
+            using var writer = new StreamWriter(file);
+            writer.WriteLine($"Crash::: {ex.GetType().FullName}: {ex.Message}");
+            writer.WriteLine();
+            writer.WriteLine("----------------------------");
+            writer.WriteLine($"Version: {Assembly.GetExecutingAssembly().GetName().Version}");
+            writer.WriteLine($"OS: {Environment.OSVersion}");
+            writer.WriteLine($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}");
+            writer.WriteLine($"Source: {ex.Source}");
+            writer.WriteLine($"Thread Name: {Thread.CurrentThread.Name ?? "Unnamed"}");
+            writer.WriteLine($"App Start Time: {Process.GetCurrentProcess().StartTime}");
+            writer.WriteLine($"Exception Time: {DateTime.Now}");
+            writer.WriteLine($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB");
+            writer.WriteLine("----------------------------");
+            writer.WriteLine();
+            writer.WriteLine(ex);
+            writer.Flush();
+        }
+
         public static string FindGitExecutable()
         {
             return _backend.FindGitExecutable();

src/Resources/Styles.axaml

@@ -540,36 +540,6 @@
     <Setter Property="Foreground" Value="{DynamicResource Brush.InlineCodeFG}"/>
   </Style>
 
-  <Style Selector="SelectableTextBlock">
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-    <Setter Property="VerticalAlignment" Value="Center"/>
-    <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
-  </Style>
-  <Style Selector="SelectableTextBlock[IsEnabled=True]">
-    <Setter Property="ContextFlyout">
-      <Setter.Value>
-        <MenuFlyout Placement="Bottom">
-          <MenuItem Header="{DynamicResource Text.Copy}"
-                    Command="{Binding $parent[SelectableTextBlock].Copy}"
-                    IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}"
-                    InputGesture="{x:Static TextBox.CopyGesture}">
-            <MenuItem.Icon>
-              <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
-            </MenuItem.Icon>
-          </MenuItem>
-
-          <MenuItem Header="{DynamicResource Text.CopyAllText}"
-                    Command="{x:Static s:App.CopyTextBlockCommand}"
-                    CommandParameter="{Binding $parent[SelectableTextBlock]}">
-            <MenuItem.Icon>
-              <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
-            </MenuItem.Icon>
-          </MenuItem>
-        </MenuFlyout>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <Style Selector="TextBox">
     <Setter Property="CornerRadius" Value="0"/>
     <Setter Property="Padding" Value="4,0"/>