fix: downgrade FA library to fix a deadlock (#515)

timschneeb · Jul 11, 2024 · ab5f349 · ab5f349
1 parent e5c54d3
commit ab5f349
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/GalaxyBudsClient/GalaxyBudsClient.csproj b/GalaxyBudsClient/GalaxyBudsClient.csproj
@@ -90,7 +90,7 @@
         <PackageReference Include="Config.Net" Version="5.2.0" />
         <PackageReference Include="CS-Script" Version="4.8.16" />
         <PackageReference Include="FluentAvalonia.BreadcrumbBar" Version="2.0.2" />
-        <PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview5" />
+        <PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview2" />
         <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.234-exp" />
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">

diff --git a/GalaxyBudsClient/Interface/Pages/BatteryHistoryPage.axaml b/GalaxyBudsClient/Interface/Pages/BatteryHistoryPage.axaml
@@ -129,8 +129,14 @@
                       Cursor="{Binding PlotCursor}"
                       Grid.Row="3" />
 
+        <ProgressBar Grid.Row="3"
+                     Padding="16"
+                     IsIndeterminate="True"
+                     IsVisible="{Binding IsPlotLoading}"/>
+        <!-- TODO reintroduce progress ring after upgrading FluentAvalonia
         <ui:ProgressRing IsVisible="{Binding IsPlotLoading}"
                          Grid.Row="3" />
+                         -->
 
         <StackPanel Grid.Row="4"
                     Margin="0,8,0,0"