Code style

TheJoeFin · Sep 19, 2024 · c66ee8b · c66ee8b
1 parent 8e7ee43
commit c66ee8b
Show file tree

Hide file tree

Showing 58 changed files with 424 additions and 438 deletions.
diff --git a/Text-Grab/App.xaml.cs b/Text-Grab/App.xaml.cs
@@ -27,7 +27,7 @@ public partial class App : System.Windows.Application
 {
     #region Fields
 
-    readonly static Settings _defaultSettings = AppUtilities.TextGrabSettings;
+    private static readonly Settings _defaultSettings = AppUtilities.TextGrabSettings;
 
     #endregion Fields
 
@@ -232,7 +232,7 @@ private void appExit(object sender, ExitEventArgs e)
         Singleton<HistoryService>.Instance.WriteHistory();
     }
 
-    async void appStartup(object sender, StartupEventArgs e)
+    private async void appStartup(object sender, StartupEventArgs e)
     {
         NumberOfRunningInstances = Process.GetProcessesByName("Text-Grab").Length;
         Current.DispatcherUnhandledException += CurrentDispatcherUnhandledException;

diff --git a/Text-Grab/Controls/AddOrRemoveWindow.xaml.cs b/Text-Grab/Controls/AddOrRemoveWindow.xaml.cs
@@ -2,7 +2,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Windows.Graphics.Printing.Workflow;
 
 namespace Text_Grab.Controls;
 

diff --git a/Text-Grab/Controls/CollapsibleButton.xaml.cs b/Text-Grab/Controls/CollapsibleButton.xaml.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
-using System.Windows.Controls;
 using Text_Grab.Models;
 using Wpf.Ui.Controls;
 

diff --git a/Text-Grab/Controls/FindAndReplaceWindow.xaml.cs b/Text-Grab/Controls/FindAndReplaceWindow.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -28,7 +27,7 @@ public partial class FindAndReplaceWindow : FluentWindow
     public static RoutedCommand ReplaceAllCmd = new();
     public static RoutedCommand ReplaceOneCmd = new();
     public static RoutedCommand TextSearchCmd = new();
-    DispatcherTimer ChangeFindTextTimer = new();
+    private DispatcherTimer ChangeFindTextTimer = new();
     private MatchCollection? Matches;
     private string stringFromWindow = "";
     private EditTextWindow? textEditWindow;
@@ -171,11 +170,11 @@ private void CopyMatchesCmd_Executed(object sender, ExecutedRoutedEventArgs e)
 
         StringBuilder stringBuilder = new();
 
-        var selection = ResultsListView.SelectedItems;
+        IList selection = ResultsListView.SelectedItems;
         if (selection.Count < 2)
             selection = ResultsListView.Items;
 
-        foreach (var item in selection)
+        foreach (object? item in selection)
             if (item is FindResult findResult)
                 stringBuilder.AppendLine(findResult.Text);
 

diff --git a/Text-Grab/Controls/PreviousGrabWindow.xaml.cs b/Text-Grab/Controls/PreviousGrabWindow.xaml.cs
@@ -20,7 +20,7 @@ public PreviousGrabWindow(Rect rect)
         Left = rect.Left - borderThickness;
         Top = rect.Top - borderThickness;
 
-        DispatcherTimer timer = new DispatcherTimer();
+        DispatcherTimer timer = new();
         timer.Interval = TimeSpan.FromMilliseconds(500);
         timer.Tick += (s, e) => { timer.Stop(); Close(); };
         timer.Start();