Merge pull request #1131 from beto-rodriguez/dev

2.0.0-beta.860

samples/AvaloniaSample/App.axaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using LiveChartsCore; // mark
-using LiveChartsCore.Kernel;
+using LiveChartsCore.Kernel; // mark
 using LiveChartsCore.SkiaSharpView; // mark
 using SkiaSharp;
 
@@ -20,7 +20,7 @@ public override void Initialize()
                 // .AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/AvaloniaSample/GlobalSuppressions.cs

@@ -7,3 +7,4 @@
 
 [assembly: SuppressMessage("Style", "IDE0058:Expression value is never used", Justification = "<Pending>", Scope = "member", Target = "~M:AvaloniaSample.MainWindowViewModel.SetDark")]
 [assembly: SuppressMessage("Style", "IDE0073:The file header is missing or not located at the top of the file", Justification = "<Pending>")]
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/EtoFormsSample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/EtoFormsSample/Program.cs

@@ -2,7 +2,7 @@
 using System;
 using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; //mark
-using SkiaSharp;
+using SkiaSharp; // mark
 
 namespace EtoFormsSample;
 
@@ -21,7 +21,7 @@ static void Main()
                 .AddLightTheme() // mark
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/MauiSample/App.xaml.cs

@@ -1,6 +1,6 @@
 using LiveChartsCore;
-using LiveChartsCore.SkiaSharpView;
-using SkiaSharp;
+using LiveChartsCore.SkiaSharpView; // mark
+using SkiaSharp; // mark
 
 namespace MauiSample;
 
@@ -24,7 +24,7 @@ protected override void OnStart()
                 //.AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/MauiSample/Axes/CustomSeparatorsInterval/View.xaml

@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage x:Class="MauiSample.Axes.Multiple.View"
+<ContentPage x:Class="MauiSample.Axes.CustomSeparatorsInterval.View"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.Maui;assembly=LiveChartsCore.SkiaSharpView.Maui"
-             xmlns:vms="clr-namespace:ViewModelsSamples.Axes.Multiple;assembly=ViewModelsSamples"
+             xmlns:vms="clr-namespace:ViewModelsSamples.Axes.CustomSeparatorsInterval;assembly=ViewModelsSamples"
              >
     <ContentPage.BindingContext>
         <vms:ViewModel/>
     </ContentPage.BindingContext>
     <lvc:CartesianChart
         Series="{Binding Series}"
-        YAxes="{Binding YAxes}"
-        LegendPosition="Bottom"
-        LegendBackgroundPaint="{Binding LegendTextPaint}"
-        LegendTextPaint="{Binding LegendTextPaint}"
-        LegendTextSize="16">
+        YAxes="{Binding YAxes}">
     </lvc:CartesianChart>
 </ContentPage>

samples/MauiSample/Axes/CustomSeparatorsInterval/View.xaml.cs

@@ -1,4 +1,4 @@
-namespace MauiSample.Axes.Multiple;
+namespace MauiSample.Axes.CustomSeparatorsInterval;
 
 [XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class View : ContentPage

samples/MauiSample/Axes/Multiple/View.xaml

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage x:Class="MauiSample.Axes.CustomSeparatorsInterval.View"
+<ContentPage x:Class="MauiSample.Axes.Multiple.View"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.Maui;assembly=LiveChartsCore.SkiaSharpView.Maui"
-             xmlns:vms="clr-namespace:ViewModelsSamples.Axes.CustomSeparatorsInterval;assembly=ViewModelsSamples"
+             xmlns:vms="clr-namespace:ViewModelsSamples.Axes.Multiple;assembly=ViewModelsSamples"
              >
     <ContentPage.BindingContext>
         <vms:ViewModel/>
     </ContentPage.BindingContext>
     <lvc:CartesianChart
         Series="{Binding Series}"
-        YAxes="{Binding YAxes}">
+        YAxes="{Binding YAxes}"
+        LegendPosition="Bottom"
+        LegendBackgroundPaint="{Binding LegendTextPaint}"
+        LegendTextPaint="{Binding LegendTextPaint}"
+        LegendTextSize="16">
     </lvc:CartesianChart>
 </ContentPage>

samples/MauiSample/Axes/Multiple/View.xaml.cs

@@ -1,4 +1,4 @@
-namespace MauiSample.Axes.CustomSeparatorsInterval;
+namespace MauiSample.Axes.Multiple;
 
 [XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class View : ContentPage

samples/MauiSample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/UnoPlatformSample/UnoPlatformSample/App.cs

@@ -22,7 +22,7 @@
 
 using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; // mark
-using SkiaSharp;
+using SkiaSharp; // mark
 
 namespace UnoPlatformSample;
 
@@ -41,7 +41,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
                 // .AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/UnoPlatformSample/UnoPlatformSample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/ViewModelsSamples/Axes/LabelsFormat2/ViewModel.cs

@@ -1,16 +1,4 @@
-// You must register any non-Latin based font //mark
-// you can add this code when the app starts to register Chinese characters: // mark
-
-// LiveCharts.Configure(c =>
-//     c.AddSkiaSharp()
-//      .AddDefaultMappers()
-//      .AddLightTheme()
-//      .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')));
-
-// You can learn more about extra settings at: // mark
-// https://localhost:7053/docs/{{ platform }}/{{ version }}/Overview.Installation#configure-themes-fonts-or-mappers-optional // mark
-
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using LiveChartsCore;
 using LiveChartsCore.SkiaSharpView;
 using LiveChartsCore.SkiaSharpView.Painting;
@@ -20,6 +8,18 @@ namespace ViewModelsSamples.Axes.LabelsFormat2;
 
 public partial class ViewModel : ObservableObject
 {
+    public ViewModel()
+    {
+        // You must register any non-Latin based font //mark
+        // you can add this code when the app starts to register Chinese characters: // mark
+
+        LiveCharts.Configure(config =>
+            config.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')));
+
+        // You can learn more about extra settings at: // mark
+        // https://localhost:7053/docs/{{ platform }}/{{ version }}/Overview.Installation#configure-themes-fonts-or-mappers-optional // mark
+    }
+
     public ISeries[] Series { get; set; } =
     {
         new ColumnSeries<double> { Values = new double[] { 426, 583, 104 } },

samples/WPFSample/App.xaml.cs

@@ -1,7 +1,7 @@
 using System.Windows;
 using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; // mark
-using SkiaSharp;
+using SkiaSharp; // mark
 
 namespace WPFSample;
 
@@ -20,7 +20,7 @@ protected override void OnStartup(StartupEventArgs e)
                 // .AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/WPFSample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/WinFormsSample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/WinFormsSample/Program.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; // mark
-using SkiaSharp;
+using SkiaSharp; // mark
 
 namespace WinFormsSample;
 
@@ -20,7 +20,7 @@ static void Main()
                // .AddDarkTheme() // mark 
 
                // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-               .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+               //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/WinUISample/WinUISample/App.xaml.cs

@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; // mark
-using SkiaSharp;
+using SkiaSharp; // mark
 
 namespace WinUISample;
 
@@ -37,7 +37,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
                 // .AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/WinUISample/WinUISample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

samples/XamarinSample/XamarinSample/XamarinSample/App.xaml.cs

@@ -1,8 +1,7 @@
 using Xamarin.Forms;
 using LiveChartsCore; // mark
 using LiveChartsCore.SkiaSharpView; // mark
-using SkiaSharp;
-using System.Drawing;
+using SkiaSharp; // mark
 
 namespace XamarinSample;
 
@@ -23,7 +22,7 @@ protected override void OnStart()
                 // .AddDarkTheme() // mark 
 
                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                .HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
+                //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')) // <- Chinese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
                 //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark

samples/XamarinSample/XamarinSample/XamarinSample/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0005:Using directive is unnecessary.", Justification = "<Pending>")]

src/LiveChartsCore/Axis.cs

@@ -67,7 +67,7 @@ public abstract class Axis<TDrawingContext, TTextGeometry, TLineGeometry>
     private TTextGeometry? _nameGeometry;
     private AxisPosition _position = AxisPosition.Start;
     private Func<double, string> _labeler = Labelers.Default;
-    private Padding _padding = Padding.Default;
+    private Padding _padding = new();
     private double? _minLimit = null;
     private double? _maxLimit = null;
     private IPaint<TDrawingContext>? _namePaint;

src/LiveChartsCore/Drawing/Padding.cs

@@ -76,11 +76,6 @@ public Padding(double left, double top, double right, double bottom)
         Bottom = (float)bottom;
     }
 
-    /// <summary>
-    /// The default padding.
-    /// </summary>
-    public static Padding Default = new();
-
     /// <summary>
     /// Gets or sets the left.
     /// </summary>

src/LiveChartsCore/LiveChartsCore.csproj

@@ -17,7 +17,7 @@
 
     <AssemblyName>LiveChartsCore</AssemblyName>
     <RootNamespace>LiveChartsCore</RootNamespace>
-    <Version>2.0.0-beta.855</Version>
+    <Version>2.0.0-beta.860</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Description>Simple, flexible, interactive and powerful data visualization for .Net, this is the core package probably you need another package also unless you are building your own backed.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj

@@ -6,7 +6,7 @@
     <TargetFrameworks>netcoreapp2.0;netstandard2.0;net462;</TargetFrameworks>
     <AssemblyName>LiveChartsCore.SkiaSharpView.Avalonia</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.Avalonia</RootNamespace>
-    <Version>2.0.0-beta.855</Version>
+    <Version>2.0.0-beta.860</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Description>Simple, flexible, interactive and powerful data visualization for AvaloniaUI.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj

@@ -7,7 +7,7 @@
     <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>LiveChartsCore.SkiaSharpView.WPF</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.WPF</RootNamespace>
-    <Version>2.0.0-beta.855</Version>
+    <Version>2.0.0-beta.860</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Description>Simple, flexible, interactive and powerful data visualization for WPF.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj

@@ -9,7 +9,7 @@
     <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>LiveChartsCore.SkiaSharpView.WinForms</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.WinForms</RootNamespace>
-    <Version>2.0.0-beta.855</Version>
+    <Version>2.0.0-beta.860</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Description>Simple, flexible, interactive and powerful data visualization for WindowsForms.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj

@@ -6,7 +6,7 @@
     <TargetFrameworks>netstandard2.0;</TargetFrameworks>
     <AssemblyName>LiveChartsCore.SkiaSharpView.XamarinForms</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.XamarinForms</RootNamespace>
-    <Version>2.0.0-beta.855</Version>
+    <Version>2.0.0-beta.860</Version>
     <PackageIcon>icon.png</PackageIcon>
     <Description>Simple, flexible, interactive and powerful data visualization for XamarinForms.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

src/skiasharp/LiveChartsCore.SkiaSharp/Drawing/Geometries/CandlestickGeometry.cs

@@ -23,7 +23,6 @@
 using System;
 using LiveChartsCore.Drawing;
 using LiveChartsCore.Motion;
-using LiveChartsCore.SkiaSharpView.Painting;
 using SkiaSharp;
 
 namespace LiveChartsCore.SkiaSharpView.Drawing.Geometries;
@@ -89,8 +88,8 @@ public override void OnDraw(SkiaSharpDrawingContext context, SKPaint paint)
         context.Canvas.DrawLine(cx, yj, cx, l, paint);
     }
 
-    /// <inheritdoc cref="Geometry.OnMeasure(Paint)" />
-    protected override LvcSize OnMeasure(Paint paintTasks)
+    /// <inheritdoc cref="Geometry.OnMeasure(IPaint{SkiaSharpDrawingContext})" />
+    protected override LvcSize OnMeasure(IPaint<SkiaSharpDrawingContext> paintTasks)
     {
         return new LvcSize(Width, Math.Abs(Low - Y));
     }