Container finally fixed. Some dialog window changes

CrackAndDie · Feb 29, 2024 · f7c2919 · f7c2919
1 parent f2492ba
commit f7c2919
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/Hypocrite.Core/Container/LightContainer.cs b/Hypocrite.Core/Container/LightContainer.cs
@@ -105,7 +105,7 @@ public object Resolve(Type type, bool withInjections)
 
  public object Resolve(Type type, string name, bool withInjections)
  {
- return Resolve(type, string.Empty, withInjections, out IContainerRegistration _);
+ return Resolve(type, name, withInjections, out IContainerRegistration _);
  }
 
  public object Resolve(Type type, string name, bool withInjections, out IContainerRegistration outRegistration)

diff --git a/Hypocrite.DemoAvalonia/Extensions/DialogExtensions.cs b/Hypocrite.DemoAvalonia/Extensions/DialogExtensions.cs
@@ -9,12 +9,12 @@ namespace Hypocrite.DemoAvalonia.Extensions
 {
  public static class DialogExtensions
  {
- public static void ShowMessageDialog(this IDialogService dialogService, string title, string message, DialogButtons buttons, Action<IDialogResult>? callback = null)
+ public static void ShowMessageDialog(this IDialogService dialogService, string title, string message, DialogButtons buttons, Action<IDialogResult> callback = null)
  {
  dialogService.ShowCustomDialog<MessageDialogView>(new { Title = title, Message = message, Buttons = buttons }, callback);
  }
 
- public static void ShowCustomDialog<DialogType>(this IDialogService dialogService, object? parameters = null, Action<IDialogResult>? callback = null)
+ public static void ShowCustomDialog<DialogType>(this IDialogService dialogService, object parameters = null, Action<IDialogResult> callback = null)
  where DialogType : Control
  {
  if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
@@ -30,7 +30,7 @@ public static void ShowCustomDialog<DialogType>(this IDialogService dialogServic
  }
  }
 
- private static IDialogParameters? ParseParameters(object? value)
+ private static IDialogParameters ParseParameters(object value)
  {
  if (value == null)
  {

diff --git a/Hypocrite.DemoAvalonia/ViewModels/DialogViewModels/MessageDialogViewModel.cs b/Hypocrite.DemoAvalonia/ViewModels/DialogViewModels/MessageDialogViewModel.cs
@@ -52,9 +52,9 @@ protected override void OnKeyDown(Avalonia.Input.KeyEventArgs keyArgs)
  [Notify]
  public DialogButtons Buttons { get; set; }
  [Notify]
- public string? Title { get; set; }
+ public string Title { get; set; }
  [Notify]
- public string? Message { get; set; }
+ public string Message { get; set; }
 
  [Notify]
  public ICommand YesCommand { get; set; }

diff --git a/Hypocrite.DemoAvalonia/ViewModels/HeaderViewModels/LeftControlViewModel.cs b/Hypocrite.DemoAvalonia/ViewModels/HeaderViewModels/LeftControlViewModel.cs
@@ -12,10 +12,10 @@ namespace Hypocrite.DemoAvalonia.ViewModels.HeaderViewModels
  public class LeftControlViewModel : ViewModelBase
  {
  [Injection]
- IWindowProgressService? ProgressService { get; set; }
+ IWindowProgressService ProgressService { get; set; }
  #region Commands
  [Notify]
- public ICommand? ShowDialogCommand { get; private set; }
+ public ICommand ShowDialogCommand { get; private set; }
  #endregion
 
  public override void OnViewAttached()

diff --git a/Hypocrite.DemoAvalonia/ViewModels/MainPageViewModel.cs b/Hypocrite.DemoAvalonia/ViewModels/MainPageViewModel.cs
@@ -28,18 +28,18 @@ public class MainPageViewModel : ViewModelBase
  [Notify]
  public Language SelectedLanguage { get; set; } = LocalizationManager.Languages.FirstOrDefault();
  [Notify]
- public IBrush? BindableBrush { get; set; }
+ public IBrush BindableBrush { get; set; }
 
  [Injection]
- private IThemeSwitcherService<ThemeType>? ThemeSwitcherService { get; set; }
+ private IThemeSwitcherService<ThemeType> ThemeSwitcherService { get; set; }
 
  public string ChangeThemeTag => "MainPage.ChangeTheme";
 
  public ObservableCollection<Language> Languages => LocalizationManager.Languages;
 
  #region Commands
  [Notify]
- public ICommand? ChangeThemeCommand { get; private set; }
+ public ICommand ChangeThemeCommand { get; private set; }
  #endregion
 
  public override void OnViewAttached()

diff --git a/Hypocrite.DemoAvalonia/Views/DialogWindowView.axaml.cs b/Hypocrite.DemoAvalonia/Views/DialogWindowView.axaml.cs
@@ -17,7 +17,6 @@ public DialogWindowView()
  InitializeComponent();
  if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
  {
- Owner = desktop.MainWindow;
  WindowStartupLocation = WindowStartupLocation.CenterOwner;
  }
  }

diff --git a/Hypocrite.DemoWpf/Views/DialogWindowView.xaml.cs b/Hypocrite.DemoWpf/Views/DialogWindowView.xaml.cs
@@ -11,7 +11,6 @@ public partial class DialogWindowView : Window, IDialogWindow
  public DialogWindowView()
  {
  InitializeComponent();
- Owner = Application.Current.MainWindow;
  WindowStartupLocation = WindowStartupLocation.CenterOwner;
  }
 

diff --git a/Hypocrite.Wpf/MVVM/ApplicationBase.cs b/Hypocrite.Wpf/MVVM/ApplicationBase.cs
@@ -32,14 +32,17 @@ protected override Window CreateShell()
  ev.GetEvent<PreviewDoneEvent>().Subscribe(OnPreviewDone);
  return Container.Resolve<IPreviewWindow>() as Window;
  }
- return Container.Resolve<IBaseWindow>() as Window;
+ var window = Container.Resolve<IBaseWindow>() as Window;
+ Application.Current.MainWindow = window;
+ return window;
  }
 
  private void OnPreviewDone()
  {
  Application.Current.Dispatcher.Invoke(() =>
  {
  var window = Container.Resolve<IBaseWindow>() as Window;
+ Application.Current.MainWindow = window;
  window.Show();
  });
  }