Search by regex, modal Enter fixes

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

@@ -16,10 +16,10 @@ public abstract partial class AppStateBase : IAppState
 {
     private readonly BehaviorSubject<string?> _searchText = new(null);
     private readonly BehaviorSubject<ITabViewModel?> _selectedTab = new(null);
-    private readonly BehaviorSubject<ViewMode> _viewMode = new(Models.Enums.ViewMode.Default);
+    private readonly DeclarativeProperty<ViewMode> _viewMode = new(Models.Enums.ViewMode.Default);
     private readonly SourceList<ITabViewModel> _tabs = new();
 
-    public IObservable<ViewMode> ViewMode { get; private set; }
+    public IDeclarativeProperty<ViewMode> ViewMode { get; private set; }
 
     public ReadOnlyObservableCollection<ITabViewModel> Tabs { get; private set; }
     public IObservable<string?> SearchText { get; private set; }
@@ -31,7 +31,7 @@ public abstract partial class AppStateBase : IAppState
     partial void OnInitialize()
     {
         RapidTravelText = new("");
-        ViewMode = _viewMode.AsObservable();
+        ViewMode = _viewMode;
 
         var tabsObservable = _tabs.Connect();
 
@@ -70,10 +70,7 @@ public abstract partial class AppStateBase : IAppState
 
     public void SetSearchText(string? searchText) => _searchText.OnNext(searchText);
 
-    public void SwitchViewMode(ViewMode newViewMode)
-    {
-        _viewMode.OnNext(newViewMode);
-    }
+    public async Task SwitchViewModeAsync(ViewMode newViewMode) => await _viewMode.SetValue(newViewMode);
 
     public void SetSelectedTab(ITabViewModel tabToSelect) => _selectedTab.OnNext(tabToSelect);
 

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

@@ -15,8 +15,6 @@ public partial class ContainerSizeContainerViewModel : ItemViewModel, IContainer
     {
     }
 
-    public void Init(IContainer item, ITabViewModel parentTab, ItemViewModelType itemViewModelType)
-    {
-        Init((IItem)item, parentTab, itemViewModelType);
-    }
+    public void Init(IContainer item, ITabViewModel parentTab, ItemViewModelType itemViewModelType) 
+        => Init((IItem)item, parentTab, itemViewModelType);
 }

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

@@ -17,8 +17,6 @@ public partial class ElementViewModel : ItemViewModel, IElementViewModel
     {
     }
 
-    public void Init(IElement item, ITabViewModel parentTab, ItemViewModelType itemViewModelType)
-    {
-        Init((IItem)item, parentTab, itemViewModelType);
-    }
+    public void Init(IElement item, ITabViewModel parentTab, ItemViewModelType itemViewModelType) 
+        => Init((IItem)item, parentTab, itemViewModelType);
 }

src/AppCommon/FileTime.App.Core/ViewModels/ItemPreview/ElementPreviewViewModel.cs

@@ -96,6 +96,7 @@ public partial class ElementPreviewViewModel : IItemPreviewViewModel, IAsyncInit
             var encodingsWithPartialResult = binaryCharacter.Where(e => !string.IsNullOrWhiteSpace(e.Value.PartialResult)).ToList();
             if (encodingsWithPartialResult.Count > 0)
             {
+                stringBuilder.AppendLine();
                 stringBuilder.AppendLine("The following partial texts could be read by encodings:");
                 foreach (var binaryByEncoding in encodingsWithPartialResult)
                 {

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

@@ -2,9 +2,9 @@ using System.ComponentModel;
 using System.Reactive.Linq;
 using DeclarativeProperty;
 using DynamicData;
-using FileTime.App.Core.Models;
 using FileTime.App.Core.Models.Enums;
 using FileTime.App.Core.Services;
+using FileTime.Core.Behaviors;
 using FileTime.Core.Helper;
 using FileTime.Core.Models;
 using MoreLinq;
@@ -37,7 +37,10 @@ public abstract partial class ItemViewModel : IItemViewModel
 
     public IDeclarativeProperty<IReadOnlyList<ItemNamePart>>? DisplayName { get; private set; }
 
-    public void Init(IItem item, ITabViewModel parentTab, ItemViewModelType itemViewModelType)
+    public void Init(
+        IItem item, 
+        ITabViewModel parentTab, 
+        ItemViewModelType itemViewModelType)
     {
         _parentTab = parentTab;
 
@@ -51,7 +54,12 @@ public abstract partial class ItemViewModel : IItemViewModel
 
         var displayName = itemViewModelType switch
         {
-            ItemViewModelType.Main => _appState.RapidTravelText.Map(s => (IReadOnlyList<ItemNamePart>) _itemNameConverterService.GetDisplayName(item.DisplayName, s)),
+            ItemViewModelType.Main => _appState.RapidTravelText.Map(async (s, _) =>
+                _appState.ViewMode.Value != Models.Enums.ViewMode.RapidTravel 
+                && _appState.CurrentSelectedTab?.CurrentLocation.Value?.Provider is IItemNameConverterProvider nameConverterProvider
+                    ? (IReadOnlyList<ItemNamePart>) await nameConverterProvider.GetItemNamePartsAsync(item)
+                    : _itemNameConverterService.GetDisplayName(item.DisplayName, s)
+            ),
             _ => new DeclarativeProperty<IReadOnlyList<ItemNamePart>>(new List<ItemNamePart> {new(item.DisplayName)}),
         };