refactor: refactor DialogService, fix DarkMode toggling

Signed-off-by: Russell Camo <[email protected]>
russkyc · Aug 29, 2023 · d5360d6 · d5360d6
1 parent 8543652
commit d5360d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/GroomWise.Application/ViewModels/AppViewModel.cs b/GroomWise.Application/ViewModels/AppViewModel.cs
@@ -96,7 +96,7 @@ private async Task SetDarkTheme(object param)
  {
  if (param is bool useDarkTheme)
  {
- ConfigurationService.DarkMode = true;
+ ConfigurationService.DarkMode = useDarkTheme;
  ThemeManagerService.SetDarkTheme(useDarkTheme);
  OnPropertyChanged(nameof(ConfigurationService.DarkMode));
  }

diff --git a/GroomWise.WPF/Factories/DialogService.cs → GroomWise.WPF/Services/DialogService.cs b/GroomWise.WPF/Factories/DialogService.cs → GroomWise.WPF/Services/DialogService.cs
@@ -10,7 +10,7 @@
 using GroomWise.Views.Dialogs;
 using Injectio.Attributes;
 
-namespace GroomWise.Factories;
+namespace GroomWise.Services;
 
 [RegisterSingleton<IDialogService, DialogService>]
 public class DialogService : IDialogService
@@ -23,6 +23,7 @@ public class DialogService : IDialogService
  () =>
  new DialogView(messageBoxText, caption)
  {
+ ShowInTaskbar = false,
  WindowStartupLocation = WindowStartupLocation.CenterOwner,
  Owner = (Window)navigationService.CurrentWindow!
  }.ShowDialog()
@@ -45,7 +46,9 @@ public void CloseDialogs(INavigationService navigationService)
  { } window
  )
  {
+ var owner = navigationService.CurrentWindow as Window;
  window.Close();
+ owner!.Focus();
  }
  });
  });
@@ -61,9 +64,10 @@ public void CreateAddAppointmentsDialog(object viewModel, INavigationService nav
  {
  new AddAppointmentsView(viewModel)
  {
+ ShowInTaskbar = false,
  WindowStartupLocation = WindowStartupLocation.CenterOwner,
  Owner = (Window)navigationService.CurrentWindow!
- }.ShowDialog();
+ }.Show();
  }
  });
  });