From 54c95529855d4c887ec598555976ebe06999bfba Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Sat, 13 Apr 2024 18:54:46 +0800
Subject: [PATCH] refactor: remove duplicate ObjectConverters, remove unused
 using

---
 src/Converters/ObjectConverters.cs | 13 -------------
 src/ViewModels/DiffContext.cs      |  7 +------
 src/Views/DiffView.axaml           |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 src/Converters/ObjectConverters.cs

diff --git a/src/Converters/ObjectConverters.cs b/src/Converters/ObjectConverters.cs
deleted file mode 100644
index 8b11ef93..00000000
--- a/src/Converters/ObjectConverters.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia.Data.Converters;
-
-namespace SourceGit.Converters
-{
-    public static class ObjectConverters
-    {
-        public static readonly FuncValueConverter<object, bool> IsNull =
-            new FuncValueConverter<object, bool>(v => v == null);
-
-        public static readonly FuncValueConverter<object, bool> IsNotNull =
-            new FuncValueConverter<object, bool>(v => v != null);
-    }
-}
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 7c2aab14..e0c9de25 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -8,7 +8,6 @@ using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using SourceGit.Models;
 
 namespace SourceGit.ViewModels
 {
@@ -74,10 +73,7 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _fileModeDiff, value);
         }
 
-        public TextTrimming PathTrimming
-        {
-            get => _pathTrimming;
-        }
+        public TextTrimming PathTrimming { get; } = new TextLeadingPrefixTrimming("...", 20);
 
         public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null)
         {
@@ -199,6 +195,5 @@ namespace SourceGit.ViewModels
         private object _content = null;
         private Vector _syncScrollOffset = Vector.Zero;
         private Models.FileModeDiff _fileModeDiff = null;
-        private TextTrimming _pathTrimming = new TextLeadingPrefixTrimming("...", 20);
     }
 }
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index cb56de34..568d47b8 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -27,7 +27,7 @@
             <Path DockPanel.Dock="Right" Classes="rotating" Width="10" Height="10" Margin="8,0" Data="{StaticResource Icons.Loading}" IsVisible="{Binding IsLoading}"/>
           </DockPanel>
 
-          <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" IsVisible="{Binding FileModeDiff, Converter={x:Static c:ObjectConverters.IsNotNull}}">
+          <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" IsVisible="{Binding FileModeDiff, Converter={x:Static ObjectConverters.IsNotNull}}">
             <TextBlock Classes="monospace" Margin="8,0,0,0" Text="{DynamicResource Text.Diff.FileModeChanged}" FontSize="11"/>
             <TextBlock Classes="monospace" Text="{Binding FileModeDiff.Old}" FontSize="11"/>
             <TextBlock Margin="4,0" Text="→"/>