code_review: code review for PR #33

* use PNG instead of SVG for external tool icons and remove dependency `Avalonia.SVG`
* remove unused property `IsVSCodeFound` and `IsFleetFound`
* find VS from registry first
* remove compile warning CA1416
* remove unused enum `OS.Platforms`

Author: love-linger

src/SourceGit/Native/OS.cs

@@ -3,8 +3,6 @@
 
 using Avalonia;
 
-// ReSharper disable InconsistentNaming
-
 namespace SourceGit.Native
 {
     public static class OS
@@ -29,27 +27,24 @@ public interface IBackend
 
         public static string FleetExecutableFile { get; set; }
 
-        public enum Platforms
-        {
-            Unknown = 0,
-            Windows = 1,
-            MacOS = 2,
-            Linux
-        }
-
-        public static Platforms Platform => OperatingSystem.IsWindows() ? Platforms.Windows : OperatingSystem.IsMacOS() ? Platforms.MacOS : OperatingSystem.IsLinux() ? Platforms.Linux : Platforms.Unknown;
-
         static OS()
         {
-            _backend = Platform switch
+            if (OperatingSystem.IsWindows())
+            {
+                _backend = new Windows();
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                _backend = new MacOS();
+            }
+            else if (OperatingSystem.IsLinux())
             {
-#pragma warning disable CA1416
-                Platforms.Windows => new Windows(),
-                Platforms.MacOS => new MacOS(),
-                Platforms.Linux => new Linux(),
-#pragma warning restore CA1416
-                _ => throw new Exception("Platform unsupported!!!")
-            };
+                _backend = new Linux();
+            }
+            else
+            {
+                throw new Exception("Platform unsupported!!!");
+            }
 
             VSCodeExecutableFile = _backend.FindVSCode();
             FleetExecutableFile = _backend.FindFleet();
@@ -95,7 +90,10 @@ public static void OpenInVSCode(string repo)
 
             Process.Start(new ProcessStartInfo()
             {
-                WorkingDirectory = repo, FileName = VSCodeExecutableFile, Arguments = $"\"{repo}\"", UseShellExecute = false,
+                WorkingDirectory = repo,
+                FileName = VSCodeExecutableFile,
+                Arguments = $"\"{repo}\"",
+                UseShellExecute = false,
             });
         }
 
@@ -111,7 +109,10 @@ public static void OpenInFleet(string repo)
 
             Process.Start(new ProcessStartInfo()
             {
-                WorkingDirectory = repo, FileName = FleetExecutableFile, Arguments = $"\"{repo}\"", UseShellExecute = false,
+                WorkingDirectory = repo,
+                FileName = FleetExecutableFile,
+                Arguments = $"\"{repo}\"",
+                UseShellExecute = false,
             });
         }
     }

src/SourceGit/Native/Windows.cs

@@ -103,11 +103,21 @@ public string FindGitExecutable()
 
         public string FindVSCode()
         {
+            var root = Microsoft.Win32.RegistryKey.OpenBaseKey(
+                    Microsoft.Win32.RegistryHive.LocalMachine,
+                    Environment.Is64BitOperatingSystem ? Microsoft.Win32.RegistryView.Registry64 : Microsoft.Win32.RegistryView.Registry32);
+
+            var vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1");
+            if (vscode != null)
+            {
+                return vscode.GetValue("DisplayIcon") as string;
+            }
+
             var toolPath = Environment.ExpandEnvironmentVariables($"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\AppData\\Local\\Programs\\Microsoft VS Code\\Code.exe");
             if (File.Exists(toolPath)) return toolPath;
             return string.Empty;
         }
-        
+
         public string FindFleet()
         {
             var toolPath = Environment.ExpandEnvironmentVariables($"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\AppData\\Local\\Programs\\Fleet\\Fleet.exe");

src/SourceGit/Resources/ExternalToolIcons/fleet.png

@@ -23,6 +23,7 @@
   <ItemGroup>
     <AvaloniaResource Include="App.ico" />
     <AvaloniaResource Include="Resources/Fonts/*" />
+    <AvaloniaResource Include="Resources/ExternalToolIcons/*" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,7 +45,6 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.0.10" />
     <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Svg" Version="11.0.0.16" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
@@ -58,8 +58,4 @@
     <TrimmerRootAssembly Include="SourceGit" />
     <TrimmerRootAssembly Include="Avalonia.Themes.Fluent" />
   </ItemGroup>
-
-  <ItemGroup>
-    <AvaloniaResource Include="Resources\ExternalToolIcons\*" />
-  </ItemGroup>
 </Project>

src/SourceGit/Resources/ExternalToolIcons/fleet_icon.svg

@@ -49,18 +49,6 @@ public AvaloniaList<string> CommitMessages
             set;
         } = new AvaloniaList<string>();
 
-        [JsonIgnore]
-        public bool IsVSCodeFound
-        {
-            get => !string.IsNullOrEmpty(Native.OS.VSCodeExecutableFile);
-        }
-        
-        [JsonIgnore]
-        public bool IsFleetFound
-        {
-            get => !string.IsNullOrEmpty(Native.OS.FleetExecutableFile);
-        }
-
         [JsonIgnore]
         public Models.GitFlow GitFlow
         {
@@ -291,7 +279,7 @@ public void OpenInVSCode()
         {
             Native.OS.OpenInVSCode(_fullpath);
         }
-        
+
         public void OpenInFleet()
         {
             Native.OS.OpenInFleet(_fullpath);

src/SourceGit/Resources/ExternalToolIcons/vscode.png

@@ -18,33 +18,33 @@
             <Path Width="15" Height="13" Data="{StaticResource Icons.Folder.Open}"/>
           </Button>
           <Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}">
-              <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
+            <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
           </Button>
 
           <Button Classes="icon_button" Width="32" ToolTip.Tip="{DynamicResource Text.Repository.OpenWith}">
-              <Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/>
-              <Button.Flyout>
-                  <MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
-                  <MenuItem Header="{DynamicResource Text.Repository.Fleet}" Click="OpenInFleet">
-                      <MenuItem.Icon>
-                          <Svg Path="/Resources/ExternalToolIcons/fleet_icon.svg" Width="13" Height="13" />
-                      </MenuItem.Icon>
-                  </MenuItem>
-                  <MenuItem Header="{DynamicResource Text.Repository.VSCode}" Click="OpenInVSCode">
-                      <MenuItem.Icon>
-                          <Svg Path="/Resources/ExternalToolIcons/vscode_icon.svg" Width="13" Height="13" />
-                      </MenuItem.Icon>
-                  </MenuItem>
+            <Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/>
+            <Button.Flyout>
+              <MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
+                <MenuItem Header="{DynamicResource Text.Repository.Fleet}" Command="{Binding OpenInFleet}">
+                  <MenuItem.Icon>
+                    <Image Source="/Resources/ExternalToolIcons/fleet.png" Width="13" Height="13" />
+                  </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="{DynamicResource Text.Repository.VSCode}" Command="{Binding OpenInVSCode}">
+                  <MenuItem.Icon>
+                    <Image Source="/Resources/ExternalToolIcons/vscode.png" Width="13" Height="13" />
+                  </MenuItem.Icon>
+                </MenuItem>
               </MenuFlyout>
-              </Button.Flyout>
-            </Button>
-            <ToggleButton Width="32"
-                          Background="Transparent"
-                          IsChecked="{Binding IsSearching, Mode=TwoWay}"
-                          ToolTip.Tip="{DynamicResource Text.Repository.Search}">
-                <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
-            </ToggleButton>
-            
+            </Button.Flyout>
+          </Button>
+          <ToggleButton Width="32"
+                        Background="Transparent"
+                        IsChecked="{Binding IsSearching, Mode=TwoWay}"
+                        ToolTip.Tip="{DynamicResource Text.Repository.Search}">
+            <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
+          </ToggleButton>
+
         </StackPanel>
 
         <StackPanel Grid.Column="1" Orientation="Horizontal">
@@ -83,7 +83,7 @@
         </StackPanel>
 
         <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
-          <ToggleButton Classes="layout_direction" 
+          <ToggleButton Classes="layout_direction"
                         Width="32" Height="26"
                         IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseTwoColumnsLayoutInHistories, Mode=TwoWay}"
                         IsVisible="{Binding SelectedViewIndex, Converter={x:Static c:IntConverters.IsZero}}"
@@ -198,12 +198,12 @@
                   <TextBlock Classes="monospace" FontSize="10" HorizontalAlignment="Center" Margin="9,0" Text="{Binding UpstreamTrackStatus}"/>
                 </Border>
 
-                <ToggleButton Grid.Column="3" 
-                              Classes="filter" 
-                              Margin="0,0,8,0" 
-                              Background="Transparent" 
-                              IsVisible="{Binding IsBranch}" 
-                              Checked="OnToggleFilter" 
+                <ToggleButton Grid.Column="3"
+                              Classes="filter"
+                              Margin="0,0,8,0"
+                              Background="Transparent"
+                              IsVisible="{Binding IsBranch}"
+                              Checked="OnToggleFilter"
                               Unchecked="OnToggleFilter"
                               IsChecked="{Binding IsFiltered}"/>
               </Grid>
@@ -230,22 +230,22 @@
               <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
             </Style>
           </TreeView.Styles>
-          
+
           <TreeView.ItemTemplate>
             <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type m:BranchTreeNode}">
               <Grid Height="24" ColumnDefinitions="Auto,*,Auto" Background="Transparent" ContextRequested="OnRemoteBranchContextMenuRequested">
                 <Path Grid.Column="0" Classes="folder_icon" Width="10" Height="10" Margin="0,2,0,0" IsVisible="{Binding IsFolder}" VerticalAlignment="Center"/>
                 <Path Grid.Column="0" Width="10" Height="10" Margin="0,4,0,0" Data="{StaticResource Icons.Remote}" IsVisible="{Binding IsRemote}" VerticalAlignment="Center"/>
                 <Path Grid.Column="0" Width="10" Height="10" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}" VerticalAlignment="Center"/>
-                
+
                 <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace" Margin="8,0,4,0"/>
-                
-                <ToggleButton Grid.Column="2" 
-                              Classes="filter" 
-                              Margin="0,0,8,0" 
-                              Background="Transparent" 
-                              Checked="OnToggleFilter" 
-                              Unchecked="OnToggleFilter" 
+
+                <ToggleButton Grid.Column="2"
+                              Classes="filter"
+                              Margin="0,0,8,0"
+                              Background="Transparent"
+                              Checked="OnToggleFilter"
+                              Unchecked="OnToggleFilter"
                               IsVisible="{Binding IsBranch}"
                               IsChecked="{Binding IsFiltered}"/>
               </Grid>
@@ -301,10 +301,10 @@
             <DataGridTemplateColumn Header="FILTER">
               <DataGridTemplateColumn.CellTemplate>
                 <DataTemplate x:DataType="{x:Type m:Tag}">
-                  <ToggleButton Classes="filter" 
-                                Margin="0,0,8,0" 
-                                Background="Transparent" 
-                                Checked="OnToggleFilter" 
+                  <ToggleButton Classes="filter"
+                                Margin="0,0,8,0"
+                                Background="Transparent"
+                                Checked="OnToggleFilter"
                                 Unchecked="OnToggleFilter"
                                 IsChecked="{Binding IsFiltered}"/>
                 </DataTemplate>
@@ -318,10 +318,10 @@
           <Grid ColumnDefinitions="Auto,*,Auto,Auto">
             <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Submodules}"/>
             <TextBlock Grid.Column="1" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-            <Button Grid.Column="2" 
-                    Classes="icon_button" 
-                    Width="14" 
-                    Margin="8,0" 
+            <Button Grid.Column="2"
+                    Classes="icon_button"
+                    Width="14"
+                    Margin="8,0"
                     Click="UpdateSubmodules"
                     IsVisible="{Binding Submodules, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"
                     ToolTip.Tip="{DynamicResource Text.Repository.Submodules.Update}">
@@ -371,7 +371,7 @@
       <!-- Left Search Mode -->
       <Grid Grid.Column="0" RowDefinitions="32,*" IsVisible="{Binding IsSearching}" PropertyChanged="OnSearchCommitPanelPropertyChanged">
         <!-- Search -->
-        <TextBox Grid.Row="0" 
+        <TextBox Grid.Row="0"
                  x:Name="txtSearchCommitsBox"
                  Margin="4,2"
                  Height="24"
@@ -445,7 +445,7 @@
             </DataGridTemplateColumn>
           </DataGrid.Columns>
         </DataGrid>
-        
+
         <Path Grid.Row="1"
               HorizontalAlignment="Center" VerticalAlignment="Center"
               Width="48" Height="48"