Remove shared status state

CPAP-Exporter.UI/Infrastructure/Testability/ApplicationComponentProvider.cs

@@ -4,19 +4,10 @@ public static class ApplicationComponentProvider
     {
         static ApplicationComponentProvider()
         {
-            ApplicationComponentProvider.Status = new Status();
             ApplicationComponentProvider.PageViewModelProvider = new PageViewModelProvider();
             ApplicationComponentProvider.CpapSourceValidator = new CpapSourceValidator();
         }
 
-        public static IStatus Status
-        {
-            get;
-#if DEBUG
-            set;
-#endif
-        }
-
         public static IPageViewModelProvider PageViewModelProvider
         {
             get;

CPAP-Exporter.UI/Pages/OpenFiles/OpenFilesViewModel.cs

@@ -1,7 +1,9 @@
 using System.IO;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace CascadePass.CPAPExporter
 {
@@ -159,8 +161,6 @@ public void Load(string folder)
                 this.ExportParameters.Reports.Clear();
             }
 
-            ApplicationComponentProvider.Status.StatusText = string.Format(Resources.ReadingFolder, folder);
-
             this.OnAdvancePage();
         }
 
@@ -174,13 +174,15 @@ internal bool CanImportFrom(string folder)
 
             if (!Directory.Exists(folder))
             {
-                ApplicationComponentProvider.Status.StatusText = string.Format(Resources.FolderDoesNotExist, folder);
+                this.StatusContent = new WarningToast(string.Format(Resources.FolderDoesNotExist, folder));
+                //ApplicationComponentProvider.Status.StatusText = string.Format(Resources.FolderDoesNotExist, folder);
                 return false;
             }
 
             if (!ApplicationComponentProvider.CpapSourceValidator.IsCpapFolderStructure(folder))
             {
-                ApplicationComponentProvider.Status.StatusText = string.Format(Resources.FolderIsNotPAP, folder);
+                //ApplicationComponentProvider.Status.StatusText = string.Format(Resources.FolderIsNotPAP, folder);
+                this.StatusContent = new WarningToast(string.Format(Resources.FolderIsNotPAP, folder));
                 return false;
             }
 
@@ -202,7 +204,8 @@ internal string FindImportableParentFolder(string folder)
 
                 if (dir.Parent is null)
                 {
-                    ApplicationComponentProvider.Status.StatusText = string.Format(Resources.NoPapData, folder);
+                    //ApplicationComponentProvider.Status.StatusText = string.Format(Resources.NoPapData, folder);
+                    this.StatusContent = new WarningToast(string.Format(Resources.NoPapData, folder));
                     return null;
                 }
 

CPAP-Exporter.UI/Pages/SavedFiles/SavedFileType.cs

@@ -0,0 +1,9 @@
+namespace CascadePass.CPAPExporter
+{
+    public enum SavedFileType
+    {
+        None,
+        FullExport,
+        EventsExport,
+    }
+}

CPAP-Exporter.UI/Pages/SavedFiles/SavedFileViewModel.cs

@@ -139,11 +139,15 @@ public void DeleteFile()
                 this.IsDeleted = true;
                 this.OnFileDeleted(this, EventArgs.Empty);
 
-                ApplicationComponentProvider.Status.StatusText = string.Format(Resources.FileWasDeleted, this.Filename);
+                //ApplicationComponentProvider.Status.StatusText = string.Format(Resources.FileWasDeleted, this.Filename);
             }
             catch (Exception ex)
             {
-                ApplicationComponentProvider.Status.StatusText = ex.Message;
+                //TODO: Create an Owner property linking back to the SavedFilesVM.
+                var window = Application.Current?.MainWindow;
+                var viewModel = window?.DataContext as PageViewModel;
+
+                Application.Current.Dispatcher.Invoke(() => { viewModel.StatusContent = new ErrorToast(ex.Message); });
             }
         }
 

CPAP-Exporter.UI/Pages/SavedFiles/SavedFilesViewModel.cs

@@ -84,7 +84,10 @@ public void PerformExportAsync(string folder)
 
         public void PerformExport(string folder)
         {
-            ApplicationComponentProvider.Status.StatusText = Resources.Working;
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                this.StatusContent = new BusyToast();
+            });
 
             try
             {
@@ -125,16 +128,15 @@ [.. this.ExportParameters.Reports.Where(r => r.IsSelected).Select(r => r.DailyRe
             }
             catch (Exception ex)
             {
-                ApplicationComponentProvider.Status.StatusText = ex.Message;
+                Application.Current.Dispatcher.Invoke(() => { this.StatusContent = new ErrorToast(ex.Message); });
 
                 if (Debugger.IsAttached)
                 {
                     Debugger.Break();
                 }
             }
 
-            ApplicationComponentProvider.Status.ProgressBar = null;
-            ApplicationComponentProvider.Status.StatusText = string.Empty;
+            Application.Current.Dispatcher.Invoke(() => { this.StatusContent = null; });
         }
 
         #region Button click implementations
@@ -179,21 +181,23 @@ private void FileViewModel_FileDeleted(object sender, EventArgs e)
 
                 fileViewModel.PropertyChanged -= this.FileViewModel_PropertyChanged;
                 fileViewModel.FileDeleted -= this.FileViewModel_FileDeleted;
+
+                var fileTypeLabel = fileViewModel.FileType.ToString().Replace("Export", "");
+                this.StatusContent = new InfoToast(string.Format(Resources.FileWasDeleted, fileTypeLabel, fileViewModel.Filename));
             }
         }
 
         private void Exporter_Progress(object sender, ExportProgressEventArgs e)
         {
             if (this.Dispatcher?.CheckAccess() ?? true)
             {
-                ApplicationComponentProvider.Status.ProgressBar = new(0, e.ExpectedRows, e.CurrentRowIndex);
-                ApplicationComponentProvider.Status.StatusText = string.Format(Resources.RowsWritten, e.CurrentRowIndex.ToString("#,##0"));
+                // Update progress bar
             }
             else
             {
                 this.Dispatcher.Invoke(() =>
                 {
-                    ApplicationComponentProvider.Status.ProgressBar = new(0, e.ExpectedRows, e.CurrentRowIndex);
+                    // Update progress bar
                 });
             }
         }
@@ -202,11 +206,4 @@ private void Exporter_Progress(object sender, ExportProgressEventArgs e)
 
         #endregion
     }
-
-    public enum SavedFileType
-    {
-        None,
-        FullExport,
-        EventsExport,
-    }
 }

CPAP-Exporter.UI/Pages/SelectNights/SelectNightsViewModel.cs

@@ -206,11 +206,9 @@ public void LoadFromFolder(string folder, bool replaceExisting)
 
         internal void ConsumeReports(List<DailyReport> reports, string folder)
         {
-            ApplicationComponentProvider.Status.ProgressBar = new(0, reports.Count - 1, 0);
-
             for (int i = 0; i < reports.Count; i++)
             {
-                ApplicationComponentProvider.Status.ProgressBar.Current = i;
+                // Update progress bar
 
                 var report = reports[i];
 
@@ -219,16 +217,12 @@ internal void ConsumeReports(List<DailyReport> reports, string folder)
                     this.AddReport(report, folder);
                 }
             }
-
-            ApplicationComponentProvider.Status.ProgressBar = null;
         }
 
         internal DailyReportViewModel AddReport(DailyReport report, string folder)
         {
             ArgumentNullException.ThrowIfNull(report, nameof(report));
 
-            ApplicationComponentProvider.Status.StatusText = string.Format(Resources.AddingDate, report.ReportDate);
-
             DailyReportViewModel reportViewModel = new(report, this.IsAllSelected, folder);
             this.Reports.Add(reportViewModel);
 

CPAP-Exporter.UI/Pages/SelectSignals/SelectSignalsViewModel.cs

@@ -86,7 +86,7 @@ public string GenerateSampleCSV()
                 catch (Exception ex)
                 {
 #if DEBUG
-                    ApplicationComponentProvider.Status.StatusText = ex.Message;
+                    this.StatusContent = new ErrorToast(ex.Message);
 #endif
                 }
             }
@@ -133,7 +133,7 @@ private void ConsumeExportParameters()
                 }
             }
 
-            ApplicationComponentProvider.Status.StatusText = string.Format(Resources.SignalsAvailable, this.ExportParameters.Signals.Count);
+            this.StatusContent = new InfoToast(string.Format(Resources.SignalsAvailable, this.Signals.Count));
         }
 
         protected override void OnPropertyChanged(string propertyName)

CPAP-Exporter.UI/Resources.resx

@@ -250,7 +250,7 @@
     <value>Delimiter</value>
   </data>
   <data name="FileWasDeleted" xml:space="preserve">
-    <value>{0} was deleted</value>
+    <value>{0} file {1} was deleted.</value>
   </data>
   <data name="ReadingFolder" xml:space="preserve">
     <value>Reading folder {0}</value>

CPAP-Exporter.UI/ViewModels/NavigationViewModel.cs

@@ -237,16 +237,12 @@ public void ShowSignals()
 
             this.CurrentView = new SelectSignalsView { DataContext = viewModel };
             this.CurrentStep = NavigationStep.SelectSignals;
-
-            ApplicationComponentProvider.Status.StatusText = string.Format(Resources.SignalsAvailable, viewModel.Signals.Count);
         }
 
         public void ShowExportSettings()
         {
             this.CurrentView = new OptionsView() { DataContext = new ExportOptionsPageViewModel(this.ExportParameters) };
             this.CurrentStep = NavigationStep.Settings;
-
-            ApplicationComponentProvider.Status.StatusText = Resources.ReadyToExport;
         }
 
         public void Export()