Optimize and improve GlobalUsings

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -1,5 +1,3 @@
-using ReactiveUI;
-
 namespace ServiceLib.Base;
 
 public class MyReactiveObject : ReactiveObject

v2rayN/ServiceLib/Common/EmbedUtils.cs

@@ -1,6 +1,3 @@
-using System.Collections.Concurrent;
-using System.Reflection;
-
 namespace ServiceLib.Common;
 
 public static class EmbedUtils

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,6 +1,5 @@
 using System.Formats.Tar;
 using System.IO.Compression;
-using System.Text;
 
 namespace ServiceLib.Common;
 

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,8 +1,3 @@
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Common;
 
 public class JsonUtils

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -1,5 +1,3 @@
-using System.Diagnostics;
-
 namespace ServiceLib.Common;
 
 public static class ProcUtils

v2rayN/ServiceLib/Common/Utils.cs

@@ -1,13 +1,5 @@
 using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
 using System.Security.Principal;
-using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -1,5 +1,3 @@
-using System.Security.Cryptography;
-using System.Text;
 using Microsoft.Win32;
 
 namespace ServiceLib.Common;

v2rayN/ServiceLib/Events/AppEvents.cs

@@ -1,5 +1,3 @@
-using System.Reactive;
-
 namespace ServiceLib.Events;
 
 public static class AppEvents

v2rayN/ServiceLib/Events/EventChannel.cs

@@ -1,5 +1,3 @@
-using System.Reactive;
-using System.Reactive.Linq;
 using System.Reactive.Subjects;
 
 namespace ServiceLib.Events;

v2rayN/ServiceLib/Global.cs

@@ -316,7 +316,7 @@ public class Global
     ];
 
     public static readonly HashSet<EConfigType> SingboxOnlyConfigType = SingboxSupportConfigType.Except(XraySupportConfigType).ToHashSet();
-    
+
     public static readonly List<string> DomainStrategies =
     [
         AsIs,

v2rayN/ServiceLib/GlobalUsings.cs

@@ -1,14 +1,36 @@
+global using System.Collections.Concurrent;
+global using System.Diagnostics;
+global using System.Net;
+global using System.Net.NetworkInformation;
+global using System.Net.Sockets;
+global using System.Reactive;
+global using System.Reactive.Disposables;
+global using System.Reactive.Linq;
+global using System.Reflection;
+global using System.Runtime.InteropServices;
+global using System.Security.Cryptography;
+global using System.Text;
+global using System.Text.Encodings.Web;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using DynamicData;
+global using DynamicData.Binding;
+global using ReactiveUI;
+global using ReactiveUI.Fody.Helpers;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Events;
 global using ServiceLib.Handler;
+global using ServiceLib.Handler.Fmt;
+global using ServiceLib.Handler.SysProxy;
 global using ServiceLib.Helper;
 global using ServiceLib.Manager;
-global using ServiceLib.Handler.Fmt;
-global using ServiceLib.Services;
-global using ServiceLib.Services.Statistics;
-global using ServiceLib.Services.CoreConfig;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
-global using ServiceLib.Handler.SysProxy;
+global using ServiceLib.Services;
+global using ServiceLib.Services.CoreConfig;
+global using ServiceLib.Services.Statistics;
+global using SQLite;

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -1,5 +1,4 @@
 using System.Security.Principal;
-using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler;
 

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1,5 +1,4 @@
 using System.Data;
-using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler;
 
@@ -1484,7 +1483,7 @@ public static class ConfigHandler
         if (profileItem is null)
         {
             profileItem = Hysteria2Fmt.ResolveFull2(strData, subRemarks);
-        }  
+        }
         if (profileItem is null || profileItem.Address.IsNullOrEmpty())
         {
             return -1;

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -1,5 +1,3 @@
-using System.Net;
-
 namespace ServiceLib.Handler;
 
 public static class ConnectionHandler

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -1,5 +1,3 @@
-using System.Text.RegularExpressions;
-
 namespace ServiceLib.Handler.Fmt;
 
 public class ShadowsocksFmt : BaseFmt

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -1,4 +1,3 @@
-using System.Runtime.InteropServices;
 using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption;
 
 namespace ServiceLib.Handler.SysProxy;

v2rayN/ServiceLib/Helper/DownloaderHelper.cs

@@ -1,4 +1,3 @@
-using System.Net;
 using Downloader;
 
 namespace ServiceLib.Helper;

v2rayN/ServiceLib/Helper/HttpClientHelper.cs

@@ -1,8 +1,5 @@
-using System.Diagnostics;
-using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Mime;
-using System.Text;
 
 namespace ServiceLib.Helper;
 

v2rayN/ServiceLib/Helper/SqliteHelper.cs

@@ -1,5 +1,4 @@
 using System.Collections;
-using SQLite;
 
 namespace ServiceLib.Helper;
 

v2rayN/ServiceLib/Manager/CoreAdminManager.cs

@@ -1,4 +1,3 @@
-using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 

v2rayN/ServiceLib/Manager/PacManager.cs

@@ -1,6 +1,3 @@
-using System.Net.Sockets;
-using System.Text;
-
 namespace ServiceLib.Manager;
 
 public class PacManager

v2rayN/ServiceLib/Manager/ProfileExManager.cs

@@ -1,5 +1,3 @@
-using System.Collections.Concurrent;
-
 //using System.Reactive.Linq;
 
 namespace ServiceLib.Manager;

v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs

@@ -1,5 +1,3 @@
-using System.Collections.Concurrent;
-
 namespace ServiceLib.Manager;
 
 public class ProfileGroupItemManager

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -26,15 +26,29 @@ public class TaskManager
             await Task.Delay(1000 * 60);
 
             //Execute once 1 minute
-            await UpdateTaskRunSubscription();
+            try
+            {
+                await UpdateTaskRunSubscription();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("ScheduledTasks - UpdateTaskRunSubscription", ex);
+            }
 
             //Execute once 20 minute
             if (numOfExecuted % 20 == 0)
             {
                 //Logging.SaveLog("Execute save config");
 
-                await ConfigHandler.SaveConfig(_config);
+                try
-                await ProfileExManager.Instance.SaveTo();
+                {
+                    await ConfigHandler.SaveConfig(_config);
+                    await ProfileExManager.Instance.SaveTo();
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ScheduledTasks - SaveConfig", ex);
+                }
             }
 
             //Execute once 1 hour
@@ -46,8 +60,14 @@ public class TaskManager
                 FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
                 FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
 
-                //Check once 1 hour
+                try
-                await UpdateTaskRunGeo(numOfExecuted / 60);
+                {
+                    await UpdateTaskRunGeo(numOfExecuted / 60);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ScheduledTasks - UpdateTaskRunGeo", ex);
+                }
             }
 
             numOfExecuted++;

v2rayN/ServiceLib/Manager/WebDavManager.cs

@@ -1,4 +1,3 @@
-using System.Net;
 using WebDav;
 
 namespace ServiceLib.Manager;

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -1,6 +1,3 @@
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.Models;
 
 public class CheckUpdateModel : ReactiveObject

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -1,6 +1,3 @@
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/GitHubRelease.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 public class GitHubReleaseAsset

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ProfileGroupItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,6 +1,3 @@
-using ReactiveUI;
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,5 +1,3 @@
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/RoutingItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/ServerStatItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 public class SingboxConfig

v2rayN/ServiceLib/Models/SubItem.cs

@@ -1,5 +1,3 @@
-using SQLite;
-
 namespace ServiceLib.Models;
 
 [Serializable]

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 public class V2rayConfig

v2rayN/ServiceLib/Models/VmessQRCode.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Models;
 
 /// <summary>

v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs

@@ -1,7 +1,3 @@
-using System.Net;
-using System.Net.NetworkInformation;
-using ServiceLib.Common;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigSingboxService(Config config)

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Nodes;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigSingboxService

v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs

@@ -1,6 +1,3 @@
-using System.Net;
-using System.Net.NetworkInformation;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService(Config config)

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Nodes;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs

@@ -1,7 +1,3 @@
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -1,6 +1,4 @@
-using System.Net;
 using System.Net.Http.Headers;
-using System.Net.Sockets;
 
 namespace ServiceLib.Services;
 

v2rayN/ServiceLib/Services/ProcessService.cs

@@ -1,6 +1,3 @@
-using System.Diagnostics;
-using System.Text;
-
 namespace ServiceLib.Services;
 
 public class ProcessService : IDisposable

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -1,8 +1,3 @@
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Sockets;
-
 namespace ServiceLib.Services;
 
 public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateFunc)

v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs

@@ -1,5 +1,4 @@
 using System.Net.WebSockets;
-using System.Text;
 
 namespace ServiceLib.Services.Statistics;
 

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -1,6 +1,3 @@
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-
 namespace ServiceLib.Services;
 
 public class UpdateService

v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs

@@ -1,8 +1,3 @@
-using System.Reactive;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class AddGroupServerViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class AddServer2ViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class AddServerViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class BackupAndRestoreViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -1,11 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class CheckUpdateViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -1,11 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class ClashConnectionsViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -1,11 +1,4 @@
-using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 using static ServiceLib.Models.ClashProviders;
 using static ServiceLib.Models.ClashProxies;
 

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,8 +1,3 @@
-using System.Reactive;
-using System.Reactive.Linq;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class DNSSettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class FullConfigTemplateViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs

@@ -1,6 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-
 namespace ServiceLib.ViewModels;
 
 public class GlobalHotkeySettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -1,8 +1,4 @@
-using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 
 namespace ServiceLib.ViewModels;
 

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -1,10 +1,3 @@
-using System.Collections.Concurrent;
-using System.Reactive.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class MsgViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class OptionSettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Linq;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class ProfilesSelectViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -1,12 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Text;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class ProfilesViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class RoutingRuleDetailsViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -1,10 +1,3 @@
-using System.Reactive;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class RoutingRuleSettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -1,8 +1,3 @@
-using System.Reactive;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class RoutingSettingViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -1,11 +1,3 @@
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Text;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class StatusBarViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class SubEditViewModel : MyReactiveObject

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -1,9 +1,3 @@
-using System.Reactive;
-using DynamicData;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
-
 namespace ServiceLib.ViewModels;
 
 public class SubSettingViewModel : MyReactiveObject

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -1,6 +1,3 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using v2rayN.Desktop.Views;
 
 namespace v2rayN.Desktop;

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -1,7 +1,3 @@
-using Avalonia;
-using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
-
 namespace v2rayN.Desktop.Base;
 
 public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewModel : class

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -1,6 +1,3 @@
-using Avalonia;
-using Avalonia.Media;
-
 namespace v2rayN.Desktop.Common;
 
 public static class AppBuilderExtension

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -1,9 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Input.Platform;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
 
 namespace v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs

@@ -1,4 +1,3 @@
-using Avalonia.Media;
 using AvaloniaEdit;
 using AvaloniaEdit.Document;
 using AvaloniaEdit.Rendering;

v2rayN/v2rayN.Desktop/Common/UI.cs

@@ -1,7 +1,5 @@
-using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using MsBox.Avalonia;
-using MsBox.Avalonia.Enums;
 
 namespace v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs

@@ -1,6 +1,4 @@
-using System.Globalization;
 using Avalonia.Data.Converters;
-using Avalonia.Media;
 
 namespace v2rayN.Desktop.Converters;
 

v2rayN/v2rayN.Desktop/GlobalUsings.cs

@@ -1,3 +1,29 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Globalization;
+global using System.IO;
+global using System.Linq;
+global using System.Reactive.Disposables;
+global using System.Reactive.Linq;
+global using System.Text;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Avalonia;
+global using Avalonia.Controls;
+global using Avalonia.Controls.ApplicationLifetimes;
+global using Avalonia.Input;
+global using Avalonia.Interactivity;
+global using Avalonia.Markup.Xaml;
+global using Avalonia.Media;
+global using Avalonia.Media.Imaging;
+global using Avalonia.Platform;
+global using Avalonia.ReactiveUI;
+global using Avalonia.Styling;
+global using Avalonia.Threading;
+global using ReactiveUI;
+global using ReactiveUI.Fody.Helpers;
+global using DynamicData;
+global using MsBox.Avalonia.Enums;
 global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;

v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs

@@ -1,6 +1,3 @@
-using System.Reactive.Linq;
-using Avalonia.Input;
-using Avalonia.ReactiveUI;
 using Avalonia.Win32.Input;
 using GlobalHotKeys;
 
@@ -11,7 +8,7 @@ public sealed class HotkeyManager
     private static readonly Lazy<HotkeyManager> _instance = new(() => new());
     public static HotkeyManager Instance = _instance.Value;
     private readonly Dictionary<int, EGlobalHotkey> _hotkeyTriggerDic = new();
-    private HotKeyManager? _hotKeyManager;
+    private GlobalHotKeys.HotKeyManager? _hotKeyManager;
 
     private Config? _config;
 

v2rayN/v2rayN.Desktop/Program.cs

@@ -1,5 +1,3 @@
-using Avalonia;
-using Avalonia.ReactiveUI;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop;

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -1,13 +1,6 @@
-using System.Reactive.Linq;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
-using Avalonia.Media;
-using Avalonia.Styling;
 using AvaloniaEdit;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
 
 namespace v2rayN.Desktop.ViewModels;

v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using DynamicData;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs

@@ -1,6 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -1,7 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs

@@ -1,8 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
-using ReactiveUI;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs

@@ -1,7 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.ReactiveUI;
-using ReactiveUI;
-
 namespace v2rayN.Desktop.Views;
 
 public partial class CheckUpdateView : ReactiveUserControl<CheckUpdateViewModel>

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
-using ReactiveUI;
-
 namespace v2rayN.Desktop.Views;
 
 public partial class ClashConnectionsView : ReactiveUserControl<ClashConnectionsViewModel>

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Input;
-using Avalonia.ReactiveUI;
-using DynamicData;
-using ReactiveUI;
-
 namespace v2rayN.Desktop.Views;
 
 public partial class ClashProxiesView : ReactiveUserControl<ClashProxiesViewModel>

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -1,8 +1,3 @@
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs

@@ -1,6 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using System.Text;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Manager;
 

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -1,15 +1,5 @@
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Threading;
 using DialogHostAvalonia;
-using MsBox.Avalonia.Enums;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Manager;

v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.ReactiveUI;
-using Avalonia.Threading;
-using ReactiveUI;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -1,7 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs

@@ -1,10 +1,4 @@
-using System.Reactive.Disposables;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
 using Avalonia.VisualTree;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -1,13 +1,4 @@
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using DialogHostAvalonia;
-using MsBox.Avalonia.Enums;
-using ReactiveUI;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs

@@ -1,7 +1,3 @@
-using Avalonia.Controls;
-using Avalonia.Media.Imaging;
-using Avalonia.Threading;
-
 namespace v2rayN.Desktop.Views;
 
 public partial class QrcodeView : UserControl

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -1,7 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs

@@ -1,9 +1,3 @@
-using System.Reactive.Disposables;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using MsBox.Avalonia.Enums;
-using ReactiveUI;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;