WIP: RapidTravel, ModalService

src/AppCommon/FileTime.App.Core/ViewModels/AppStateBase.cs

@@ -13,17 +13,21 @@ public abstract partial class AppStateBase : IAppState
     private readonly BehaviorSubject<string?> _searchText = new(null);
     private readonly BehaviorSubject<ITabViewModel?> _selectedTab = new(null);
     private readonly BehaviorSubject<IEnumerable<ITabViewModel>> _tabs = new(Enumerable.Empty<ITabViewModel>());
+    private readonly BehaviorSubject<ViewMode> _viewMode = new(Models.Enums.ViewMode.Default);
 
-    [Property]
-    private ViewMode _viewMode;
+    public IObservable<ViewMode> ViewMode { get; private set; }
 
     public ObservableCollection<ITabViewModel> Tabs { get; } = new();
     public IObservable<string?> SearchText { get; private set; }
 
     public IObservable<ITabViewModel?> SelectedTab { get; private set; }
 
+    [Property] private string _rapidTravelText = "";
+
     partial void OnInitialize()
     {
+        ViewMode = _viewMode.AsObservable();
+
         Tabs.CollectionChanged += (_, _) => _tabs.OnNext(Tabs);
         SearchText = _searchText.AsObservable();
         SelectedTab = Observable.CombineLatest(_tabs, _selectedTab, GetSelectedTab);
@@ -43,6 +47,11 @@ public abstract partial class AppStateBase : IAppState
 
     public void SetSearchText(string? searchText) => _searchText.OnNext(searchText);
 
+    public void SwitchViewMode(ViewMode newViewMode)
+    {
+        _viewMode.OnNext(newViewMode);
+    }
+
     public void SetSelectedTab(ITabViewModel tabToSelect) => _selectedTab.OnNext(tabToSelect);
 
     private ITabViewModel? GetSelectedTab(IEnumerable<ITabViewModel> tabs, ITabViewModel? expectedSelectedTab)

src/AppCommon/FileTime.App.Core/ViewModels/TabViewModel.cs

@@ -6,7 +6,6 @@ using FileTime.App.Core.Models.Enums;
 using FileTime.App.Core.Services;
 using FileTime.Core.Models;
 using FileTime.Core.Services;
-using FileTime.Tools.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 using MvvmGen;
 
@@ -21,7 +20,7 @@ public partial class TabViewModel : ITabViewModel, IDisposable
     private readonly IRxSchedulerService _rxSchedulerService;
     private readonly SourceList<IAbsolutePath> _markedItems = new();
     private readonly List<IDisposable> _disposables = new();
-    private bool disposed;
+    private bool _disposed;
 
     public ITab? Tab { get; private set; }
     public int TabNumber { get; private set; }
@@ -96,23 +95,9 @@ public partial class TabViewModel : ITabViewModel, IDisposable
         SelectedsChildrenCollectionObservable = InitAsd(SelectedsChildren);
         ParentsChildrenCollectionObservable = InitAsd(ParentsChildren);
 
-        CurrentItems.Subscribe(children =>
-        {
-            CurrentItemsCollection?.Dispose();
-            CurrentItemsCollection = children.MapNull(c => new BindedCollection<IItemViewModel>(c!));
-        });
-
-        ParentsChildren.Subscribe(children =>
-        {
-            ParentsChildrenCollection?.Dispose();
-            ParentsChildrenCollection = children.MapNull(c => new BindedCollection<IItemViewModel>(c!));
-        });
-
-        SelectedsChildren.Subscribe(children =>
-        {
-            SelectedsChildrenCollection?.Dispose();
-            SelectedsChildrenCollection = children.MapNull(c => new BindedCollection<IItemViewModel>(c!));
-        });
+        CurrentItemsCollection = new(CurrentItems);
+        ParentsChildrenCollection = new(ParentsChildren);
+        SelectedsChildrenCollection = new(SelectedsChildren);
 
         tab.CurrentLocation.Subscribe((_) => _markedItems.Clear());
 
@@ -131,7 +116,7 @@ public partial class TabViewModel : ITabViewModel, IDisposable
                             i?.TransformAsync(MapItem)
                                 .Transform(i => MapItemToViewModel(i, ItemViewModelType.SelectedChild))),
                     currentSelectedItemThrottled
-                        .Where(c => c is null || c is not IContainerViewModel)
+                        .Where(c => c is null or not IContainerViewModel)
                         .Select(_ => (IObservable<IChangeSet<IItemViewModel>>?) null)
                 )
                 .ObserveOn(_rxSchedulerService.GetWorkerScheduler())
@@ -251,7 +236,7 @@ public partial class TabViewModel : ITabViewModel, IDisposable
 
     private void Dispose(bool disposing)
     {
-        if (!disposed && disposing)
+        if (!_disposed && disposing)
         {
             foreach (var disposable in _disposables)
             {
@@ -265,6 +250,6 @@ public partial class TabViewModel : ITabViewModel, IDisposable
             }
         }
 
-        disposed = true;
+        _disposed = true;
     }
 }