Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-12-01 04:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Optimize and improve GlobalUsings"

Browse source 
This reverts commit cb5069bcfc.
This commit is contained in:
MLDS23 2025-10-22 12:59:09 +08:00
parent 9d268dea8e
commit dc2d0b2fa1
35 changed files with 160 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
v2rayN/v2rayN.Desktop/App.axaml.cs
View file

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

4
v2rayN/v2rayN.Desktop/Base/WindowBase.cs
View file

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

3
v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs
View file

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

5
v2rayN/v2rayN.Desktop/Common/AvaUtils.cs
View file

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

1
v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs
View file

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

2
v2rayN/v2rayN.Desktop/Common/UI.cs
View file

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

2
v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs
View file

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

26
v2rayN/v2rayN.Desktop/GlobalUsings.cs
View file

@ -1,29 +1,3 @@
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;

5
v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs
View file

@ -1,3 +1,6 @@
using System.Reactive.Linq;
using Avalonia.Input;
using Avalonia.ReactiveUI;
using Avalonia.Win32.Input;
using GlobalHotKeys;
@ -8,7 +11,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 GlobalHotKeys.HotKeyManager? _hotKeyManager;
private HotKeyManager? _hotKeyManager;
private Config? _config;

2
v2rayN/v2rayN.Desktop/Program.cs
View file

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

7
v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
View file

@ -1,6 +1,13 @@
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;

6
v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs
View file

@ -1,3 +1,9 @@
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;

3
v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs
View file

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

4
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
View file

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

5
v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs
View file

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

4
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
View file

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

6
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs
View file

@ -1,3 +1,9 @@
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>

6
v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs
View file

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

5
v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
View file

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

3
v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
View file

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

6
v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs
View file

@ -1,3 +1,9 @@
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;

10
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View file

@ -1,5 +1,15 @@
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;

6
v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs
View file

@ -1,3 +1,9 @@
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;

4
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
View file

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

6
v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
View file

@ -1,4 +1,10 @@
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;

9
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
View file

@ -1,4 +1,13 @@
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;

4
v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
View file

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

4
v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs
View file

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

6
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs
View file

@ -1,3 +1,9 @@
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;

6
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
View file

@ -1,3 +1,9 @@
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;

7
v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
View file

@ -1,4 +1,11 @@
using System.Reactive.Disposables;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.ReactiveUI;
using Avalonia.Threading;
using DialogHostAvalonia;
using ReactiveUI;
using v2rayN.Desktop.Common;
namespace v2rayN.Desktop.Views;

4
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs
View file

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

7
v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
View file

@ -1,4 +1,11 @@
using System.Reactive.Disposables;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using DialogHostAvalonia;
using DynamicData;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using v2rayN.Desktop.Base;
using v2rayN.Desktop.Common;

2
v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
View file

@ -1,3 +1,5 @@
using Avalonia.Controls;
using Avalonia.Threading;
using CliWrap.Buffered;
using DialogHostAvalonia;

4
v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
View file

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