code clean ups

Author: al-develop

QuickNoteWidget/MainWindow.xaml.cs

@@ -72,7 +72,7 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
-            _mainWindowViewModel.SaveSettings();
+            _mainWindowViewModel.SaveSettingsOnClose();
         }
 
         private void Info_Click(object sender, RoutedEventArgs e)
@@ -81,20 +81,21 @@ private void Info_Click(object sender, RoutedEventArgs e)
             _infoWindow.Show();
         }
 
-        // React to ctrl + mouse wheel
+
         private void tbxMultiLine_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
         {
-            bool ctrl = (Keyboard.Modifiers == ModifierKeys.Control);
-            if (ctrl)
+            // React to ctrl + mouse wheel
+            bool ctrlButtonPressed = (Keyboard.Modifiers == ModifierKeys.Control);
+            if (ctrlButtonPressed)
             {
-                this.UpdateFontSize(e.Delta > 0);
+                bool increase = e.Delta > 0;
+                this.UpdateFontSize(increase);
                 e.Handled = true;
             }
         }
 
-        // max and min font size values
-        private const double FONT_MAX_SIZE = 60d;
         private const double FONT_MIN_SIZE = 5d;
+        private const double FONT_MAX_SIZE = 60d;
 
         private void UpdateFontSize(bool increase)
         {

QuickNoteWidget/MainWindowViewModel.cs

@@ -148,47 +148,14 @@ public MainWindowViewModel()
         {
             LoadAvailableThemesAndAccents();
             LoadSettings(SettingsLoadLocations.FromFile);
-            Init();
+            InitViewModel();
         }
-
-        private void Init()
-        {
-            ResetViewCommand = new DelegateCommand(ResetView);
-            Fonts = new ObservableCollection<string>(LoadInstalledFonts());
-        }
-
-        private IEnumerable<string> LoadInstalledFonts()
-        {
-            using (var fonts = new InstalledFontCollection())
-                foreach (FontFamily font in fonts.Families)
-                    yield return font.Name;
-        }
-
-        private void ResetView()
-        {
-            Settings defaultSettings = SettingsLogic.GetDefaultSettings();
-            LoadSettings(SettingsLoadLocations.Default);
-        }
-
-
-        #region Themes
         private void LoadAvailableThemesAndAccents()
         {
             Themes = new ObservableCollection<string>() { ThemeManager.BaseColorLight, ThemeManager.BaseColorDark };
             Accents = new ObservableCollection<string>(ThemeManager.Current.ColorSchemes);
         }
 
-        private void UpdateFontColorOnThemeSelectionChanged()
-        {
-            if (!String.IsNullOrEmpty(SelectedTheme))
-                MultiLineTextForegroundColor = SelectedTheme == ThemeManager.BaseColorLight ? BLACK : WHITE;
-            else
-                MultiLineTextForegroundColor = LIGHT_GRAY;
-        }
-        #endregion Themes
-
-
-        #region Settings
         private void LoadSettings(SettingsLoadLocations location)
         {
             InitSettingsBeforePropertiesUpdate(location);
@@ -219,8 +186,40 @@ private void UpdateProperties()
             this.ShowInTaskbar = Settings.ShowInTaskbar;
         }
 
+        private void InitViewModel()
+        {
+            Fonts = new ObservableCollection<string>(LoadInstalledFonts());
+            ResetViewCommand = new DelegateCommand(ResetView);
+        }
+
+        private IEnumerable<string> LoadInstalledFonts()
+        {
+            using (var fonts = new InstalledFontCollection())
+                foreach (FontFamily font in fonts.Families)
+                    yield return font.Name;
+        }
+
+        private void ResetView()
+        {
+            Settings defaultSettings = SettingsLogic.GetDefaultSettings();
+            LoadSettings(SettingsLoadLocations.Default);
+        }
+
+
+
+
+        private void UpdateFontColorOnThemeSelectionChanged()
+        {
+            if (!String.IsNullOrEmpty(SelectedTheme))
+                MultiLineTextForegroundColor = SelectedTheme == ThemeManager.BaseColorLight ? BLACK : WHITE;
+            else
+                MultiLineTextForegroundColor = LIGHT_GRAY;
+        }
+
+
+
 
-        public void SaveSettings()
+        public void SaveSettingsOnClose()
         {
             Settings.SelectedAccentName = this.SelectedAccent;
             Settings.SelectedThemeName = this.SelectedTheme;
@@ -231,6 +230,5 @@ public void SaveSettings()
             Settings.ShowInTaskbar = this.ShowInTaskbar;
             SettingsLogic.SaveSettings(this.Settings);
         }
-        #endregion Settings
     }
 }