ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New reactive core WIP

Browse Source
This commit is contained in:
Ádám Kovács
2023-07-21 22:15:48 +02:00
parent 342fc0d047
commit b61c204e49
61 changed files with 1605 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/AppCommon/FileTime.App.Core/Services/Persistence/TabPersistenceService.cs
View File

@@ -81,7 +81,7 @@ public class TabPersistenceService : ITabPersistenceService
{
if (!File.Exists(_settingsPath))
{
CreateEmptyTab();
await CreateEmptyTab();
return;
}
@@ -99,12 +99,12 @@ public class TabPersistenceService : ITabPersistenceService
_logger.LogError(e, "Unknown exception while restoring app state");
}
CreateEmptyTab();
await CreateEmptyTab();
void CreateEmptyTab()
async Task CreateEmptyTab()
{
var tab = _serviceProvider.GetInitableResolver<IContainer>(_localContentProvider)
.GetRequiredService<ITab>();
var tab = await _serviceProvider.GetAsyncInitableResolver<IContainer>(_localContentProvider)
.GetRequiredServiceAsync<ITab>();
var tabViewModel = _serviceProvider.GetInitableResolver(tab, 1).GetRequiredService<ITabViewModel>();
_appState.AddTab(tabViewModel);
@@ -159,8 +159,8 @@ public class TabPersistenceService : ITabPersistenceService
if (container == null) continue;
var tabToLoad = _serviceProvider.GetInitableResolver(container)
.GetRequiredService<ITab>();
var tabToLoad = await _serviceProvider.GetAsyncInitableResolver(container)
.GetRequiredServiceAsync<ITab>();
var tabViewModel = _serviceProvider.GetInitableResolver(tabToLoad, tab.Number)
.GetRequiredService<ITabViewModel>();
@@ -205,7 +205,7 @@ public class TabPersistenceService : ITabPersistenceService
var tabStates = new List<TabState>();
foreach (var tab in _appState.Tabs)
{
var currentLocation = tab.CachedCurrentLocation;
var currentLocation = tab.CurrentLocation.Value;
if (currentLocation is null) continue;
tabStates.Add(new TabState(currentLocation.FullName!, tab.TabNumber));
}