refactor: load plot asynchronously

timschneeb · May 4, 2024 · a38a213 · a38a213
1 parent 7e8b6b5
commit a38a213
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/GalaxyBudsClient/Interface/Pages/BatteryHistoryPage.axaml b/GalaxyBudsClient/Interface/Pages/BatteryHistoryPage.axaml
@@ -9,7 +9,6 @@
              xmlns:config="clr-namespace:GalaxyBudsClient.Model.Config"
              xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:plot="clr-namespace:ScottPlot.Avalonia;assembly=ScottPlot.Avalonia"
-             xmlns:control="clr-namespace:ScottPlot.Control;assembly=ScottPlot"
              mc:Ignorable="d" d:DesignWidth="800"
              x:Class="GalaxyBudsClient.Interface.Pages.BatteryHistoryPage"
              x:DataType="pages:BatteryHistoryPageViewModel"
@@ -32,6 +31,11 @@
 
         <!-- AvaPlot does not support bindings :( -->
         <plot:AvaPlot Name="PlotControl"
+                      IsVisible="{Binding !IsPlotLoading}"
                       Grid.Row="1" />
+
+        <ui:ProgressRing IsVisible="{Binding IsPlotLoading}"
+                         Grid.Row="1" />
+
     </Grid>
 </UserControl>
diff --git a/GalaxyBudsClient/Interface/ViewModels/Pages/BatteryHistoryPageViewModel.cs b/GalaxyBudsClient/Interface/ViewModels/Pages/BatteryHistoryPageViewModel.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Threading;
 using GalaxyBudsClient.Generated.I18N;
 using GalaxyBudsClient.Interface.Pages;
 using GalaxyBudsClient.Utils;
@@ -13,6 +15,7 @@
 using ScottPlot.AxisRules;
 using ScottPlot.Control;
 using ScottPlot.TickGenerators;
+using Serilog;
 
 namespace GalaxyBudsClient.Interface.ViewModels.Pages;
 
@@ -21,16 +24,25 @@ public class BatteryHistoryPageViewModel : SubPageViewModelBase
     public override Control CreateView() => new BatteryHistoryPage { DataContext = this };
     public override string TitleKey => Keys.SystemBatteryStatistics;
     public Plot? Plot { set; get; }
+
+    [Reactive] public bool IsPlotLoading { set;get; }
 
     public BatteryHistoryPageViewModel()
     {
     }
 
-    public override async void OnNavigatedTo()
+    public override void OnNavigatedTo()
+    {
+        Task.Run(UpdatePlotAsync);
+    }
+
+    private async Task UpdatePlotAsync()
     {
         if(Plot == null)
             return;
 
+        IsPlotLoading = true;
+
         Plot.Clear();
         Plot.Add.Palette = new ScottPlot.Palettes.Nord();
 
@@ -69,7 +81,7 @@ public override async void OnNavigatedTo()
             Top = 105,
             Bottom = 0
         })));*/
-        Plot.Axes.Left.TickGenerator = new NumericAutomatic()
+        Plot.Axes.Left.TickGenerator = new NumericAutomatic
         {
             LabelFormatter = value => value is < 0 or > 100 ? string.Empty : NumericAutomatic.DefaultLabelFormatter(value), 
         };
@@ -78,6 +90,8 @@ public override async void OnNavigatedTo()
         Plot.ShowLegend();
 
         Plot?.Axes.DateTimeTicksBottom();
+
+        IsPlotLoading = false;
     }
 }