Consolidation - global usings

pizzaboxer · Jul 15, 2023 · 282d4c6 · 282d4c6
1 parent 77725ea
commit 282d4c6
Show file tree

Hide file tree

Showing 72 changed files with 116 additions and 384 deletions.
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -1,34 +1,16 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Threading;
 
 using Microsoft.Win32;
 
-using Bloxstrap.Enums;
-using Bloxstrap.Extensions;
-using Bloxstrap.Models;
-using Bloxstrap.Models.Attributes;
-using Bloxstrap.UI;
-using Bloxstrap.Utility;
-
 namespace Bloxstrap
 {
  /// <summary>
  /// Interaction logic for App.xaml
  /// </summary>
  public partial class App : Application
  {
- public static readonly CultureInfo CultureFormat = CultureInfo.InvariantCulture;
-
  public const string ProjectName = "Bloxstrap";
  public const string ProjectRepository = "pizzaboxer/bloxstrap";
  public const string RobloxAppName = "RobloxPlayerBeta";

diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
@@ -1,24 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net.Http;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Forms;
-using System.Windows;
 
 using Microsoft.Win32;
 
-using Bloxstrap.Enums;
-using Bloxstrap.Extensions;
 using Bloxstrap.Integrations;
-using Bloxstrap.Models;
-using Bloxstrap.Tools;
-using Bloxstrap.UI;
 
 namespace Bloxstrap
 {

diff --git a/Bloxstrap/Directories.cs b/Bloxstrap/Directories.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace Bloxstrap
+namespace Bloxstrap
 {
  static class Directories
  {

diff --git a/Bloxstrap/Extensions/BootstrapperIconEx.cs b/Bloxstrap/Extensions/BootstrapperIconEx.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Drawing;
-
-using Bloxstrap.Enums;
+using System.Drawing;
 
 namespace Bloxstrap.Extensions
 {

diff --git a/Bloxstrap/Extensions/BootstrapperStyleEx.cs b/Bloxstrap/Extensions/BootstrapperStyleEx.cs
@@ -1,7 +1,4 @@
-using Bloxstrap.Enums;
-using Bloxstrap.UI;
-
-namespace Bloxstrap.Extensions
+namespace Bloxstrap.Extensions
 {
  static class BootstrapperStyleEx
  {

diff --git a/Bloxstrap/Extensions/CursorTypeEx.cs b/Bloxstrap/Extensions/CursorTypeEx.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-
-using Bloxstrap.Enums;
-
-namespace Bloxstrap.Extensions
+namespace Bloxstrap.Extensions
 {
  static class CursorTypeEx
  {

diff --git a/Bloxstrap/Extensions/DateTimeEx.cs b/Bloxstrap/Extensions/DateTimeEx.cs
@@ -1,12 +1,10 @@
-using System;
-
-namespace Bloxstrap.Extensions
+namespace Bloxstrap.Extensions
 {
  static class DateTimeEx
  {
  public static string ToFriendlyString(this DateTime dateTime)
  {
- return dateTime.ToString("dddd, d MMMM yyyy 'at' h:mm:ss tt", App.CultureFormat);
+ return dateTime.ToString("dddd, d MMMM yyyy 'at' h:mm:ss tt");
  }
  }
 }
diff --git a/Bloxstrap/Extensions/EmojiTypeEx.cs b/Bloxstrap/Extensions/EmojiTypeEx.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-
-using Bloxstrap.Enums;
-
-namespace Bloxstrap.Extensions
+namespace Bloxstrap.Extensions
 {
  static class EmojiTypeEx
  {

diff --git a/Bloxstrap/Extensions/IconEx.cs b/Bloxstrap/Extensions/IconEx.cs
@@ -1,5 +1,4 @@
 using System.Drawing;
-using System.IO;
 using System.Windows.Media.Imaging;
 using System.Windows.Media;
 

diff --git a/Bloxstrap/Extensions/ThemeEx.cs b/Bloxstrap/Extensions/ThemeEx.cs
@@ -1,5 +1,4 @@
 using Microsoft.Win32;
-using Bloxstrap.Enums;
 
 namespace Bloxstrap.Extensions
 {

diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-
-namespace Bloxstrap
+namespace Bloxstrap
 {
  public class FastFlagManager : JsonManager<Dictionary<string, object>>
  {

diff --git a/Bloxstrap/GlobalUsings.cs b/Bloxstrap/GlobalUsings.cs
@@ -0,0 +1,22 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics;
+global using System.IO;
+global using System.IO.Compression;
+global using System.Text;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using System.Linq;
+global using System.Net;
+global using System.Net.Http;
+global using System.Threading;
+global using System.Threading.Tasks;
+
+global using Bloxstrap.Enums;
+global using Bloxstrap.Extensions;
+global using Bloxstrap.Models;
+global using Bloxstrap.Models.Attributes;
+global using Bloxstrap.Models.RobloxApi;
+global using Bloxstrap.UI;
+global using Bloxstrap.Utility;
diff --git a/Bloxstrap/HttpClientLoggingHandler.cs b/Bloxstrap/HttpClientLoggingHandler.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Bloxstrap
+namespace Bloxstrap
 {
  internal class HttpClientLoggingHandler : MessageProcessingHandler
  {

diff --git a/Bloxstrap/Integrations/DiscordRichPresence.cs b/Bloxstrap/Integrations/DiscordRichPresence.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using DiscordRPC;
-
-using Bloxstrap.Models.RobloxApi;
-using Bloxstrap.Models;
+using DiscordRPC;
 
 namespace Bloxstrap.Integrations
 {

diff --git a/Bloxstrap/Integrations/ServerNotifier.cs b/Bloxstrap/Integrations/ServerNotifier.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 
 namespace Bloxstrap.Integrations
 {

diff --git a/Bloxstrap/JsonManager.cs b/Bloxstrap/JsonManager.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using System.Text.Json;
-
-namespace Bloxstrap
+namespace Bloxstrap
 {
  public class JsonManager<T> where T : new()
  {

diff --git a/Bloxstrap/Logger.cs b/Bloxstrap/Logger.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using System.Threading;
-
-namespace Bloxstrap
+namespace Bloxstrap
 {
  // https://stackoverflow.com/a/53873141/11852173
  // TODO - this kind of sucks

diff --git a/Bloxstrap/Models/Attributes/BuildMetadataAttribute.cs b/Bloxstrap/Models/Attributes/BuildMetadataAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Bloxstrap.Models.Attributes
+namespace Bloxstrap.Models.Attributes
 {
  [AttributeUsage(AttributeTargets.Assembly)]
  public class BuildMetadataAttribute : Attribute

diff --git a/Bloxstrap/Models/ClientVersion.cs b/Bloxstrap/Models/ClientVersion.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class ClientVersion
  {

diff --git a/Bloxstrap/Models/DeployInfo.cs b/Bloxstrap/Models/DeployInfo.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class DeployInfo
  {

diff --git a/Bloxstrap/Models/FontFace.cs b/Bloxstrap/Models/FontFace.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class FontFace
  {

diff --git a/Bloxstrap/Models/FontFamily.cs b/Bloxstrap/Models/FontFamily.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class FontFamily
  {

diff --git a/Bloxstrap/Models/GameMessage.cs b/Bloxstrap/Models/GameMessage.cs
@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class GameMessage
  {

diff --git a/Bloxstrap/Models/GithubRelease.cs b/Bloxstrap/Models/GithubRelease.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class GithubRelease
  {

diff --git a/Bloxstrap/Models/PackageManifest.cs b/Bloxstrap/Models/PackageManifest.cs
@@ -4,11 +4,6 @@
  * Copyright (c) 2015-present MaximumADHD
 */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
 namespace Bloxstrap.Models
 {
  public class PackageManifest : List<Package>

diff --git a/Bloxstrap/Models/RobloxApi/ApiArrayResponse.cs b/Bloxstrap/Models/RobloxApi/ApiArrayResponse.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.RobloxApi
 {
  /// <summary>
  /// Roblox.Web.WebAPI.Models.ApiArrayResponse

diff --git a/Bloxstrap/Models/RobloxApi/GameCreator.cs b/Bloxstrap/Models/RobloxApi/GameCreator.cs
@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.RobloxApi
 {
  /// <summary>
  /// Roblox.Games.Api.Models.Response.GameCreator

diff --git a/Bloxstrap/Models/RobloxApi/GameDetailResponse.cs b/Bloxstrap/Models/RobloxApi/GameDetailResponse.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.RobloxApi
 {
 
  /// <summary>

diff --git a/Bloxstrap/Models/RobloxApi/ThumbnailResponse.cs b/Bloxstrap/Models/RobloxApi/ThumbnailResponse.cs
@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.RobloxApi
 {
  /// <summary>
  /// Roblox.Web.Responses.Thumbnails.ThumbnailResponse

diff --git a/Bloxstrap/Models/RobloxApi/UniverseIdResponse.cs b/Bloxstrap/Models/RobloxApi/UniverseIdResponse.cs
@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace Bloxstrap.Models.RobloxApi
+namespace Bloxstrap.Models.RobloxApi
 {
  // lmao its just one property
  public class UniverseIdResponse

diff --git a/Bloxstrap/Models/Settings.cs b/Bloxstrap/Models/Settings.cs
@@ -1,7 +1,5 @@
 using System.Collections.ObjectModel;
 
-using Bloxstrap.Enums;
-
 namespace Bloxstrap.Models
 {
  public class Settings

diff --git a/Bloxstrap/Models/State.cs b/Bloxstrap/Models/State.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-
-using Bloxstrap.Enums;
-
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models
 {
  public class State
  {

diff --git a/Bloxstrap/ProtocolHandler.cs b/Bloxstrap/ProtocolHandler.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web;
+using System.Web;
 using System.Windows;
 
 using Microsoft.Win32;
 
-using Bloxstrap.Enums;
-using Bloxstrap.UI;
-
 namespace Bloxstrap
 {
  static class ProtocolHandler

diff --git a/Bloxstrap/Resource.cs b/Bloxstrap/Resource.cs
@@ -1,7 +1,4 @@
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
+using System.Reflection;
 
 namespace Bloxstrap
 {