rename Popup to Dialog
MODIFY
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
@@ -4,7 +4,7 @@ using System.Reactive.Linq;
using System.Text;
using System.Threading.Tasks;
using ReactiveUI;
-using WalletWasabi.Fluent.ViewModels.Popup;
+using WalletWasabi.Fluent.ViewModels.Dialog;
namespace WalletWasabi.Fluent.ViewModels
{

MODIFY
WalletWasabi.Fluent/ViewModels/MainWindowViewModel.cs
WalletWasabi.Fluent/ViewModels/MainWindowViewModel.cs
@@ -4,7 +4,7 @@ using System.Reactive.Linq;
using System.Text;
using System.Threading.Tasks;
using ReactiveUI;
-using WalletWasabi.Fluent.ViewModels.Popup;
+using WalletWasabi.Fluent.ViewModels.Dialog;
namespace WalletWasabi.Fluent.ViewModels
{

DELETE
WalletWasabi.Fluent/ViewModels/Popup/IPopupHost.cs
-using System.Threading.Tasks;
-
-namespace WalletWasabi.Fluent.ViewModels.Popup
-{
- public interface IPopupHost
- {
- void SetDialog(IPopupView targetView);
-
- bool CanDisplayDialog { get; }
-
- void Close();
- }
-}
\ No newline at end of file

DELETE
WalletWasabi.Fluent/ViewModels/Popup/IPopupView.cs
-namespace WalletWasabi.Fluent.ViewModels.Popup
-{
- public interface IPopupView
- {
- IPopupHost Parent { get; set; }
- }
-}
\ No newline at end of file

RENAME
WalletWasabi.Fluent/ViewModels/ModalDialogHostViewModelBase.cs
WalletWasabi.Fluent/ViewModels/Popup/ModalDialogHostViewModelBase.cs
@@ -4,20 +4,20 @@ using System.Reactive.Linq;
using System.Text;
using System.Threading.Tasks;
using ReactiveUI;
-using WalletWasabi.Fluent.ViewModels.Popup;
+using WalletWasabi.Fluent.ViewModels.Dialog;
-namespace WalletWasabi.Fluent.ViewModels
+namespace WalletWasabi.Fluent.ViewModels.Dialog
{
- public class ModalDialogHostViewModelBase : ReactiveObject, IPopupHost
+ public class ModalDialogHostViewModelBase : ReactiveObject, IDialogHost
{
- private static IPopupHost _host;
- private IPopupView _currentPopupView;
- public IPopupHost DialogHost => _host;
+ private static IDialogHost _host;
+ private IDialogView _currentPopupView;
+ public IDialogHost DialogHost => _host;
private readonly ObservableAsPropertyHelper<bool> _canDisplayDialog;
public bool CanDisplayDialog => _canDisplayDialog?.Value ?? false;
- public void SetHost(IPopupHost host)
+ public void SetHost(IDialogHost host)
{
if (_host is null)
{
@@ -37,13 +37,13 @@ namespace WalletWasabi.Fluent.ViewModels
.ToProperty(this, x => x.CanDisplayDialog);
}
- public IPopupView CurrentPopupView
+ public IDialogView CurrentPopupView
{
get => _currentPopupView;
set => this.RaiseAndSetIfChanged(ref _currentPopupView, value, nameof(CurrentPopupView));
}
- public void SetDialog(IPopupView targetView)
+ public void SetDialog(IDialogView targetView)
{
if (CanDisplayDialog)
{

rename Popup to Dialog