Tweak the order of popups when the app loads

Tyrrrz · Apr 23, 2024 · 98dee7e · 98dee7e
1 parent 32ebf3b
commit 98dee7e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/LightBulb/ViewModels/MainViewModel.cs b/LightBulb/ViewModels/MainViewModel.cs
@@ -32,6 +32,33 @@ UpdateService updateService
 
     public DashboardViewModel Dashboard { get; } = viewModelManager.CreateDashboardViewModel();
 
+    private async Task FinalizePendingUpdateAsync()
+    {
+        var updateVersion = updateService.TryGetLastPreparedUpdate();
+        if (updateVersion is null)
+            return;
+
+        var dialog = viewModelManager.CreateMessageBoxViewModel(
+            "Update available",
+            $"""
+            Update to {Program.Name} v{updateVersion} has been downloaded.
+            Do you want to install it now?
+            """,
+            "INSTALL",
+            "CANCEL"
+        );
+
+        Application.Current?.TryFocusMainWindow();
+
+        if (await dialogManager.ShowDialogAsync(dialog) != true)
+            return;
+
+        updateService.FinalizeUpdate(updateVersion);
+
+        if (Application.Current?.ApplicationLifetime?.TryShutdown(2) != true)
+            Environment.Exit(2);
+    }
+
     private async Task ShowGammaRangePromptAsync()
     {
         if (settingsService.IsExtendedGammaRangeUnlocked)
@@ -113,43 +140,16 @@ Click LEARN MORE to find ways that you can help.
         ProcessEx.StartShellExecute("https://tyrrrz.me/ukraine?source=lightbulb");
     }
 
-    private async Task FinalizePendingUpdateAsync()
-    {
-        var updateVersion = updateService.TryGetLastPreparedUpdate();
-        if (updateVersion is null)
-            return;
-
-        var dialog = viewModelManager.CreateMessageBoxViewModel(
-            "Update available",
-            $"""
-            Update to {Program.Name} v{updateVersion} has been downloaded.
-            Do you want to install it now?
-            """,
-            "INSTALL",
-            "CANCEL"
-        );
-
-        Application.Current?.TryFocusMainWindow();
-
-        if (await dialogManager.ShowDialogAsync(dialog) != true)
-            return;
-
-        updateService.FinalizeUpdate(updateVersion);
-
-        if (Application.Current?.ApplicationLifetime?.TryShutdown(2) != true)
-            Environment.Exit(2);
-    }
-
     [RelayCommand]
     private async Task InitializeAsync()
     {
         // Load settings
         settingsService.Load();
 
+        await FinalizePendingUpdateAsync();
         await ShowGammaRangePromptAsync();
         await ShowFirstTimeExperienceMessageAsync();
         await ShowUkraineSupportMessageAsync();
-        await FinalizePendingUpdateAsync();
 
         _checkForUpdatesTimer.Start();
     }

diff --git a/LightBulb/Views/MainView.axaml b/LightBulb/Views/MainView.axaml
@@ -22,10 +22,7 @@
     </Design.DataContext>
 
     <Border BorderBrush="{DynamicResource MaterialPrimaryLightBrush}" BorderThickness="1">
-        <dialogHostAvalonia:DialogHost
-            x:Name="DialogHost"
-            CloseOnClickAway="False"
-            Loaded="DialogHost_OnLoaded">
+        <dialogHostAvalonia:DialogHost CloseOnClickAway="False">
             <Grid RowDefinitions="Auto,*,Auto">
                 <!--  Header  -->
                 <Border

diff --git a/LightBulb/Views/MainView.axaml.cs b/LightBulb/Views/MainView.axaml.cs
@@ -14,6 +14,8 @@ private void Window_OnLoaded(object sender, RoutedEventArgs args)
     {
         if (StartOptions.Current.IsInitiallyHidden)
             Hide();
+
+        DataContext.InitializeCommand.Execute(null);
     }
 
     private void Window_OnClosing(object sender, WindowClosingEventArgs args)
@@ -22,9 +24,6 @@ private void Window_OnClosing(object sender, WindowClosingEventArgs args)
         Hide();
     }
 
-    private void DialogHost_OnLoaded(object? sender, RoutedEventArgs args) =>
-        DataContext.InitializeCommand.Execute(null);
-
     private void HeaderBorder_OnPointerPressed(object? sender, PointerPressedEventArgs args) =>
         BeginMoveDrag(args);