Skip to content

Commit

Permalink
Merge pull request #1278 from beto-rodriguez/dev
Browse files Browse the repository at this point in the history
rc.1.2
  • Loading branch information
beto-rodriguez authored Sep 26, 2023
2 parents f26a3b3 + 64fdd8b commit b0e32c2
Show file tree
Hide file tree
Showing 21 changed files with 37 additions and 37 deletions.
6 changes: 3 additions & 3 deletions src/LiveChartsCore.Behaviours/ChartBehaviour.Android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected void OnAndroidHover(object? sender, View.HoverEventArgs e)
if (e.Event is null) return;

var p = new LvcPoint(e.Event.GetX() / Density, e.Event.GetY() / Density);
Moved!.Invoke(sender, new(p, e.Event));
Moved?.Invoke(sender, new(p, e.Event));
}

protected void OnAndroidTouched(object? sender, View.TouchEventArgs e)
Expand Down Expand Up @@ -115,9 +115,9 @@ private class CustomScaleListener : ScaleGestureDetector.SimpleOnScaleGestureLis
{
private readonly Action<float> _onScaled;

public CustomScaleListener(Action<float> onSacaled)
public CustomScaleListener(Action<float> onScaled)
{
_onScaled = onSacaled;
_onScaled = onScaled;
}

public bool Paused { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions src/LiveChartsCore.Behaviours/ChartBehaviour.MacCatalyst.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected UIHoverGestureRecognizer GetMacCatalystHover(UIView view)
{
case UIGestureRecognizerState.Changed:
var p = e.LocationInView(view);
Moved!.Invoke(view, new(new(p.X, p.Y), e));
Moved?.Invoke(view, new(new(p.X, p.Y), e));
break;
case UIGestureRecognizerState.Cancelled:
case UIGestureRecognizerState.Failed:
Expand Down Expand Up @@ -134,7 +134,7 @@ protected UIPanGestureRecognizer GetMacCatalystOnPan(UIView view)
_last ??= l;
var delta = _last.Value.Y - l.Y;
var isZoom = e.NumberOfTouches == 0;
var tolerance = 5; // just a fator to avoid multiple calls.
var tolerance = 5; // just a factor to avoid multiple calls.

if (e.State == UIGestureRecognizerState.Ended || !isZoom || Math.Abs(delta) < tolerance) return;
Scrolled?.Invoke(view, new(new(l.X, l.Y), delta, e));
Expand Down
8 changes: 4 additions & 4 deletions src/LiveChartsCore.Behaviours/ChartBehaviour.Windows.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected void OnWindowsPointerPressed(object sender, PointerRoutedEventArgs e)
var p = e.GetCurrentPoint(sender as UIElement);
if (p is null) return;

Pressed!.Invoke(
Pressed?.Invoke(
sender,
new(new(p.Position.X, p.Position.Y), p.Properties.IsRightButtonPressed, e));
}
Expand All @@ -47,7 +47,7 @@ protected void OnWindowsPointerMoved(object sender, PointerRoutedEventArgs e)
var p = e.GetCurrentPoint(sender as UIElement);
if (p is null) return;

Moved!.Invoke(
Moved?.Invoke(
sender,
new(new(p.Position.X, p.Position.Y), e));
}
Expand All @@ -57,15 +57,15 @@ protected void OnWindowsPointerReleased(object sender, PointerRoutedEventArgs e)
var p = e.GetCurrentPoint(sender as UIElement);
if (p is null) return;

Released!.Invoke(
Released?.Invoke(
sender,
new(new(p.Position.X, p.Position.Y), p.Properties.IsRightButtonPressed, e));
}

protected void OnWindowsPointerWheelChanged(object sender, PointerRoutedEventArgs e)
{
var p = e.GetCurrentPoint(sender as UIElement);
Scrolled!.Invoke(sender, new(new(p.Position.X, p.Position.Y), p.Properties.MouseWheelDelta, e));
Scrolled?.Invoke(sender, new(new(p.Position.X, p.Position.Y), p.Properties.MouseWheelDelta, e));
}

protected void OnWindowsPointerExited(object sender, PointerRoutedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<AssemblyName>LiveChartsCore.Behaviours</AssemblyName>
<RootNamespace>LiveChartsCore.Behaviours</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Adds user interaction for touch screens, touch pads and mouse.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion src/LiveChartsCore/LiveChartsCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<AssemblyName>LiveChartsCore</AssemblyName>
<RootNamespace>LiveChartsCore</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFrameworks>netcoreapp2.0;netstandard2.0;net462;net6.0</TargetFrameworks>
<AssemblyName>LiveChartsCore.SkiaSharpView.Avalonia</AssemblyName>
<RootNamespace>LiveChartsCore.SkiaSharpView.Avalonia</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for AvaloniaUI.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<AssemblyName>LiveChartsCore.SkiaSharpView.WPF</AssemblyName>
<RootNamespace>LiveChartsCore.SkiaSharpView.WPF</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for WPF.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<AssemblyName>LiveChartsCore.SkiaSharpView.WinForms</AssemblyName>
<RootNamespace>LiveChartsCore.SkiaSharpView.WinForms</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for WindowsForms.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AssemblyName>LiveChartsCore.SkiaSharpView.XamarinForms</AssemblyName>
<RootNamespace>LiveChartsCore.SkiaSharpView.XamarinForms</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for XamarinForms.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<AssemblyName>LiveChartsCore.SkiaSharpView</AssemblyName>
<RootNamespace>LiveChartsCore.SkiaSharpView</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for .Net, this package contains the SkiaSharp backend.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for Blazor.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>LiveChartsCore.SkiaSharpView.Eto</AssemblyName>
<RootNamespace>LiveChartsCore.SkiaSharpView.Eto</RootNamespace>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for Eto.Forms.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>

<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for Maui.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>LiveChartsCore.SkiaSharpView.Maui</id>
<version>2.0.0-rc1.1</version>
<version>2.0.0-rc1.2</version>
<title>LiveChartsCore.SkiaSharpView.Maui</title>
<authors>BetoRodriguez</authors>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -17,23 +17,23 @@
<dependencies>
<group targetFramework="net6.0">
<dependency id="SkiaSharp.Views.Maui.Controls.Compatibility" version="2.88.6" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.2" />
</group>
<group targetFramework="net6.0-ios13.6">
<dependency id="SkiaSharp.Views.Maui.Controls.Compatibility" version="2.88.6" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.2" />
</group>
<group targetFramework="net6.0-maccatalyst13.5">
<dependency id="SkiaSharp.Views.Maui.Controls.Compatibility" version="2.88.6" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.2" />
</group>
<group targetFramework="net6.0-android30.0">
<dependency id="SkiaSharp.Views.Maui.Controls.Compatibility" version="2.88.6" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.2" />
</group>
<group targetFramework="net6.0-windows10.0.18362">
<dependency id="SkiaSharp.Views.Maui.Controls.Compatibility" version="2.88.6" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.2" />
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<Nullable>enable</Nullable>
<LangVersion>11.0</LangVersion>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for Uno.WinUI.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected void OnAndroidHover(object? sender, View.HoverEventArgs e)
if (e.Event is null) return;

var p = new LvcPoint(e.Event.GetX() / Density, e.Event.GetY() / Density);
Moved!.Invoke(sender, new(p, e.Event));
Moved?.Invoke(sender, new(p, e.Event));
}

protected void OnAndroidTouched(object? sender, View.TouchEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected UIHoverGestureRecognizer GetMacCatalystHover(UIView view)
{
case UIGestureRecognizerState.Changed:
var p = e.LocationInView(view);
Moved!.Invoke(view, new(new(p.X, p.Y), e));
Moved?.Invoke(view, new(new(p.X, p.Y), e));
break;
case UIGestureRecognizerState.Cancelled:
case UIGestureRecognizerState.Failed:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected void OnWindowsPointerPressed(object sender, PointerRoutedEventArgs e)
var p = e.GetCurrentPoint(sender as UIElement);
if (p is null) return;

Pressed!.Invoke(
Pressed?.Invoke(
sender,
new(new(p.Position.X, p.Position.Y), p.Properties.IsRightButtonPressed, e));
}
Expand All @@ -47,7 +47,7 @@ protected void OnWindowsPointerMoved(object sender, PointerRoutedEventArgs e)
var p = e.GetCurrentPoint(sender as UIElement);
if (p is null) return;

Moved!.Invoke(
Moved?.Invoke(
sender,
new(new(p.Position.X, p.Position.Y), e));
}
Expand All @@ -57,15 +57,15 @@ protected void OnWindowsPointerReleased(object sender, PointerRoutedEventArgs e)
var p = e.GetCurrentPoint(sender as UIElement);
if (p is null) return;

Released!.Invoke(
Released?.Invoke(
sender,
new(new(p.Position.X, p.Position.Y), p.Properties.IsRightButtonPressed, e));
}

protected void OnWindowsPointerWheelChanged(object sender, PointerRoutedEventArgs e)
{
var p = e.GetCurrentPoint(sender as UIElement);
Scrolled!.Invoke(sender, new(new(p.Position.X, p.Position.Y), p.Properties.MouseWheelDelta, e));
Scrolled?.Invoke(sender, new(new(p.Position.X, p.Position.Y), p.Properties.MouseWheelDelta, e));
}

protected void OnWindowsPointerExited(object sender, PointerRoutedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<Nullable>enable</Nullable>
<LangVersion>11.0</LangVersion>
<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for Uno.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<UseWinUI>true</UseWinUI>

<Version>2.0.0-rc1.1</Version>
<Version>2.0.0-rc1.2</Version>
<PackageIcon>icon.png</PackageIcon>
<Description>Simple, flexible, interactive and powerful data visualization for WindowsAppSDK.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>LiveChartsCore.SkiaSharpView.WinUI</id>
<version>2.0.0-rc1.1</version>
<version>2.0.0-rc1.2</version>
<title>LiveChartsCore.SkiaSharpView.WinUI</title>
<authors>BetoRodriguez</authors>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand All @@ -18,8 +18,8 @@
<dependencies>
<group targetFramework="net6.0-windows10.0.19041">
<dependency id="SkiaSharp.Views.WinUI" version="2.88.6" />
<dependency id="LiveChartsCore" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.1" />
<dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
<dependency id="LiveChartsCore.SkiaSharpView" version="2.0.0-rc1.2" />
</group>
</dependencies>
</metadata>
Expand Down

0 comments on commit b0e32c2

Please sign in to comment.