From 366e467578aa6c8c0caafe430f1b738c9a15db90 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 1 Jul 2024 20:27:59 +0800
Subject: [PATCH 1/3] feature: add new color key `Color.DecoratorFG` to
 customize foreground color of commit refs (#225)

---
 README.md                      | 1 +
 src/Resources/Themes.axaml     | 3 +++
 src/Views/CommitBaseInfo.axaml | 2 +-
 src/Views/Histories.axaml      | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3f75cca6..0a7817c8 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@ This app supports open repository in external tools listed in the table below.
 | Color.DecoratorIcon | Foreground color for commit ref icon |
 | Color.DecoratorBranch | Background color for commit branch ref name |
 | Color.DecoratorTag | Background color for commit tag ref name |
+| Color.DecoratorFG | Foreground color for commit tag ref name |
 | Color.Border0 | Border color used in some controls, like Window, Tab, Toolbar, etc. |
 | Color.Border1 | Border color used in inputs, like TextBox, ComboBox, etc. |
 | Color.Border2 | Border color used in visual lines, like seperators, Rectange, etc. |
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 1f3a0d10..3dc7943f 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -17,6 +17,7 @@
       <Color x:Key="Color.DecoratorIcon">#FFF8F8F8</Color>
       <Color x:Key="Color.DecoratorBranch">#FFFFB835</Color>
       <Color x:Key="Color.DecoratorTag">#FF02C302</Color>
+      <Color x:Key="Color.DecoratorFG">Black</Color>
       <Color x:Key="Color.Conflict">#FF836C2E</Color>
       <Color x:Key="Color.ConflictForeground">#FFFFFFFF</Color>
       <Color x:Key="Color.Border0">#FFCFCFCF</Color>
@@ -49,6 +50,7 @@
       <Color x:Key="Color.DecoratorIcon">#FFF8F8F8</Color>
       <Color x:Key="Color.DecoratorBranch">#FFFFB835</Color>
       <Color x:Key="Color.DecoratorTag">#FF02C302</Color>
+      <Color x:Key="Color.DecoratorFG">Black</Color>
       <Color x:Key="Color.Conflict">#FFFAFAD2</Color>
       <Color x:Key="Color.ConflictForeground">#FF252525</Color>
       <Color x:Key="Color.Border0">#FF181818</Color>
@@ -81,6 +83,7 @@
   <SolidColorBrush x:Key="Brush.DecoratorIcon" Color="{DynamicResource Color.DecoratorIcon}"/>
   <SolidColorBrush x:Key="Brush.DecoratorBranch" Color="{DynamicResource Color.DecoratorBranch}"/>
   <SolidColorBrush x:Key="Brush.DecoratorTag" Color="{DynamicResource Color.DecoratorTag}"/>
+  <SolidColorBrush x:Key="Brush.DecoratorFG" Color="{DynamicResource Color.DecoratorFG}"/>
   <SolidColorBrush x:Key="Brush.Conflict" Color="{DynamicResource Color.Conflict}"/>
   <SolidColorBrush x:Key="Brush.ConflictForeground" Color="{DynamicResource Color.ConflictForeground}"/>
   <SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 6e0429aa..3d3dd826 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -94,7 +94,7 @@
                       <Path Width="8" Height="8" Data="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToIcon}}" Fill="{DynamicResource Brush.DecoratorIcon}"/>
                     </Border>
                     <Border Background="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToBackground}}">
-                      <TextBlock Classes="monospace" Text="{Binding Name}" FontSize="10" Margin="4,0" Foreground="Black"/>
+                      <TextBlock Classes="monospace" Text="{Binding Name}" FontSize="10" Margin="4,0" Foreground="{DynamicResource Brush.DecoratorFG}"/>
                     </Border>
                   </StackPanel>
                 </Border>
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index d1aae81d..e07b8d0b 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -58,7 +58,7 @@
                                            Text="{Binding Name}" 
                                            FontSize="10" 
                                            Margin="4,0" 
-                                           Foreground="Black"
+                                           Foreground="{DynamicResource Brush.DecoratorFG}"
                                            FontWeight="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToFontWeight}}"/>
                               </Border>
                             </StackPanel>

From 6e724d255716c5ada027f541bd73763140074ef5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 1 Jul 2024 20:29:52 +0800
Subject: [PATCH 2/3] readme: description of colors

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0a7817c8..303f9136 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ This app supports open repository in external tools listed in the table below.
 | Color.DecoratorIcon | Foreground color for commit ref icon |
 | Color.DecoratorBranch | Background color for commit branch ref name |
 | Color.DecoratorTag | Background color for commit tag ref name |
-| Color.DecoratorFG | Foreground color for commit tag ref name |
+| Color.DecoratorFG | Foreground color for commit ref name |
 | Color.Border0 | Border color used in some controls, like Window, Tab, Toolbar, etc. |
 | Color.Border1 | Border color used in inputs, like TextBox, ComboBox, etc. |
 | Color.Border2 | Border color used in visual lines, like seperators, Rectange, etc. |

From 4998f14547f7a541f9ad872f46c98f4344634c81 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 1 Jul 2024 20:31:43 +0800
Subject: [PATCH 3/3] ux: option order

---
 src/Views/Fetch.axaml | 8 ++++----
 src/Views/Pull.axaml  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Views/Fetch.axaml b/src/Views/Fetch.axaml
index fbcf094b..1f91b24a 100644
--- a/src/Views/Fetch.axaml
+++ b/src/Views/Fetch.axaml
@@ -38,12 +38,12 @@
                 IsChecked="{Binding FetchAllRemotes, Mode=TwoWay}"/>
 
       <CheckBox Grid.Row="2" Grid.Column="1"
-                Content="{DynamicResource Text.Fetch.NoTags}"
-                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
-
-      <CheckBox Grid.Row="3" Grid.Column="1"
                 Content="{DynamicResource Text.Fetch.Prune}"
                 IsChecked="{Binding Prune, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="3" Grid.Column="1"
+                Content="{DynamicResource Text.Fetch.NoTags}"
+                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index 23d86e1e..fca58231 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -86,12 +86,12 @@
       </StackPanel>
 
       <CheckBox Grid.Row="4" Grid.Column="1"
-                Content="{DynamicResource Text.Pull.NoTags}"
-                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
-
-      <CheckBox Grid.Row="5" Grid.Column="1"
                 Content="{DynamicResource Text.Pull.UseRebase}"
                 IsChecked="{Binding UseRebase, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="5" Grid.Column="1"
+                Content="{DynamicResource Text.Pull.NoTags}"
+                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>