From 929239656cc8f70a21c3186d5065fb6605a87527 Mon Sep 17 00:00:00 2001
From: Mike Ward <mike@mike-ward.net>
Date: Sun, 9 Jan 2022 09:26:17 -0600
Subject: [PATCH] Add hide close button feature #104

---
 src/tweetz.core/Interfaces/ISettings.cs                   | 4 ++--
 src/tweetz.core/Models/Settings.cs                        | 8 ++++++++
 src/tweetz.core/Resources/Strings.xaml                    | 1 +
 src/tweetz.core/ViewModels/TitleBarControlViewModel.cs    | 3 +--
 .../Views/SettingsBlock/SettingsOptionsBlock.xaml         | 6 ++++++
 src/tweetz.core/Views/TitleBarView.xaml                   | 3 ++-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/tweetz.core/Interfaces/ISettings.cs b/src/tweetz.core/Interfaces/ISettings.cs
index 89d12c07..6d89b376 100644
--- a/src/tweetz.core/Interfaces/ISettings.cs
+++ b/src/tweetz.core/Interfaces/ISettings.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using tweetz.core.Models;
 
 namespace tweetz.core.Interfaces
@@ -20,6 +19,7 @@ public interface ISettings : INotifyPropertyChanged
         bool                      HideTranslate         { get; }
         bool                      HideRetweets          { get; set; }
         bool                      HideNoMediaTweets     { get; set; }
+        bool                      HideCloseButton       { get; set; }
         bool                      SpellCheck            { get; set; }
         bool                      ShowInSystemTray      { get; set; }
         bool                      AlwaysOnTop           { get; set; }
diff --git a/src/tweetz.core/Models/Settings.cs b/src/tweetz.core/Models/Settings.cs
index 89534b03..7382894e 100644
--- a/src/tweetz.core/Models/Settings.cs
+++ b/src/tweetz.core/Models/Settings.cs
@@ -47,6 +47,7 @@ public Settings(IMessageBoxService messageBoxService)
         private bool           hideTranslate;
         private bool           hideRetweets;
         private bool           hideNoMediaTweets;
+        private bool           hideCloseButton;
         private bool           donated;
         private bool           spellCheck;
         private bool           showInSystemTray;
@@ -152,6 +153,12 @@ public bool HideNoMediaTweets
             set => SetProperty(ref hideNoMediaTweets, value);
         }
 
+        public bool HideCloseButton
+        {
+            get => hideCloseButton;
+            set => SetProperty(ref hideCloseButton, value);
+        }
+
         public bool SpellCheck
         {
             get => spellCheck;
@@ -285,6 +292,7 @@ private void CopySettings(Settings settings)
             HideTranslate         = settings.HideTranslate;
             HideRetweets          = settings.HideRetweets;
             HideNoMediaTweets     = settings.hideNoMediaTweets;
+            HideCloseButton       = settings.hideCloseButton;
             SpellCheck            = settings.SpellCheck;
             ShowInSystemTray      = settings.showInSystemTray;
             AlwaysOnTop           = settings.alwaysOnTop;
diff --git a/src/tweetz.core/Resources/Strings.xaml b/src/tweetz.core/Resources/Strings.xaml
index 9b8156db..55204c03 100644
--- a/src/tweetz.core/Resources/Strings.xaml
+++ b/src/tweetz.core/Resources/Strings.xaml
@@ -30,6 +30,7 @@
   <sys:String x:Key="hide-translate-link">Hide translate link</sys:String>
   <sys:String x:Key="hide-retweets">Hide retweets</sys:String>
   <sys:String x:Key="hide-no-media-tweets">Hide tweets with no media</sys:String>
+  <sys:String x:Key="hide-close-button">Hide close button</sys:String>
   <sys:String x:Key="run-on-startup">Run on startup</sys:String>
   <sys:String x:Key="font-size-title">Font size</sys:String>
   <sys:String x:Key="theme-title">Theme</sys:String>
diff --git a/src/tweetz.core/ViewModels/TitleBarControlViewModel.cs b/src/tweetz.core/ViewModels/TitleBarControlViewModel.cs
index c23cbb25..00df8362 100644
--- a/src/tweetz.core/ViewModels/TitleBarControlViewModel.cs
+++ b/src/tweetz.core/ViewModels/TitleBarControlViewModel.cs
@@ -1,5 +1,4 @@
-using System.Windows;
-using tweetz.core.Extensions;
+using tweetz.core.Extensions;
 using tweetz.core.Interfaces;
 
 namespace tweetz.core.ViewModels
diff --git a/src/tweetz.core/Views/SettingsBlock/SettingsOptionsBlock.xaml b/src/tweetz.core/Views/SettingsBlock/SettingsOptionsBlock.xaml
index d2905340..a2b3f150 100644
--- a/src/tweetz.core/Views/SettingsBlock/SettingsOptionsBlock.xaml
+++ b/src/tweetz.core/Views/SettingsBlock/SettingsOptionsBlock.xaml
@@ -48,6 +48,12 @@
         TextWrapping="Wrap" />
     </CheckBox>
 
+    <CheckBox IsChecked="{Binding Settings.HideCloseButton}">
+      <TextBlock
+        Text="{StaticResource hide-close-button}"
+        TextWrapping="Wrap" />
+    </CheckBox>
+
     <CheckBox IsChecked="{Binding Settings.HidePossiblySensitive}">
       <TextBlock
         Text="{StaticResource hide-possibly-sensitive}"
diff --git a/src/tweetz.core/Views/TitleBarView.xaml b/src/tweetz.core/Views/TitleBarView.xaml
index 62fc18ed..fd3f8e18 100644
--- a/src/tweetz.core/Views/TitleBarView.xaml
+++ b/src/tweetz.core/Views/TitleBarView.xaml
@@ -65,7 +65,8 @@
         MouseDown="Close"
         Text="&#x2573;"
         TextAlignment="Center"
-        ToolTip="{StaticResource close-tooltip}">
+        ToolTip="{StaticResource close-tooltip}"
+        Visibility="{Binding Settings.HideCloseButton, Converter={StaticResource NotBooleanToVisibilityConverter}}">
         <TextBlock.Style>
           <Style>
             <Style.Triggers>