Added aggregated data reading and writing operation dots

d2dyno1 · d2dyno1 · commit 6b804c0703e6 · 2026-04-05T13:49:59.000+02:00
diff --git a/src/Platforms/Directory.Packages.props b/src/Platforms/Directory.Packages.props
@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageVersion Include="AathifMahir.Maui.MauiIcons.Cupertino" Version="6.0.0" />
     <PackageVersion Include="AathifMahir.Maui.MauiIcons.Material" Version="6.0.0" />
-    <PackageVersion Include="AcrylicView.Maui" Version="3.0.0" />
+    <PackageVersion Include="AcrylicView.Maui" Version="3.0.1" />
     <PackageVersion Include="CommunityToolkit.Maui" Version="14.0.0" />
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.251219" />
     <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
@@ -45,7 +45,7 @@
     <PackageVersion Include="VideoLAN.LibVLC.Android" Version="3.6.5" />
     <PackageVersion Include="VideoLAN.LibVLC.iOS" Version="3.6.1" />
     <PackageVersion Include="WinUI.TableView" Version="1.4.0" />
-    <PackageVersion Include="Xamarin.AndroidX.DocumentFile" Version="1.1.0.1" />
+    <PackageVersion Include="Xamarin.AndroidX.DocumentFile" Version="1.1.0.3" />
     <PackageVersion Include="Yubico.YubiKey" Version="1.15.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml
@@ -24,16 +24,13 @@
             <Border.StrokeShape>
                 <RoundRectangle CornerRadius="12" />
             </Border.StrokeShape>
-            <Grid RowSpacing="0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="4" />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
+            <Grid Padding="12" ColumnSpacing="8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-                <VerticalStackLayout
-                    Grid.Row="1"
-                    Padding="12,10,12,12"
-                    Spacing="2">
+                <VerticalStackLayout Grid.Column="0" Spacing="2">
                     <Label
                         FontSize="12"
                         Opacity="0.6"
@@ -43,6 +40,14 @@
                         FontSize="22"
                         Text="{Binding TotalRead, Mode=OneWay}" />
                 </VerticalStackLayout>
+
+                <Ellipse
+                    x:Name="ReadEllipsis"
+                    Grid.Column="1"
+                    Background="Orange"
+                    HeightRequest="8"
+                    Opacity="0"
+                    WidthRequest="8" />
             </Grid>
         </Border>
 
@@ -55,16 +60,13 @@
             <Border.StrokeShape>
                 <RoundRectangle CornerRadius="12" />
             </Border.StrokeShape>
-            <Grid RowSpacing="0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="4" />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
+            <Grid Padding="12" ColumnSpacing="8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-                <VerticalStackLayout
-                    Grid.Row="1"
-                    Padding="12,10,12,12"
-                    Spacing="2">
+                <VerticalStackLayout Grid.Column="0" Spacing="2">
                     <Label
                         FontSize="12"
                         Opacity="0.6"
@@ -74,6 +76,14 @@
                         FontSize="22"
                         Text="{Binding TotalWrite, Mode=OneWay}" />
                 </VerticalStackLayout>
+
+                <Ellipse
+                    x:Name="WriteEllipsis"
+                    Grid.Column="1"
+                    Background="Orange"
+                    HeightRequest="8"
+                    Opacity="0"
+                    WidthRequest="8" />
             </Grid>
         </Border>
 
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml.cs
@@ -22,6 +22,36 @@ public string? TotalWrite
         }
         public static readonly BindableProperty TotalWriteProperty =
             BindableProperty.Create(nameof(TotalWrite), typeof(string), typeof(AggregatedDataWidget));
+        
+        public bool IsReading
+        {
+            get => (bool)GetValue(IsReadingProperty);
+            set => SetValue(IsReadingProperty, value);
+        }
+        public static readonly BindableProperty IsReadingProperty =
+            BindableProperty.Create(nameof(IsReading), typeof(bool), typeof(AggregatedDataWidget), false,
+                propertyChanged: static (bindable, _, newValue) =>
+                {
+                    if (bindable is not AggregatedDataWidget widget || newValue is not bool bValue)
+                        return;
+
+                    widget.ReadEllipsis.FadeToAsync(bValue ? 1d : 0d);
+                });
+        
+        public bool IsWriting
+        {
+            get => (bool)GetValue(IsWritingProperty);
+            set => SetValue(IsWritingProperty, value);
+        }
+        public static readonly BindableProperty IsWritingProperty =
+            BindableProperty.Create(nameof(IsWriting), typeof(bool), typeof(AggregatedDataWidget), false,
+                propertyChanged: static (bindable, _, newValue) =>
+                {
+                    if (bindable is not AggregatedDataWidget widget || newValue is not bool bValue)
+                        return;
+
+                    widget.WriteEllipsis.FadeToAsync(bValue ? 1d : 0d);
+                });
     }
 }
 
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml
@@ -27,7 +27,11 @@
 
         <!--  Aggregated Data Statistics Widget  -->
         <DataTemplate x:Key="AggregatedDataWidgetTemplate" x:DataType="vm2:AggregatedDataWidgetViewModel">
-            <ucw:AggregatedDataWidget TotalRead="{Binding TotalRead, Mode=OneWay}" TotalWrite="{Binding TotalWrite, Mode=OneWay}" />
+            <ucw:AggregatedDataWidget
+                IsReading="{Binding IsReading, Mode=OneWay}"
+                IsWriting="{Binding IsWriting, Mode=OneWay}"
+                TotalRead="{Binding TotalRead, Mode=OneWay}"
+                TotalWrite="{Binding TotalWrite, Mode=OneWay}" />
         </DataTemplate>
     </ContentPage.Resources>
 
diff --git a/src/Sdk/SecureFolderFS.Sdk/Constants.cs b/src/Sdk/SecureFolderFS.Sdk/Constants.cs
@@ -16,9 +16,15 @@ public static class Widgets
 
             public static class Graphs
             {
-                public const int MAX_GRAPH_POINTS = 30;
-                public const int GRAPH_UPDATE_INTERVAL_MS = 200; // 0.2s
-                public const int GRAPH_REFRESH_RATE = 1000 / GRAPH_UPDATE_INTERVAL_MS;
+                public const int MAX_POINTS = 30;
+                public const int UPDATE_INTERVAL_MS = 200;
+                public const int REFRESH_RATE = 1000 / UPDATE_INTERVAL_MS;
+            }
+
+            public static class AggregatedData
+            {
+                public const int UPDATE_INTERVAL_MS = 400;
+                public const int REFRESH_RATE = 4;
             }
 
             public static class Health
diff --git a/src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/AggregatedDataWidgetViewModel.cs b/src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/AggregatedDataWidgetViewModel.cs
@@ -21,15 +21,18 @@ public sealed partial class AggregatedDataWidgetViewModel : BaseWidgetViewModel
         private ulong _pendingBytesWritten;
         private ByteSize _bytesRead;
         private ByteSize _bytesWritten;
+        private int _updateTicks;
 
         [ObservableProperty] private string? _TotalRead;
         [ObservableProperty] private string? _TotalWrite;
+        [ObservableProperty] private bool _IsReading;
+        [ObservableProperty] private bool _IsWriting;
 
         public AggregatedDataWidgetViewModel(UnlockedVaultViewModel unlockedVaultViewModel, IWidgetModel widgetModel)
             : base(widgetModel)
         {
             _fileSystemStatistics = unlockedVaultViewModel.StorageRoot.Options.FileSystemStatistics;
-            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Widgets.Graphs.GRAPH_UPDATE_INTERVAL_MS));
+            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Widgets.AggregatedData.UPDATE_INTERVAL_MS));
             Title = "AggregatedDataWidget".ToLocalized();
         }
 
@@ -46,14 +49,20 @@ public override Task InitAsync(CancellationToken cancellationToken = default)
             {
                 _bytesReadSubscription = subscriber.SubscribeToBytesRead(new Progress<long>(x =>
                 {
-                    if (x > 0)
-                        _pendingBytesRead += (ulong)x;
+                    if (x <= 0L)
+                        return;
+
+                    IsReading = true;
+                    _pendingBytesRead += (ulong)x;
                 }));
 
                 _bytesWrittenSubscription = subscriber.SubscribeToBytesWritten(new Progress<long>(x =>
                 {
-                    if (x > 0)
-                        _pendingBytesWritten += (ulong)x;
+                    if (x <= 0L)
+                        return;
+
+                    IsWriting = true;
+                    _pendingBytesWritten += (ulong)x;
                 }));
             }
 
@@ -80,6 +89,14 @@ private async Task InitializeBlockingTimer(CancellationToken cancellationToken)
                     TotalWrite = _bytesWritten.ToString().Replace(" ", string.Empty);
                     _pendingBytesWritten = 0UL;
                 }
+
+                _updateTicks++;
+                if (_updateTicks >= Constants.Widgets.AggregatedData.REFRESH_RATE)
+                {
+                    _updateTicks = 0;
+                    IsReading = false;
+                    IsWriting = false;
+                }
             }
         }
 
diff --git a/src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphControlViewModel.cs b/src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphControlViewModel.cs
@@ -29,7 +29,7 @@ public void Report(double value)
         /// <inheritdoc/>
         public Task InitAsync(CancellationToken cancellationToken = default)
         {
-            for (var i = 0; i < Constants.Widgets.Graphs.MAX_GRAPH_POINTS; i++)
+            for (var i = 0; i < Constants.Widgets.Graphs.MAX_POINTS; i++)
                 Data.Add(0d);
 
             return Task.CompletedTask;
diff --git a/src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphsWidgetViewModel.cs b/src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphsWidgetViewModel.cs
@@ -39,7 +39,7 @@ public GraphsWidgetViewModel(UnlockedVaultViewModel unlockedVaultViewModel, IWid
             WriteGraphViewModel = new();
             _fileSystemStatistics = unlockedVaultViewModel.StorageRoot.Options.FileSystemStatistics;
 
-            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Widgets.Graphs.GRAPH_UPDATE_INTERVAL_MS));
+            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Widgets.Graphs.UPDATE_INTERVAL_MS));
             _readRates = [ 0 ];
             _writeRates = [ 0 ];
         }
@@ -68,8 +68,8 @@ private async Task InitializeBlockingTimer(CancellationToken cancellationToken)
                 if (!IsActive)
                     continue;
 
-                _readRates.AddWithMaxCapacity(_currentReadAmount, Constants.Widgets.Graphs.GRAPH_REFRESH_RATE);
-                _writeRates.AddWithMaxCapacity(_currentWriteAmount, Constants.Widgets.Graphs.GRAPH_REFRESH_RATE);
+                _readRates.AddWithMaxCapacity(_currentReadAmount, Constants.Widgets.Graphs.REFRESH_RATE);
+                _writeRates.AddWithMaxCapacity(_currentWriteAmount, Constants.Widgets.Graphs.REFRESH_RATE);
 
                 CalculateStatistics();
             }
@@ -93,7 +93,7 @@ private void CalculateStatistics()
             _currentWriteAmount = 0;
 
             _updateTimeCount++;
-            if (_updateTimeCount == Constants.Widgets.Graphs.GRAPH_REFRESH_RATE)
+            if (_updateTimeCount == Constants.Widgets.Graphs.REFRESH_RATE)
             {
                 _updateTimeCount = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void Report(double value)`
`29`	`29`	`/// <inheritdoc/>`
`30`	`30`	`public Task InitAsync(CancellationToken cancellationToken = default)`
`31`	`31`	`{`
`32`		`- for (var i = 0; i < Constants.Widgets.Graphs.MAX_GRAPH_POINTS; i++)`
	`32`	`+ for (var i = 0; i < Constants.Widgets.Graphs.MAX_POINTS; i++)`
`33`	`33`	`Data.Add(0d);`
`34`	`34`
`35`	`35`	`return Task.CompletedTask;`