Add LiveCharts2 page to example

Author: VincentH-Net

src/CSharpMarkup.WinUI.Examples/Directory.Packages.props

@@ -9,6 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="CSharpMarkup.WinUI" Version="3.1.2" />
+    <PackageVersion Include="CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.ScottPlot" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="3.1.2" />

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Core/GlobalUsings.cs

@@ -26,7 +26,6 @@
 global using static CSharpMarkup.WinUI.Uno.Extensions.Navigation.Helpers;
 global using static CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.Helpers;
 global using static CSharpMarkup.WinUI.Uno.Toolkit.Helpers;
-global using static CSharpMarkup.WinUI.ScottPlot.Helpers;
 global using static WinUICsMarkupExamples.Presentation.Core.MarkupHelpers;
 
 // Aliases for WinUI namespaces and types
@@ -35,7 +34,7 @@
 global using UI = Microsoft.UI;
 global using UIBindable = Microsoft.UI.Xaml.Data.BindableAttribute;
 global using UIControls = Microsoft.UI.Xaml.Controls;
-global using UIScottPlot = ScottPlot.WinUI;
+global using UISp = ScottPlot.WinUI;
 
 // - Non-view types, e.g. enums, don't need a UI prefix because they are not mirrored as types in the CSharpMarkup namespaces
 global using BindingMode = Microsoft.UI.Xaml.Data.BindingMode;

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/LiveCharts2Page.cs

@@ -0,0 +1,27 @@
+using CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView;
+using static CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView.Helpers;
+
+namespace WinUICsMarkupExamples.Presentation.Example;
+
+partial class LiveCharts2Page
+{
+    enum Row { Header, Body }
+
+    public void BuildUI() => Content (
+        Grid (
+            Rows (
+                (Row.Header, Auto),
+                (Row.Body  , Star)
+            ),
+
+            NavigationBar(
+                TextBlock("LiveCharts2"),
+                AppBarButton() .Icon("Images/forward") .Bind(vm?.ForwardCommand)
+            )  .Grid_Row(Row.Header),
+
+            CartesianChart(ZoomMode: LiveChartsCore.Measure.ZoomAndPanMode.X)
+               .Series().Bind(vm?.SeriesCollection)
+               .Grid_Row(Row.Body) .HVStretch()
+        )
+    ) .Background(Microsoft.UI.Colors.White);
+}

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/LiveCharts2Page.logic.cs

@@ -0,0 +1,7 @@
+namespace WinUICsMarkupExamples.Presentation.Example;
+
+[UIBindable]
+public sealed partial class LiveCharts2Page : BasePage<LiveCharts2ViewModel>, IBuildUI
+{
+    public LiveCharts2Page() => BuildUI();
+}

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/LiveCharts2ViewModel.cs

@@ -0,0 +1,28 @@
+using LiveChartsCore;
+using LiveChartsCore.SkiaSharpView;
+
+namespace WinUICsMarkupExamples.Presentation.Example;
+
+public partial class LiveCharts2ViewModel(INavigator navigator) : BaseViewModel
+{
+    public ISeries[] SeriesCollection { get; set; } = [
+        new LineSeries<int>(Fetch())
+    ];
+
+    static int[] Fetch()
+    {
+        var values = new int[100];
+        var r = new Random();
+        var t = 0;
+
+        for (var i = 0; i < 100; i++)
+        {
+            t += r.Next(-90, 100);
+            values[i] = t;
+        }
+
+        return values;
+    }
+
+    [RelayCommand] public async Task Forward() => await navigator.NavigateViewModelAsync<ScottPlotViewModel>(this);
+}

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/Routes.cs

@@ -8,6 +8,7 @@ public static void Register(IViewRegistry views, IRouteRegistry routes)
             new ViewMap(ViewModel: typeof(ShellViewModel)),
             new ViewMap<SearchPage, SearchViewModel>(),
             new ViewMap<FlutterPage, FlutterViewModel>(),
+            new ViewMap<LiveCharts2Page, LiveCharts2ViewModel>(),
             new ViewMap<ScottPlotPage, ScottPlotViewModel>()
         );
 
@@ -17,6 +18,7 @@ public static void Register(IViewRegistry views, IRouteRegistry routes)
                 {
                     new RouteMap("Search", View: views.FindByViewModel<SearchViewModel>(), IsDefault:true),
                     new RouteMap("Flutter", View: views.FindByViewModel<FlutterViewModel>()),
+                    new RouteMap("LiveCharts", View: views.FindByViewModel<LiveCharts2ViewModel>()),
                     new RouteMap("ScottPlot", View: views.FindByViewModel<ScottPlotViewModel>())
                 }
             )

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotPage.cs

@@ -1,3 +1,5 @@
+using static CSharpMarkup.WinUI.ScottPlot.Helpers;
+
 namespace WinUICsMarkupExamples.Presentation.Example;
 
 partial class ScottPlotPage

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/ScottPlotPage.logic.cs

@@ -7,7 +7,7 @@ public sealed partial class ScottPlotPage : BasePage<ScottPlotViewModel>, IBuild
 {
     public ScottPlotPage() => BuildUI();
 
-    void ExampleGraph(UIScottPlot.WinUIPlot winUIPlot)
+    void ExampleGraph(UISp.WinUIPlot winUIPlot)
     {
         var plot = winUIPlot.Plot;
         plot.Title("Example Graph");

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchViewModel.cs

@@ -113,7 +113,7 @@ public sealed partial class SearchViewModel(INavigator navigator) : BaseViewMode
 
     public static Uri LinkUri(string linkText) => new(linkText.StartsWith("#", StringComparison.Ordinal) ? TwitterSearchUri(linkText) : linkText);
 
-    [RelayCommand] public async Task Forward() => await navigator.NavigateViewModelAsync<ScottPlotViewModel>(this);
+    [RelayCommand] public async Task Forward() => await navigator.NavigateViewModelAsync<LiveCharts2ViewModel>(this);
     [RelayCommand] public async Task Search() => await LaunchUri(TwitterSearchUri(SearchText));
     [RelayCommand] public static void Like(Tweet tweet) => tweet.IsLikedByMe = !tweet.IsLikedByMe;
 

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/WinUICsMarkupExamples.Presentation.csproj

@@ -22,6 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="CSharpMarkup.WinUI" />
+    <PackageReference Include="CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView" />
     <PackageReference Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" />
     <PackageReference Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" />
     <PackageReference Include="CSharpMarkup.WinUI.Uno.Toolkit" />