Merge pull request #1152 from beto-rodriguez/dev

2.0.0-beta.910

Author: beto-rodriguez

samples/AvaloniaSample/Bars/Race/View.axaml.cs

@@ -11,18 +11,6 @@ public class View : UserControl
     public View()
     {
         InitializeComponent();
-        Update();
-    }
-
-    public async void Update()
-    {
-        var vm = (ViewModel?)DataContext;
-        if (vm is null) return;
-        while (true)
-        {
-            Dispatcher.UIThread.Post(vm.RandomIncrement, DispatcherPriority.Background);
-            await Task.Delay(100);
-        }
     }
 
     private void InitializeComponent()

samples/BlazorSample/Pages/Bars/Race.razor

@@ -13,18 +13,7 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-
-        Update();
     }
 
     public ViewModel ViewModel { get; set; } = new();
-
-    public async void Update()
-    {
-        while (true)
-        {
-            ViewModel.RandomIncrement();
-            await Task.Delay(100);
-		}
-	}
 }

samples/EtoFormsSample/Bars/Race/View.cs

@@ -24,18 +24,6 @@ public View()
 
         Content = cartesianChart;
 
-        UpdateViewModel();
-
         UnLoad += (o, e) => Visible = false;
     }
-
-    public async void UpdateViewModel()
-    {
-        while (Visible)
-        {
-            viewModel.RandomIncrement();
-            cartesianChart.Series = viewModel.Series;
-            await Task.Delay(100);
-        }
-    }
 }

samples/MauiSample/Bars/Race/View.xaml.cs

@@ -8,16 +8,5 @@ public partial class View : ContentPage
     public View()
     {
         InitializeComponent();
-        Update();
-    }
-
-    public async void Update()
-    {
-        var vm = (ViewModel)BindingContext;
-        while (true)
-        {
-            _ = Dispatcher.Dispatch(vm.RandomIncrement);
-            await Task.Delay(100);
-        }
     }
 }

samples/UnoPlatformSample/UnoPlatformSample/LiveChartsSamples/Bars/Race/View.xaml.cs

@@ -9,16 +9,5 @@ public sealed partial class View : UserControl
     public View()
     {
         InitializeComponent();
-        Update();
-    }
-
-    public async void Update()
-    {
-        var vm = (ViewModel)DataContext;
-        while (true)
-        {
-            _ = Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () => vm.RandomIncrement());
-            await Task.Delay(100);
-        }
     }
 }

samples/ViewModelsSamples/Bars/Race/ViewModel.cs

@@ -1,6 +1,6 @@
-
-using System;
+using System;
 using System.Linq;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using LiveChartsCore;
 using LiveChartsCore.Defaults;
@@ -26,6 +26,13 @@ private static readonly (string, double)[] s_initialData =
         ("Hamilton", 1000)
     };
 
+    public ViewModel()
+    {
+        _ = StartRace();
+    }
+
+    public bool IsReading { get; set; } = true;
+
     [ObservableProperty]
     private ISeries[] _series =
         s_initialData
@@ -49,16 +56,28 @@ private static readonly (string, double)[] s_initialData =
     [ObservableProperty]
     private Axis[] _yAxes = { new Axis { IsVisible = false } };
 
-    public void RandomIncrement()
+    public async Task StartRace()
     {
-        foreach (var item in Series)
+        await Task.Delay(1000);
+
+        // to keep this sample simple, we run the next infinite loop
+        // in a real application you should stop the loop/task when the view is disposed
+
+        while (IsReading)
         {
-            if (item.Values is null) continue;
+            foreach (var item in Series)
+            {
+                if (item.Values is null) continue;
 
-            var i = ((ObservableValue[])item.Values)[0];
-            i.Value += _r.Next(0, 100);
-        }
+                var i = ((ObservableValue[])item.Values)[0];
+                i.Value += _r.Next(0, 100);
+            }
 
-        Series = Series.OrderByDescending(x => ((ObservableValue[])x.Values!)[0].Value).ToArray();
+            Series = Series
+                .OrderByDescending(x => ((ObservableValue[])x.Values!)[0].Value)
+                .ToArray();
+
+            await Task.Delay(100);
+        }
     }
 }

samples/ViewModelsSamples/General/MultiThreading/ViewModel.cs

@@ -55,11 +55,16 @@ public ViewModel()
 
     public object Sync { get; } = new object();
 
-    private async void ReadData()
+    public bool IsReading { get; set; } = true;
+
+    private async Task ReadData()
     {
         await Task.Delay(1000);
 
-        while (true)
+        // to keep this sample simple, we run the next infinite loop
+        // in a real application you should stop the loop/task when the view is disposed
+
+        while (IsReading)
         {
             await Task.Delay(_delay);
 

samples/ViewModelsSamples/General/MultiThreading2/ViewModel.cs

@@ -48,17 +48,22 @@ public ViewModel(Action<Action> uiThreadInvoker)
         // create {readTasks} parallel tasks that will add a point every {_delay} milliseconds
         for (var i = 0; i < readTasks; i++)
         {
-            ReadData();
+            _ = Task.Run(ReadData);
         }
     }
 
     public ISeries[] Series { get; set; }
 
-    public async void ReadData()
+    public bool IsReading { get; set; } = true;
+
+    public async Task ReadData()
     {
         await Task.Delay(1000);
 
-        while (true)
+        // to keep this sample simple, we run the next infinite loop
+        // in a real application you should stop the loop/task when the view is disposed
+
+        while (IsReading)
         {
             await Task.Delay(_delay);
 

samples/ViewModelsSamples/Pies/Custom/ViewModel.cs

@@ -13,8 +13,7 @@ public partial class ViewModel : ObservableObject
     public ViewModel()
     {
         var outer = 1d;
-        //var data = new[] { 6, 5, 4, 3 };
-        var data = new[] { 6 };
+        var data = new[] { 6, 5, 4, 3 };
 
         // you can convert any array, list or IEnumerable<T> to a pie series collection:
         Series = data.AsPieSeries((value, series) =>

samples/WPFSample/Bars/Race/View.xaml.cs

@@ -13,16 +13,5 @@ public partial class View : UserControl
     public View()
     {
         InitializeComponent();
-        Update();
-    }
-
-    public async void Update()
-    {
-        var vm = (ViewModel)DataContext;
-        while (true)
-        {
-            Application.Current.Dispatcher.Invoke(vm.RandomIncrement);
-            await Task.Delay(100);
-        }
     }
 }