Using RxApp replace ViewAction

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -6,7 +6,6 @@ public enum EViewAction
     ShowYesNo,
     SaveFileDialog,
     AddBatchRoutingRulesYesNo,
-    AdjustMainLvColWidth,
     SetClipboardData,
     AddServerViaClipboard,
     ImportRulesFromClipboard,

v2rayN/ServiceLib/Handler/AppEvents.cs

@@ -13,5 +13,7 @@ public static class AppEvents
 
     public static readonly Subject<Unit> AppExitRequested = new();
 
+    public static readonly Subject<Unit> AdjustMainLvColWidthRequested = new();
+
     public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
 }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -268,7 +268,7 @@ public class MainWindowViewModel : MyReactiveObject
             }
             if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
             {
-                _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
+                AppEvents.AdjustMainLvColWidthRequested.OnNext(Unit.Default);
             }
         }
     }

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -348,11 +348,6 @@ public class ProfilesViewModel : MyReactiveObject
         }
     }
 
-    public async Task AutofitColumnWidthAsync()
-    {
-        await _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
-    }
-
     #endregion Actions
 
     #region Servers && Groups

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

@@ -250,12 +250,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                     await ViewModel.AddServerViaClipboardAsync(clipboardData);
                 }
                 break;
-
-            case EViewAction.AdjustMainLvColWidth:
-                Dispatcher.UIThread.Post(() =>
-                   Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
-                    DispatcherPriority.Default);
-                break;
         }
 
         return await Task.FromResult(true);

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

@@ -103,6 +103,12 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
+
+            AppEvents.AdjustMainLvColWidthRequested
+                .AsObservable()
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(_ => AutofitColumnWidth())
+                .DisposeWith(disposables);
         });
 
         RestoreUI();
@@ -133,13 +139,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                 await AvaUtils.SetClipboardData(this, (string)obj);
                 break;
 
-            case EViewAction.AdjustMainLvColWidth:
-                Dispatcher.UIThread.Post(() =>
-                     AutofitColumnWidth(),
-               DispatcherPriority.Default);
-
-                break;
-
             case EViewAction.ProfilesFocus:
                 lstProfiles.Focus();
                 break;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -234,13 +234,6 @@ public partial class MainWindow
                     ViewModel?.AddServerViaClipboardAsync(clipboardData);
                 }
                 break;
-
-            case EViewAction.AdjustMainLvColWidth:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync();
-                }), DispatcherPriority.Normal);
-                break;
         }
 
         return await Task.FromResult(true);

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -97,6 +97,12 @@ public partial class ProfilesView
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
+
+            AppEvents.AdjustMainLvColWidthRequested
+                .AsObservable()
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(_ => AutofitColumnWidth())
+                .DisposeWith(disposables);
         });
 
         RestoreUI();
@@ -113,14 +119,7 @@ public partial class ProfilesView
                 if (obj is null)
                     return false;
                 WindowsUtils.SetClipboardData((string)obj);
-                break;
+                break;          
-
-            case EViewAction.AdjustMainLvColWidth:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    AutofitColumnWidth();
-                }), DispatcherPriority.Normal);
-                break;
 
             case EViewAction.ProfilesFocus:
                 lstProfiles.Focus();