Renamed screen properties
MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/TestDialogViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/TestDialogViewModel.cs
@@ -28,7 +28,7 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
protected override void OnDialogClosed()
{
- _navigationState.Screen().Router.NavigateAndReset.Execute(new HomePageViewModel(_navigationState));
+ _navigationState.MainScreen().Router.NavigateAndReset.Execute(new HomePageViewModel(_navigationState));
}
public void Close()

MODIFY
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
@@ -28,8 +28,8 @@ namespace WalletWasabi.Fluent.ViewModels
_navigationState = new NavigationStateViewModel()
{
DialogHost = () => this,
- Screen = () => this,
- Dialog = () => _dialogScreen
+ MainScreen = () => this,
+ DialogScreen = () => _dialogScreen
};
Network = global.Network;

MODIFY
WalletWasabi.Fluent/ViewModels/NavBarItemViewModel.cs
WalletWasabi.Fluent/ViewModels/NavBarItemViewModel.cs
@@ -22,7 +22,7 @@ namespace WalletWasabi.Fluent.ViewModels
public string UrlPathSegment { get; } = Guid.NewGuid().ToString().Substring(0, 5);
- public IScreen HostScreen => _navigationState.Screen();
+ public IScreen HostScreen => _navigationState.MainScreen();
public bool IsExpanded
{

MODIFY
WalletWasabi.Fluent/ViewModels/NavigationStateViewModel.cs
WalletWasabi.Fluent/ViewModels/NavigationStateViewModel.cs
@@ -7,8 +7,8 @@ namespace WalletWasabi.Fluent.ViewModels
public class NavigationStateViewModel
{
public Func<IDialogHost> DialogHost { get; set; }
- public Func<IScreen> Screen { get; set; }
- public Func<IScreen> Dialog { get; set; }
+ public Func<IScreen> MainScreen { get; set; }
+ public Func<IScreen> DialogScreen { get; set; }
public Func<IRoutableViewModel> CancelView { get; set; }
public Func<IRoutableViewModel> NextView { get; set; }
}

MODIFY
WalletWasabi.Fluent/ViewModels/SettingsPageViewModel.cs
WalletWasabi.Fluent/ViewModels/SettingsPageViewModel.cs
@@ -19,11 +19,11 @@ namespace WalletWasabi.Fluent.ViewModels
{
Title = "Settings";
- NextCommand = ReactiveCommand.Create(() => navigationState.Screen().Router.Navigate.Execute(new HomePageViewModel(navigationState)));
+ NextCommand = ReactiveCommand.Create(() => navigationState.MainScreen().Router.Navigate.Execute(new HomePageViewModel(navigationState)));
OpenDialogCommand = ReactiveCommand.CreateFromTask(async () => await ConfirmSetting.Handle("Please confirm the setting:").ToTask());
- OpenDialogScreenCommand = ReactiveCommand.Create(() => navigationState.Dialog().Router.Navigate.Execute(new HomePageViewModel(navigationState)));
+ OpenDialogScreenCommand = ReactiveCommand.Create(() => navigationState.DialogScreen().Router.Navigate.Execute(new HomePageViewModel(navigationState)));
ConfirmSetting = new Interaction<string, bool>();

Renamed screen properties