From dc63e39c69e1a3aa9628ec08de3a58a6c6ff61d9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 26 May 2024 12:17:15 +0800
Subject: [PATCH] fix: warning about EnumConverters.Equals

---
 src/Converters/EnumConverters.cs |  9 ---------
 src/Views/CreateBranch.axaml     | 11 ++++++++---
 2 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 src/Converters/EnumConverters.cs

diff --git a/src/Converters/EnumConverters.cs b/src/Converters/EnumConverters.cs
deleted file mode 100644
index 4b719cba..00000000
--- a/src/Converters/EnumConverters.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Controls.Converters;
-
-namespace SourceGit.Converters
-{
-    public static class EnumConverters
-    {
-        public static readonly EnumToBoolConverter Equals = new EnumToBoolConverter();
-    }
-}
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 3089f9e4..5fa0b237 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -6,6 +6,7 @@
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
+             xmlns:ac="using:Avalonia.Controls.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="SourceGit.Views.CreateBranch"
              x:DataType="vm:CreateBranch">
@@ -60,17 +61,21 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.CreateBranch.LocalChanges}"/>
       <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
+        <StackPanel.Resources>
+          <ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
+        </StackPanel.Resources>
+        
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={x:Static c:EnumConverters.Equals}, ConverterParameter={x:Static vm:BeforeCreateBranchAction.StashAndReaply}}"/>
+                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static vm:BeforeCreateBranchAction.StashAndReaply}}"/>
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
                      GroupName="LocalChanges"
                      Margin="8,0,0,0"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={x:Static c:EnumConverters.Equals}, ConverterParameter={x:Static vm:BeforeCreateBranchAction.Discard}}"/>
+                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static vm:BeforeCreateBranchAction.Discard}}"/>
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
                      GroupName="LocalChanges"
                      Margin="8,0,0,0"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={x:Static c:EnumConverters.Equals}, ConverterParameter={x:Static vm:BeforeCreateBranchAction.DoNothing}}"/>
+                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static vm:BeforeCreateBranchAction.DoNothing}}"/>
       </StackPanel>
       
       <CheckBox Grid.Row="3" Grid.Column="1"