Display notify icon before loading plugins to tell users that Flow is loading

Author: Jack251970

Flow.Launcher/App.xaml.cs

@@ -24,6 +24,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.VisualStudio.Threading;
+using NotifyIcon = System.Windows.Forms.NotifyIcon;
 
 namespace Flow.Launcher
 {
@@ -32,6 +33,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         #region Public Properties
 
         public static IPublicAPI API { get; private set; }
+        public static NotifyIcon NotifyIcon { get; private set; }
         public static bool LoadingOrExiting => _mainWindow == null || _mainWindow.CanClose;
 
         #endregion
@@ -152,6 +154,20 @@ public static void Main()
 
         #endregion
 
+        #region Notify Icon
+
+        private void InitializeNotifyIcon()
+        {
+            NotifyIcon = new NotifyIcon
+            {
+                Text = Constant.FlowLauncherFullName,
+                Icon = Constant.Version == "1.0.0" ? Launcher.Properties.Resources.dev : Launcher.Properties.Resources.app,
+                Visible = !_settings.HideNotifyIcon
+            };
+        }
+
+        #endregion
+
         #region App Events
 
 #pragma warning disable VSTHRD100 // Avoid async void methods
@@ -180,6 +196,9 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 RegisterDispatcherUnhandledException();
                 RegisterTaskSchedulerUnhandledException();
 
+                // Display notify icon before loading plugins to tell users that Flow is loading
+                InitializeNotifyIcon();
+
                 var imageLoadertask = ImageLoader.InitializeAsync();
 
                 AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);

Flow.Launcher/MainWindow.xaml.cs

@@ -27,7 +27,6 @@
 using DataObject = System.Windows.DataObject;
 using Key = System.Windows.Input.Key;
 using MouseButtons = System.Windows.Forms.MouseButtons;
-using NotifyIcon = System.Windows.Forms.NotifyIcon;
 using Screen = System.Windows.Forms.Screen;
 
 namespace Flow.Launcher
@@ -47,11 +46,10 @@ public partial class MainWindow : IDisposable
         private readonly Settings _settings;
         private readonly Theme _theme;
 
-        // Window Notify Icon
-        private NotifyIcon _notifyIcon;
-
         // Window Context Menu
-        private readonly ContextMenu _contextMenu = new();
+        private static readonly ContextMenu _contextMenu = new();
+
+        // Window View Model
         private readonly MainViewModel _viewModel;
 
         // Window Event: Key Event
@@ -243,7 +241,7 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                         }
                         break;
                     case nameof(MainViewModel.GameModeStatus):
-                        _notifyIcon.Icon = _viewModel.GameModeStatus
+                        App.NotifyIcon.Icon = _viewModel.GameModeStatus
                             ? Properties.Resources.gamemode
                             : Properties.Resources.app;
                         break;
@@ -256,7 +254,7 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                 switch (e.PropertyName)
                 {
                     case nameof(Settings.HideNotifyIcon):
-                        _notifyIcon.Visible = !_settings.HideNotifyIcon;
+                        App.NotifyIcon.Visible = !_settings.HideNotifyIcon;
                         break;
                     case nameof(Settings.Language):
                         UpdateNotifyIconText();
@@ -317,7 +315,7 @@ private async void OnClosing(object sender, CancelEventArgs e)
             if (!CanClose)
             {
                 CanClose = true;
-                _notifyIcon.Visible = false;
+                App.NotifyIcon.Visible = false;
                 App.API.SaveAppAllSettings();
                 e.Cancel = true;
                 await ImageLoader.WaitSaveAsync();
@@ -663,14 +661,7 @@ private void SoundPlay()
 
         private void InitializeNotifyIcon()
         {
-            _notifyIcon = new NotifyIcon
-            {
-                Text = Constant.FlowLauncherFullName,
-                Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
-                Visible = !_settings.HideNotifyIcon
-            };
-
-            _notifyIcon.MouseClick += (o, e) =>
+            App.NotifyIcon.MouseClick += (o, e) =>
             {
                 switch (e.Button)
                 {
@@ -1322,7 +1313,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _hwndSource?.Dispose();
-                    _notifyIcon?.Dispose();
+                    App.NotifyIcon?.Dispose();
                     animationSoundWMP?.Close();
                     animationSoundWPF?.Dispose();
                     ModernWpf.ThemeManager.Current.ActualApplicationThemeChanged -= ThemeManager_ActualApplicationThemeChanged;