ReSharper Code Cleanup

mrousavy · May 21, 2019 · dbb3f64 · dbb3f64
1 parent dec9c2d
commit dbb3f64
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 34 deletions.
diff --git a/GameFinder/DiscordHelper.cs b/GameFinder/DiscordHelper.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using DiscordRPC;
 using DiscordRPC.Logging;
 
@@ -15,17 +11,11 @@ public class DiscordHelper
 
         public static void Initialize()
         {
-            Client = new DiscordRpcClient(DiscordClientId) { Logger = new ConsoleLogger() { Level = LogLevel.Warning } };
+            Client = new DiscordRpcClient(DiscordClientId) { Logger = new ConsoleLogger { Level = LogLevel.Warning } };
 
-            Client.OnReady += (sender, e) =>
-            {
-                Console.WriteLine($"Discord ready! {e.User.Username}");
-            };
+            Client.OnReady += (sender, e) => { Console.WriteLine($"Discord ready! {e.User.Username}"); };
 
-            Client.OnPresenceUpdate += (sender, e) =>
-            {
-                Console.WriteLine($"Presence updated: {e.Presence}");
-            };
+            Client.OnPresenceUpdate += (sender, e) => { Console.WriteLine($"Presence updated: {e.Presence}"); };
 
             Client.Initialize();
         }
@@ -41,12 +31,12 @@ public static void SetPresence(string status)
             {
                 Details = "GitHub: mrousavy/GameFinder",
                 State = status,
-                Assets = new Assets()
+                Assets = new Assets
                 {
                     LargeImageKey = "icon",
                     LargeImageText = "Steam GameFinder by mrousavy"
                 }
             });
         }
     }
-}
+}
diff --git a/GameFinder/Finder/FinderViewModel.cs b/GameFinder/Finder/FinderViewModel.cs
@@ -166,7 +166,10 @@ private async Task Load(PlayerSummaryModel you, ICollection<PlayerSummaryModel>
             {
                 return;
             }
-            DiscordHelper.SetPresence(profiles.Count > 1 ? $"Matching {profiles.Count} profiles" : $"Matching {profiles.Count} profile");
+
+            DiscordHelper.SetPresence(profiles.Count > 1
+                ? $"Matching {profiles.Count} profiles"
+                : $"Matching {profiles.Count} profile");
 
             DialogViewModel = new LoadingDialogViewModel("Matching games...");
             try

diff --git a/GameFinder/FriendChooser/FriendChooserViewModel.cs b/GameFinder/FriendChooser/FriendChooserViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -34,16 +35,6 @@ public FriendChooserViewModel()
             ChosenFriends.CollectionChanged += ChosenFriendsCollectionChanged;
         }
 
-        private void ChosenFriendsCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            string presence = $"Selected {ChosenFriends.Count} friend";
-            if (ChosenFriends.Count != 1)
-            {
-                presence += "s";
-            }
-            DiscordHelper.SetPresence(presence);
-        }
-
         public ObservableCollection<UserSmallViewModel> AllFriends
         {
             get => _allFriends;
@@ -78,6 +69,17 @@ public ICommand OkCommand
             set => Set(ref _okCommand, value);
         }
 
+        private void ChosenFriendsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            string presence = $"Selected {ChosenFriends.Count} friend";
+            if (ChosenFriends.Count != 1)
+            {
+                presence += "s";
+            }
+
+            DiscordHelper.SetPresence(presence);
+        }
+
         private async void OkAction(object o)
         {
             DialogViewModel = new LoadingDialogViewModel("Loading games...");
@@ -97,8 +99,7 @@ private async void OkAction(object o)
 
                 IsDialogOpen = false;
                 Extensions.MoveForwards();
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 DialogViewModel = new ErrorDialogViewModel(
                     $"Could not load selected profiles! Perhaps a profile is set to private?\n\r{ex.Message}");
@@ -126,8 +127,7 @@ private async Task LoadAsync()
                 AllFriends = new ObservableCollection<UserSmallViewModel>(ordered);
 
                 IsDialogOpen = false;
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 DialogViewModel = new ErrorDialogViewModel(
                     $"Could not load friends! Check your API Key, User ID and profile visibility!\n\r{ex.Message}");

diff --git a/GameFinder/Login/LoginViewModel.cs b/GameFinder/Login/LoginViewModel.cs
@@ -94,8 +94,7 @@ private static void ApiKeyAction(object o)
             try
             {
                 Process.Start("steam://openurl/https://steamcommunity.com/dev/apikey");
-            }
-            catch
+            } catch
             {
                 Process.Start("https://steamcommunity.com/dev/apikey");
             }
@@ -108,8 +107,7 @@ private void LoginAction(object o)
             {
                 Model.Login(ApiKey, UserId);
                 IsDialogOpen = false;
-            }
-            catch
+            } catch
             {
                 DialogViewModel = new ErrorDialogViewModel("The given API Key or User ID is invalid!\n\r" +
                                                            "Please check your inputs and try again!");