diff --git a/.github/workflows/CI-Maui.yml b/.github/workflows/CI-Maui.yml new file mode 100644 index 00000000..fdff10f0 --- /dev/null +++ b/.github/workflows/CI-Maui.yml @@ -0,0 +1,58 @@ +name: Publish Microcharts NuGet packages to GitHub + +on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + Maui-nuget-Builds: + + runs-on: windows-latest + + steps: + + - name: Clone source + uses: actions/checkout@v4.0.0 + with: + fetch-depth: 0 + + - name: Install .NET SDK + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 10.0.x + source-url: https://nuget.pkg.github.com/follesoe/index.json + env: + NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: Install .NET MAUI Workloads + run: | + dotnet workload install android + dotnet workload install ios + dotnet workload install maccatalyst + dotnet workload install maui + dotnet workload list + + - name: Build and pack Microcharts.Core + run: | + dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts\Microcharts.csproj + + - name: Build and pack Microcharts.Maui + run: | + dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.Maui\Microcharts.Maui.csproj + + - name: Build and pack Microcharts.iOS + run: | + dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.iOS\Microcharts.iOS.csproj + + - name: Build and pack Microcharts.Droid + run: | + dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.Droid\Microcharts.Droid.csproj + + - name: Build and pack Microcharts.Metapackage + run: | + dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.Metapackage\Microcharts.Metapackage.csproj + + - name: Publish packages to GitHub + run: | + dotnet nuget add source --username follesoe --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/follesoe/index.json" + dotnet nuget push artifacts\*.nupkg --skip-duplicate --no-symbols --source "github" \ No newline at end of file diff --git a/.github/workflows/CI-Windows.yml b/.github/workflows/CI-Windows.yml index 407ad008..0762fd1d 100644 --- a/.github/workflows/CI-Windows.yml +++ b/.github/workflows/CI-Windows.yml @@ -13,21 +13,17 @@ jobs: runs-on: windows-latest steps: - name: Clone source - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Add MSBuild to PATH (Windows) - uses: microsoft/setup-msbuild@v1.1.3 - - name: Install .NET SDK - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 10.0.x - - name: "Install .NET cross-plat and MAUI workloads" + - name: "Install .NET workloads" run: | dotnet workload install android dotnet workload install ios @@ -35,51 +31,23 @@ jobs: dotnet workload install maui dotnet workload list - - name: "Restore NuGet packages (Windows)" - run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /bl:win-restore-build.binlog - - - name: "Publish restore bin logs as artifacts" - uses: actions/upload-artifact@v3 - with: - name: msbuild-binlogs - path: '**/*.binlog' - if: always() - - - name: "Build and pack Microcharts" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts/Microcharts.csproj - - - name: "Build and pack Microcharts Android" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Droid/Microcharts.Droid.csproj - - - name: "Build and pack Microcharts Xamarin.Forms" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Forms/Microcharts.Forms.csproj - - - name: "Build and pack Microcharts iOS" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.iOS/Microcharts.iOS.csproj - - - name: "Build and pack Microcharts UWP" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uwp/Microcharts.Uwp.csproj - - - name: "Build and pack Microcharts Avalonia" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj - - - name: "Build and pack Microcharts Eto" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Eto/Microcharts.Eto.csproj + - name: "Restore and build solution" + run: dotnet build Sources/Microcharts.Maui.sln --configuration Release - - name: "Build and pack Microcharts .NET MAUI" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Maui/Microcharts.Maui.csproj + - name: "Pack Microcharts Core" + run: dotnet pack Sources/Microcharts/Microcharts.csproj --configuration Release --no-build - - name: "Build and pack Microcharts Uno" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno/Microcharts.Uno.csproj + - name: "Pack Microcharts Droid" + run: dotnet pack Sources/Microcharts.Droid/Microcharts.Droid.csproj --configuration Release --no-build - - name: "Build and pack Microcharts Uno WinUI" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj + - name: "Pack Microcharts iOS" + run: dotnet pack Sources/Microcharts.iOS/Microcharts.iOS.csproj --configuration Release --no-build - - name: "Build and pack Microcharts WinUI" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.WinUI/Microcharts.WinUI.csproj + - name: "Pack Microcharts MAUI" + run: dotnet pack Sources/Microcharts.Maui/Microcharts.Maui.csproj --configuration Release --no-build - - name: "Build and pack Microcharts Meta-package" - run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj + - name: "Pack Microcharts Meta-package" + run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj --configuration Release - name: Publish packages to nuget.org run: | diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 6c855d6b..9ded0d51 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -12,25 +12,20 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, macos-latest] + os: [windows-latest, macos-26] steps: - name: Clone source - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Add MSBuild to PATH (Windows) - uses: microsoft/setup-msbuild@v1.1.3 - if: matrix.os == 'windows-latest' - - name: Install .NET SDK - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 10.0.x - - name: "Install .NET cross-plat and MAUI workloads" + - name: "Install .NET workloads" run: | dotnet workload install android dotnet workload install ios @@ -38,64 +33,26 @@ jobs: dotnet workload install maui dotnet workload list - - name: "Restore NuGet packages (Windows)" - run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /bl:win-restore-build.binlog - if: matrix.os == 'windows-latest' - - - name: "Restore NuGet packages (Mac)" - run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts-mac.slnf /bl:mac-restore-build.binlog - if: matrix.os == 'macos-latest' - - - name: "Publish bin logs as artifacts" - uses: actions/upload-artifact@v3 + - name: Select Xcode + if: matrix.os == 'macos-26' + uses: maxim-lobanov/setup-xcode@v1 with: - name: msbuild-binlogs - path: '**/*.binlog' - if: always() - - - name: "Build and pack Microcharts" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts/Microcharts.csproj - - - name: "Build and pack Microcharts Android" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Droid/Microcharts.Droid.csproj - - - name: "Build and pack Microcharts Xamarin.Forms" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Forms/Microcharts.Forms.csproj - - - name: "Build and pack Microcharts iOS" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.iOS/Microcharts.iOS.csproj - - - name: "Build and pack Microcharts macOS" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.macOS/Microcharts.macOS.csproj - if: matrix.os == 'macos-latest' - - - name: "Build and pack Microcharts UWP" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uwp/Microcharts.Uwp.csproj - if: matrix.os == 'windows-latest' - - - name: "Build and pack Microcharts Avalonia" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj - if: matrix.os == 'windows-latest' + xcode-version: '26.3' - - name: "Build and pack Microcharts Eto" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Eto/Microcharts.Eto.csproj - if: matrix.os == 'windows-latest' + - name: "Build solution" + run: dotnet build Sources/Microcharts.Maui.sln --configuration Release - - name: "Build and pack Microcharts .NET MAUI" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Maui/Microcharts.Maui.csproj - if: matrix.os == 'windows-latest' + - name: "Pack Microcharts Core" + run: dotnet pack Sources/Microcharts/Microcharts.csproj --configuration Release --no-build - - name: "Build and pack Microcharts Uno" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno/Microcharts.Uno.csproj - if: matrix.os == 'windows-latest' + - name: "Pack Microcharts Droid" + run: dotnet pack Sources/Microcharts.Droid/Microcharts.Droid.csproj --configuration Release --no-build - - name: "Build and pack Microcharts Uno WinUI" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj - if: matrix.os == 'windows-latest' + - name: "Pack Microcharts iOS" + run: dotnet pack Sources/Microcharts.iOS/Microcharts.iOS.csproj --configuration Release --no-build - - name: "Build and pack Microcharts WinUI" - run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.WinUI/Microcharts.WinUI.csproj - if: matrix.os == 'windows-latest' + - name: "Pack Microcharts MAUI" + run: dotnet pack Sources/Microcharts.Maui/Microcharts.Maui.csproj --configuration Release --no-build - - name: "Build and pack Microcharts Meta-package" - run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj + - name: "Pack Microcharts Meta-package" + run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj --configuration Release diff --git a/.gitignore b/.gitignore index f54bc178..9a137ac3 100644 --- a/.gitignore +++ b/.gitignore @@ -99,7 +99,6 @@ paket-files/ # this file can be merge conflict hell, never commit these. Sources/Microcharts.Droid/Resources/Resource.designer.cs Sources/Microcharts.Samples.Droid/Resources/Resource.designer.cs -Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/Resource.designer.cs /Sources/.vsconfig /Sources/NuGet.config /Sources/Microcharts.Samples.Android/Resources/Resource.designer.cs diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 517c2562..3b211f26 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,8 @@ + ### I wish to help, what's the basics to what I need to know? -first and foremost, thank you for your help and interest. +First and foremost, thank you for your help and interest! -master currently has 1.0 code so it's best to put new things in there unless it's a fix for the 0.9 codebase which then you develop off the develop branch. +Master currently has 1.0 code so it's best to put new things in there unless it's a fix for the 0.9 codebase which then you develop off the develop branch. -if you're adding a new framework (MAUI, UWP), please ensure you'll be around to actively support it, please no web frameworks as the library is largely used by the mobile & desktop community of the .NET family. +If you're adding a new framework (Avalonian, Uno), please ensure you'll be around to actively support it. Please no web frameworks as the library is largely used by the mobile & desktop community of the .NET family. diff --git a/README.md b/README.md index 0c19c206..9212cf31 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ [![Mac Builds](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-MacOS.yml/badge.svg)](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-MacOS.yml) [![Windows Builds](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-Windows.yml/badge.svg)](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-Windows.yml) -[Looking for more contributors](https://github.com/microcharts-dotnet/Microcharts/discussions/274) - ## Version 1.0.0 Beta is now available [![NuGet](https://img.shields.io/nuget/vpre/Microcharts.Forms.svg?label=Microcharts.Forms)](https://www.nuget.org/packages/Microcharts.Forms/) @@ -24,7 +22,7 @@ read our [wiki](https://github.com/dotnet-ad/Microcharts/wiki) to learn more abo ## About -This project is just simple drawing on top of the awesome [SkiaSharp](https://github.com/mono/SkiaSharp) library. The purpose is not to have an heavily customizable charting library. If you want so, simply fork the code, since all of this is fairly simple. Their is no interaction, nor animation at the moment. +This project is just simple drawing on top of the awesome [SkiaSharp](https://github.com/mono/SkiaSharp) library. The purpose is not to have an heavily customizable charting library. If you want so, simply fork the code, since all of this is fairly simple. ## Contributions @@ -44,21 +42,15 @@ More info on how you can help can be found [here](https://github.com/dotnet-ad/M Available on NuGet -**NET Standard 2.0, Xamarin.iOS, Xamarin.Android, UWP** - -[![NuGet](https://img.shields.io/nuget/v/Microcharts.svg?label=NuGet)](https://www.nuget.org/packages/Microcharts/) - - -**Xamarin.Forms (.NET Standard 2.0)** - -[![NuGet](https://img.shields.io/nuget/v/Microcharts.Forms.svg?label=NuGet)](https://www.nuget.org/packages/Microcharts.Forms/) +* [Microcharts](https://www.nuget.org/packages/Microcharts/) +* [Microcharts.Core](https://www.nuget.org/packages/Microcharts.Core/) +* [Microcharts.Maui](https://www.nuget.org/packages/Microcharts.Maui/) +* [Microcharts.iOS](https://www.nuget.org/packages/Microcharts.iOS/) +* [Microcharts.Android](https://www.nuget.org/packages/Microcharts.Droid/) **.NET MAUI** -Not yet available through NuGet. - -> [!IMPORTANT] -> Don't forget to call `UseMicrocharts()` on `MauiAppBuilder` in the `MauiProgram` class. +Don't forget to call `UseMicrocharts()` on `MauiAppBuilder` in the `MauiProgram` class. ## Tutorials @@ -68,12 +60,9 @@ Not yet available through NuGet. Built in views are provided for: -* **UWP** -* **Xamarin.Forms**, **Xamarin.iOS** and **Xamarin.Android**, **Xamarin.macOS** -* **.NET MAUI** (Windows, Android, iOS, and macOS) -* **WinUI** (Windows App SDK) -* And any other **.NET Standard 2.0** [SkiaSharp](https://github.com/mono/SkiaSharp) supported platform is also compatible (see one of the included `ChartView` implementations for more details). +* .NET 9.0 (on all platforms) +* MAUI (Windows, Android, iOS, and macOS Catalyst) ## License -MIT © [Aloïs Deniel](https://aloisdeniel.com) & [Ed Lomonaco](https://edlomonaco.dev) +MIT © [Aloïs Deniel](https://aloisdeniel.com), [Ed Lomonaco](https://edlomonaco.dev) & [Jonas Follesø](https://github.com/follesoe) diff --git a/Sources/.editorconfig b/Sources/.editorconfig index 9c4d084c..a7836eaf 100644 --- a/Sources/.editorconfig +++ b/Sources/.editorconfig @@ -9,4 +9,7 @@ trim_trailing_whitespace=true insert_final_newline=true [*.json] +indent_size = 2 + +[*.csproj] indent_size = 2 \ No newline at end of file diff --git a/Sources/Directory.Build.props b/Sources/Directory.Build.props index 0824698c..bc4c5c9c 100644 --- a/Sources/Directory.Build.props +++ b/Sources/Directory.Build.props @@ -6,7 +6,7 @@ - 1.0.1 + 2.0.0 @@ -21,6 +21,7 @@ MIT Microcharts Team + Microcharts Team en https://github.com/microcharts-dotnet/Microcharts.git https://github.com/microcharts-dotnet/Microcharts @@ -29,8 +30,13 @@ $(VersionMain)$(VersionPrelease) $(MSBuildThisFileDirectory)..\artifacts $(MSBuildThisFileDirectory)..\LICENSE + Icon.png + + + + Parent.Bounds.Contains(p); - public bool Equals(ICustomDrawOperation other) => this == other; - - public void Render(ImmediateDrawingContext context) - { - if (context.TryGetFeature() is { } leaseFeature) - { - using var lease = leaseFeature.Lease(); - var canvas = lease.SkCanvas; - canvas.Save(); - Parent.Chart?.Draw(canvas, (int)Bounds.Width, (int)Bounds.Height); - canvas.Restore(); - } - } - - public Rect Bounds => Parent.Bounds; - } -} diff --git a/Sources/Microcharts.Avalonia/ChartView.cs b/Sources/Microcharts.Avalonia/ChartView.cs deleted file mode 100644 index ce8f6853..00000000 --- a/Sources/Microcharts.Avalonia/ChartView.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Media; - -namespace Microcharts.Avalonia -{ - public class ChartView : Control - { - public ChartView() - { - drawOperation = new ChartDrawOperation(this); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - if (change.Property == ChartProperty) - { - InvalidateVisual(); - } - } - - readonly ChartDrawOperation drawOperation; - Chart? chart; - - public Chart? Chart - { - get => chart; - set => SetAndRaise(ChartProperty, ref chart, value); - } - - public static readonly DirectProperty ChartProperty = - AvaloniaProperty.RegisterDirect( - nameof(Chart), - c => c.Chart, - (c, v) => c.Chart = v); - - public override void Render(DrawingContext context) - { - context.Custom(drawOperation); - } - } -} diff --git a/Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj b/Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj deleted file mode 100644 index 611f8a0b..00000000 --- a/Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - netstandard2.0 - enable - 9 - - Simple, cross-platform chart library for Avalonia. - avalonia chart skia - - - - - - - - - - - - diff --git a/Sources/Microcharts.Droid/Microcharts.Droid.csproj b/Sources/Microcharts.Droid/Microcharts.Droid.csproj index d0d45166..90b24599 100644 --- a/Sources/Microcharts.Droid/Microcharts.Droid.csproj +++ b/Sources/Microcharts.Droid/Microcharts.Droid.csproj @@ -1,71 +1,26 @@ - - + - Debug - AnyCPU - {18125022-45E6-46EC-855C-B36E4D41484D} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library + net10.0-android + disable + true + true Microcharts.Droid Microcharts.Droid - v10.0 - Resources\Resource.designer.cs - Resource - Resources - Assets - Simple, cross-platform chart library for Xamarin.Android. - xamarin android chart skia + Simple, cross-platform chart library for dotnet Android. + maui anroid chart skia - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - None - - - false - none - true - bin\Release - prompt - 3 - true - false - - - - - - - - - - - - - - - - - - + 6.5.0 runtime; build; native; contentfiles; analyzers; buildtransitive all - - - {D07D3E94-E645-4035-A142-5F933A15D585} - Microcharts - + - - + + + + \ No newline at end of file diff --git a/Sources/Microcharts.Droid/Properties/AssemblyInfo.cs b/Sources/Microcharts.Droid/Properties/AssemblyInfo.cs deleted file mode 100644 index 5b10430a..00000000 --- a/Sources/Microcharts.Droid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Microcharts.Droid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("${AuthorCopyright}")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Sources/Microcharts.Eto/ChartView.cs b/Sources/Microcharts.Eto/ChartView.cs deleted file mode 100644 index b0b1b68f..00000000 --- a/Sources/Microcharts.Eto/ChartView.cs +++ /dev/null @@ -1,29 +0,0 @@ - -namespace Microcharts.Eto -{ - using global::Eto.SkiaDraw; - public class ChartView : SkiaDrawable - { - Chart? _chart; - public ChartView() - { - } - - public Chart? Chart - { - get => _chart; - set - { - _chart = value; - this.Invalidate(); - } - } - protected override void OnPaint(SKPaintEventArgs e) - { - if (_chart != null) - _chart.Draw(e.Surface.Canvas, Width, Height); - else - e.Surface.Canvas.Clear(); - } - } -} diff --git a/Sources/Microcharts.Eto/Microcharts.Eto.csproj b/Sources/Microcharts.Eto/Microcharts.Eto.csproj deleted file mode 100644 index 49155fdf..00000000 --- a/Sources/Microcharts.Eto/Microcharts.Eto.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netstandard2.0 - latest - enable - - Simple, cross-platform chart library for Eto. - eto chart skia - - - - - - - - - - - diff --git a/Sources/Microcharts.Forms/ChartView.cs b/Sources/Microcharts.Forms/ChartView.cs deleted file mode 100644 index e21098e5..00000000 --- a/Sources/Microcharts.Forms/ChartView.cs +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) Aloïs DENIEL. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -namespace Microcharts.Forms -{ - using Xamarin.Forms; - using SkiaSharp.Views.Forms; - using SkiaSharp; - using System; - - public class ChartView : SKCanvasView - { - #region Constructors - - public ChartView() - { - this.BackgroundColor = Color.Transparent; - this.PaintSurface += OnPaintCanvas; - } - - public event EventHandler ChartPainted; - - #endregion - - #region Static fields - - public static readonly BindableProperty ChartProperty = BindableProperty.Create(nameof(Chart), typeof(Chart), typeof(ChartView), null, propertyChanged: OnChartChanged); - - #endregion - - #region Fields - - private InvalidatedWeakEventHandler handler; - - private Chart chart; - - #endregion - - #region Properties - - public Chart Chart - { - get { return (Chart)GetValue(ChartProperty); } - set { SetValue(ChartProperty, value); } - } - - #endregion - - #region Methods - - private static void OnChartChanged(BindableObject d, object oldValue, object value) - { - var view = d as ChartView; - - if (view.chart != null) - { - view.handler.Dispose(); - view.handler = null; - } - - view.chart = value as Chart; - view.InvalidateSurface(); - - if (view.chart != null) - { - view.handler = view.chart.ObserveInvalidate(view, (v) => v.InvalidateSurface()); - } - } - - private void OnPaintCanvas(object sender, SKPaintSurfaceEventArgs e) - { - if (this.chart != null) - { - this.chart.Draw(e.Surface.Canvas, e.Info.Width, e.Info.Height); - } - else - { - e.Surface.Canvas.Clear(SKColors.Transparent); - } - - ChartPainted?.Invoke(sender, e); - } - - #endregion - } -} diff --git a/Sources/Microcharts.Forms/Microcharts.Forms.csproj b/Sources/Microcharts.Forms/Microcharts.Forms.csproj deleted file mode 100644 index ea7f225e..00000000 --- a/Sources/Microcharts.Forms/Microcharts.Forms.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - netstandard2.0 - latest - Simple, cross-platform chart library for Xamarin.Forms. - xamarin ios android chart skia Forms - - - - full - - - - none - 3 - - - - - - - - - - diff --git a/Sources/Microcharts.Maui.sln b/Sources/Microcharts.Maui.sln new file mode 100644 index 00000000..ab95760d --- /dev/null +++ b/Sources/Microcharts.Maui.sln @@ -0,0 +1,69 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35323.107 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts", "Microcharts\Microcharts.csproj", "{D0547D7F-A592-4FD6-91F6-90D328E2AA05}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Maui", "Microcharts.Maui\Microcharts.Maui.csproj", "{096EC994-36F1-4D94-AAD2-8F71EBF71EA7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.Maui", "Microcharts.Samples.Maui\Microcharts.Samples.Maui.csproj", "{0759549D-1389-4897-80BC-86A036DA6CB2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples", "Microcharts.Samples\Microcharts.Samples.csproj", "{2141A78D-A0BC-4EEF-BB0D-8AABAD9FCFE4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.iOS", "Microcharts.iOS\Microcharts.iOS.csproj", "{77AFDC26-5996-4E66-8785-3CC8DBB47DDD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.iOS", "Microcharts.Samples.iOS\Microcharts.Samples.iOS.csproj", "{E8626BE1-E233-4F4A-9084-673A987B9231}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Droid", "Microcharts.Droid\Microcharts.Droid.csproj", "{90610D02-4BD9-4B73-9F66-03F9F5FCDD28}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.Android", "Microcharts.Samples.Android\Microcharts.Samples.Android.csproj", "{887811AC-20D3-4315-BC0B-815EE557FC08}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0547D7F-A592-4FD6-91F6-90D328E2AA05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0547D7F-A592-4FD6-91F6-90D328E2AA05}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0547D7F-A592-4FD6-91F6-90D328E2AA05}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0547D7F-A592-4FD6-91F6-90D328E2AA05}.Release|Any CPU.Build.0 = Release|Any CPU + {096EC994-36F1-4D94-AAD2-8F71EBF71EA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {096EC994-36F1-4D94-AAD2-8F71EBF71EA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {096EC994-36F1-4D94-AAD2-8F71EBF71EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {096EC994-36F1-4D94-AAD2-8F71EBF71EA7}.Release|Any CPU.Build.0 = Release|Any CPU + {0759549D-1389-4897-80BC-86A036DA6CB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0759549D-1389-4897-80BC-86A036DA6CB2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0759549D-1389-4897-80BC-86A036DA6CB2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {0759549D-1389-4897-80BC-86A036DA6CB2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0759549D-1389-4897-80BC-86A036DA6CB2}.Release|Any CPU.Build.0 = Release|Any CPU + {0759549D-1389-4897-80BC-86A036DA6CB2}.Release|Any CPU.Deploy.0 = Release|Any CPU + {2141A78D-A0BC-4EEF-BB0D-8AABAD9FCFE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2141A78D-A0BC-4EEF-BB0D-8AABAD9FCFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2141A78D-A0BC-4EEF-BB0D-8AABAD9FCFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2141A78D-A0BC-4EEF-BB0D-8AABAD9FCFE4}.Release|Any CPU.Build.0 = Release|Any CPU + {77AFDC26-5996-4E66-8785-3CC8DBB47DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77AFDC26-5996-4E66-8785-3CC8DBB47DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77AFDC26-5996-4E66-8785-3CC8DBB47DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {77AFDC26-5996-4E66-8785-3CC8DBB47DDD}.Release|Any CPU.Build.0 = Release|Any CPU + {E8626BE1-E233-4F4A-9084-673A987B9231}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator + {E8626BE1-E233-4F4A-9084-673A987B9231}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator + {E8626BE1-E233-4F4A-9084-673A987B9231}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator + {E8626BE1-E233-4F4A-9084-673A987B9231}.Release|Any CPU.Build.0 = Release|iPhoneSimulator + {90610D02-4BD9-4B73-9F66-03F9F5FCDD28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90610D02-4BD9-4B73-9F66-03F9F5FCDD28}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90610D02-4BD9-4B73-9F66-03F9F5FCDD28}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90610D02-4BD9-4B73-9F66-03F9F5FCDD28}.Release|Any CPU.Build.0 = Release|Any CPU + {887811AC-20D3-4315-BC0B-815EE557FC08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {887811AC-20D3-4315-BC0B-815EE557FC08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {887811AC-20D3-4315-BC0B-815EE557FC08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {887811AC-20D3-4315-BC0B-815EE557FC08}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0CF869A5-8461-4A12-A01C-16AD16276352} + EndGlobalSection +EndGlobal diff --git a/Sources/Microcharts.Maui/Microcharts.Maui.csproj b/Sources/Microcharts.Maui/Microcharts.Maui.csproj index 7e26e613..0b42fcca 100644 --- a/Sources/Microcharts.Maui/Microcharts.Maui.csproj +++ b/Sources/Microcharts.Maui/Microcharts.Maui.csproj @@ -1,23 +1,21 @@ - - - - net7.0-ios;net7.0-android;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041 - 10.0.17763.0 - net7.0-windows - true - - Simple, cross-platform chart library for .NET MAUI. - maui dotnet chart skia skiasharp - - - - - - - - - - + + + net10.0;net10.0-ios;net10.0-maccatalyst;net10.0-android + Library + enable + true + disable + Simple, cross-platform chart library for .NET MAUI. + maui dotnet chart skia skiasharp + https://github.com/follesoe/Microcharts.git + https://github.com/follesoe/Microcharts.git + + + + + + + + diff --git a/Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj b/Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj index 75b4d845..be96f940 100644 --- a/Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj +++ b/Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj @@ -1,8 +1,6 @@ - - - netstandard2.0 - Microcharts.Metapackage.nuspec - - - + + net10.0 + Microcharts.Metapackage.nuspec + + \ No newline at end of file diff --git a/Sources/Microcharts.Metapackage/Microcharts.Metapackage.nuspec b/Sources/Microcharts.Metapackage/Microcharts.Metapackage.nuspec index e9941709..f33420a7 100644 --- a/Sources/Microcharts.Metapackage/Microcharts.Metapackage.nuspec +++ b/Sources/Microcharts.Metapackage/Microcharts.Metapackage.nuspec @@ -1,45 +1,51 @@ - + Microcharts - 1.0.1 + 2.0.0 Microcharts Microcharts Team Microcharts Team MIT - https://github.com/dotnet-ad/Microcharts/ + https://github.com/microcharts-dotnet/Microcharts false Simple, cross-platform chart library. - © 2023 Microcharts Team - xamarin ios android chart skia + © 2025 Microcharts Team + maui ios android chart skia + assets/Icon.png - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + \ No newline at end of file diff --git a/Sources/Microcharts.Metapackage/_._ b/Sources/Microcharts.Metapackage/_._ new file mode 100644 index 00000000..e69de29b diff --git a/Sources/Microcharts.Samples.Android/MainActivity.cs b/Sources/Microcharts.Samples.Android/MainActivity.cs index 97c132b8..80256fa9 100644 --- a/Sources/Microcharts.Samples.Android/MainActivity.cs +++ b/Sources/Microcharts.Samples.Android/MainActivity.cs @@ -1,12 +1,9 @@ -using Android.App; -using Android.OS; -using AndroidX.AppCompat.App; using Microcharts.Droid; namespace Microcharts.Samples.Android { - [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)] - public class MainActivity : AppCompatActivity + [Activity(Label = "@string/app_name", MainLauncher = true)] + public class MainActivity : Activity { protected override void OnCreate(Bundle savedInstanceState) { diff --git a/Sources/Microcharts.Samples.Android/Microcharts.Samples.Android.csproj b/Sources/Microcharts.Samples.Android/Microcharts.Samples.Android.csproj index 7dd5b5ac..d826fc76 100644 --- a/Sources/Microcharts.Samples.Android/Microcharts.Samples.Android.csproj +++ b/Sources/Microcharts.Samples.Android/Microcharts.Samples.Android.csproj @@ -1,132 +1,23 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {CC996DF4-E262-45B8-A450-D1E881FBE54D} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {122416d6-6b49-4ee2-a1e8-b825f31c79fe} - Library - Properties + net10.0-android + 21 + Exe + disable + enable + com.companyname.microcharts.samples.android + 1 + 1.0 Microcharts.Samples.Android Microcharts.Samples.Android - 512 - True - True - Resources\Resource.designer.cs - Resource - Off - false - v12.0 - Properties\AndroidManifest.xml - Resources - Assets - true - true - Xamarin.Android.Net.AndroidClientHandler + full - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - armeabi-v7a;x86;arm64-v8a;x86_64 - - - True - portable - True - bin\Release\ - TRACE - prompt - 4 - true - False - SdkOnly - True - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {18125022-45e6-46ec-855c-b36e4d41484d} - Microcharts.Droid - - - {6fbe798d-bb43-4bb5-9c61-d6dd5b0e623a} - Microcharts.Samples - - - {d07d3e94-e645-4035-a142-5f933a15d585} - Microcharts - + + + - - diff --git a/Sources/Microcharts.Samples.Android/Properties/AndroidManifest.xml b/Sources/Microcharts.Samples.Android/Properties/AndroidManifest.xml index 73044a21..1e88f664 100644 --- a/Sources/Microcharts.Samples.Android/Properties/AndroidManifest.xml +++ b/Sources/Microcharts.Samples.Android/Properties/AndroidManifest.xml @@ -1,10 +1,12 @@  - - - + + + diff --git a/Sources/Microcharts.Samples.Android/Properties/AssemblyInfo.cs b/Sources/Microcharts.Samples.Android/Properties/AssemblyInfo.cs deleted file mode 100644 index 78cbe6bc..00000000 --- a/Sources/Microcharts.Samples.Android/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microcharts.Samples.Android")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microcharts.Samples.Android")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sources/Microcharts.Samples.Android/Resources/AboutResources.txt b/Sources/Microcharts.Samples.Android/Resources/AboutResources.txt index 096447a9..219f4254 100644 --- a/Sources/Microcharts.Samples.Android/Resources/AboutResources.txt +++ b/Sources/Microcharts.Samples.Android/Resources/AboutResources.txt @@ -20,25 +20,25 @@ Resources/ In order to get the build system to recognize Android resources, set the build action to "AndroidResource". The native Android APIs do not operate directly with filenames, but instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" +the build system will package the resources for distribution and generate a class called "Resource" (this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: +included. For example, for the above Resources layout, this is what the Resource class would expose: -public class R { - public class drawable { +public class Resource { + public class Drawable { public const int icon = 0x123; } - public class layout { + public class Layout { public const int main = 0x456; } - public class strings { + public class Strings { public const int first_string = 0xabc; public const int second_string = 0xbcd; } } -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.xml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file +You would then use Resource.Drawable.icon to reference the drawable/icon.png file, or +Resource.Layout.main to reference the layout/main.xml file, or Resource.Strings.first_string +to reference the first string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Android/Resources/layout/activity_main.xml b/Sources/Microcharts.Samples.Android/Resources/layout/activity_main.xml index d4e03683..7bfadc53 100644 --- a/Sources/Microcharts.Samples.Android/Resources/layout/activity_main.xml +++ b/Sources/Microcharts.Samples.Android/Resources/layout/activity_main.xml @@ -1,5 +1,7 @@ + + + \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/appicon_round.xml b/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/appicon_round.xml new file mode 100644 index 00000000..7751f695 --- /dev/null +++ b/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/appicon_round.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml b/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc..00000000 --- a/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc..00000000 --- a/Sources/Microcharts.Samples.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon.png new file mode 100644 index 00000000..0abfc1b5 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon_background.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon_background.png new file mode 100644 index 00000000..513e69d8 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon_background.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon_foreground.png new file mode 100644 index 00000000..99d3a291 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/appicon_foreground.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2531cb31..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7a859c25..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher_round.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b8d35b3a..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon.png new file mode 100644 index 00000000..7b5a2e2b Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon_background.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon_background.png new file mode 100644 index 00000000..9e2d1e4d Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon_background.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon_foreground.png new file mode 100644 index 00000000..a28d342c Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/appicon_foreground.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 795ea7c0..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index a12b157f..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher_round.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8f56909c..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon.png new file mode 100644 index 00000000..b28b73c6 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon_background.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon_background.png new file mode 100644 index 00000000..658be3fb Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon_background.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon_foreground.png new file mode 100644 index 00000000..70a542ac Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/appicon_foreground.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 761cc91d..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index e7d70a5e..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 9737d79c..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon.png new file mode 100644 index 00000000..f9af1173 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon_background.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon_background.png new file mode 100644 index 00000000..9171c3e4 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon_background.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon_foreground.png new file mode 100644 index 00000000..cb63bfb9 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/appicon_foreground.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9133e31b..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73ccaa6a..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c3ae5f5c..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon.png new file mode 100644 index 00000000..1d948d6b Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon_background.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon_background.png new file mode 100644 index 00000000..1232d8c8 Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon_background.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png new file mode 100644 index 00000000..9f9c9e6d Binary files /dev/null and b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4fd714e..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f6584afd..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ef89bd52..00000000 Binary files a/Sources/Microcharts.Samples.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Android/Resources/values/colors.xml b/Sources/Microcharts.Samples.Android/Resources/values/colors.xml deleted file mode 100644 index 17bb9a9d..00000000 --- a/Sources/Microcharts.Samples.Android/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #2c3e50 - #1B3147 - #3498db - diff --git a/Sources/Microcharts.Samples.Android/Resources/values/strings.xml b/Sources/Microcharts.Samples.Android/Resources/values/strings.xml index c204a076..022ea012 100644 --- a/Sources/Microcharts.Samples.Android/Resources/values/strings.xml +++ b/Sources/Microcharts.Samples.Android/Resources/values/strings.xml @@ -1,4 +1,4 @@ - Microcharts.Samples.Android - Settings + Microcharts.Samples.AndroidTwo + Hello, Android! diff --git a/Sources/Microcharts.Samples.Android/Resources/values/styles.xml b/Sources/Microcharts.Samples.Android/Resources/values/styles.xml deleted file mode 100644 index 5885930d..00000000 --- a/Sources/Microcharts.Samples.Android/Resources/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/Sources/Microcharts.Samples.Avalonia/.gitignore b/Sources/Microcharts.Samples.Avalonia/.gitignore deleted file mode 100644 index a0d6a367..00000000 --- a/Sources/Microcharts.Samples.Avalonia/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.idea/ -.vscode/ -.vs/ - -bin/ -obj/ - -*.user \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Avalonia/App.axaml b/Sources/Microcharts.Samples.Avalonia/App.axaml deleted file mode 100644 index ca1a4d30..00000000 --- a/Sources/Microcharts.Samples.Avalonia/App.axaml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Sources/Microcharts.Samples.Avalonia/App.axaml.cs b/Sources/Microcharts.Samples.Avalonia/App.axaml.cs deleted file mode 100644 index 387cdb7a..00000000 --- a/Sources/Microcharts.Samples.Avalonia/App.axaml.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Avalonia; -using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Markup.Xaml; - -namespace Microcharts.Samples.Avalonia -{ - public class App : Application - { - public override void Initialize() - { - AvaloniaXamlLoader.Load(this); - } - - public override void OnFrameworkInitializationCompleted() - { - if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) - { - desktop.MainWindow = new MainWindow(); - } - - base.OnFrameworkInitializationCompleted(); - } - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Avalonia/MainWindow.axaml b/Sources/Microcharts.Samples.Avalonia/MainWindow.axaml deleted file mode 100644 index bb689d78..00000000 --- a/Sources/Microcharts.Samples.Avalonia/MainWindow.axaml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Avalonia/MainWindow.axaml.cs b/Sources/Microcharts.Samples.Avalonia/MainWindow.axaml.cs deleted file mode 100644 index 69b3bf8a..00000000 --- a/Sources/Microcharts.Samples.Avalonia/MainWindow.axaml.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using SkiaSharp; - -namespace Microcharts.Samples.Avalonia -{ - public partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - DataContext = this; -#if DEBUG - this.AttachDevTools(); -#endif - } - - void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } - - static ChartEntry[] CreateTestEntries() => - new ChartEntry[] - { - new(200) - { - Label = "January", - ValueLabel = "200", - Color = SKColor.Parse("#266489") - }, - new(400) - { - Label = "February", - ValueLabel = "400", - Color = SKColor.Parse("#68B9C0") - }, - new(-100) - { - Label = "March", - ValueLabel = "-100", - Color = SKColor.Parse("#90D585") - } - }; - - public Chart[] Charts { get; set; } = { - new BarChart { Entries = CreateTestEntries() }, - new PointChart { Entries = CreateTestEntries() }, - new LineChart { Entries = CreateTestEntries() }, - new DonutChart { Entries = CreateTestEntries() }, - new RadialGaugeChart { Entries = CreateTestEntries() }, - new RadarChart { Entries = CreateTestEntries() } - }; - } -} diff --git a/Sources/Microcharts.Samples.Avalonia/Microcharts.Samples.Avalonia.csproj b/Sources/Microcharts.Samples.Avalonia/Microcharts.Samples.Avalonia.csproj deleted file mode 100644 index e11f5d18..00000000 --- a/Sources/Microcharts.Samples.Avalonia/Microcharts.Samples.Avalonia.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - WinExe - net6.0 - enable - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Avalonia/Program.cs b/Sources/Microcharts.Samples.Avalonia/Program.cs deleted file mode 100644 index 388faf82..00000000 --- a/Sources/Microcharts.Samples.Avalonia/Program.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Avalonia; - -namespace Microcharts.Samples.Avalonia -{ - class Program - { - // Initialization code. Don't use any Avalonia, third-party APIs or any - // SynchronizationContext-reliant code before AppMain is called: things aren't initialized - // yet and stuff might break. - public static void Main(string[] args) => BuildAvaloniaApp() - .StartWithClassicDesktopLifetime(args); - - // Avalonia configuration, don't remove; also used by visual designer. - public static AppBuilder BuildAvaloniaApp() - => AppBuilder.Configure() - .UsePlatformDetect() - .LogToTrace(); - } -} diff --git a/Sources/Microcharts.Samples.Eto/Info.plist b/Sources/Microcharts.Samples.Eto/Info.plist deleted file mode 100644 index 3aaee78b..00000000 --- a/Sources/Microcharts.Samples.Eto/Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleName - Microcharts.Samples.Eto - CFBundleIdentifier - com.example.Microcharts.Samples.Eto - CFBundleShortVersionString - 1.0 - LSMinimumSystemVersion - 10.12 - CFBundleDevelopmentRegion - en - NSHumanReadableCopyright - - CFBundleIconFile - MacIcon.icns - - diff --git a/Sources/Microcharts.Samples.Eto/MacIcon.icns b/Sources/Microcharts.Samples.Eto/MacIcon.icns deleted file mode 100644 index 8f385bb4..00000000 Binary files a/Sources/Microcharts.Samples.Eto/MacIcon.icns and /dev/null differ diff --git a/Sources/Microcharts.Samples.Eto/MainForm.cs b/Sources/Microcharts.Samples.Eto/MainForm.cs deleted file mode 100644 index 6679114b..00000000 --- a/Sources/Microcharts.Samples.Eto/MainForm.cs +++ /dev/null @@ -1,38 +0,0 @@ - -namespace Microcharts.Samples.Eto -{ - using global::Eto.Forms; - using global::Eto.Drawing; - using Microcharts; - public partial class MainForm : Form - { - Chart[] charts = new SampleCharts().Charts; - public MainForm() - { - InitializeComponent(); - - var layout1 = new TableLayout() { Spacing = Size.Empty + 4 }; - layout1.Rows.Add(new TableRow(cell(0), cell(1), cell(2)) { ScaleHeight = true }); - layout1.Rows.Add(new TableRow(cell(3), cell(4), cell(5)) { ScaleHeight = true }); - - var entries = new ChartEntry[] - { - new ChartEntry(200) { Label = "January", ValueLabel = "200", Color = SkiaSharp.SKColors.CornflowerBlue }, - new ChartEntry(400) { Label = "February", ValueLabel = "400", Color = SkiaSharp.SKColors.ForestGreen }, - new ChartEntry(-100) { Label = "March", ValueLabel = "-100", Color = SkiaSharp.SKColors.MediumVioletRed } - }; - this.Content = new Microcharts.Eto.ChartView() { Chart = new RadarChart { Entries = entries, AnimationProgress = 100 } }; - - Content = layout1; - } - - private TableCell cell(int idx) - { - var view = new Microcharts.Eto.ChartView { Chart = charts[idx] }; - - view.Chart.AnimationProgress = 100; - - return new TableCell(view, true); - } - } -} diff --git a/Sources/Microcharts.Samples.Eto/MainForm.eto.cs b/Sources/Microcharts.Samples.Eto/MainForm.eto.cs deleted file mode 100644 index b83b6071..00000000 --- a/Sources/Microcharts.Samples.Eto/MainForm.eto.cs +++ /dev/null @@ -1,50 +0,0 @@ - -namespace Microcharts.Samples.Eto -{ - using global::Eto.Forms; - using global::Eto.Drawing; - partial class MainForm : Form - { - void InitializeComponent() - { - Title = "My Eto Form"; - MinimumSize = new Size(200, 150); - Size = MinimumSize * 4; - Padding = 10; - - Content = new StackLayout - { - Items = - { - "Hello World!", - // add more controls here - } - }; - - var quitCommand = new Command { MenuText = "Quit", Shortcut = Application.Instance.CommonModifier | Keys.Q }; - quitCommand.Executed += (sender, e) => Application.Instance.Quit(); - - var aboutCommand = new Command { MenuText = "About..." }; - aboutCommand.Executed += (sender, e) => new AboutDialog().ShowDialog(this); - - // create menu - Menu = new MenuBar - { - Items = - { - // File submenu0 -// new SubMenuItem { Text = "&File", Items = { clickMe } }, - // new SubMenuItem { Text = "&Edit", Items = { /* commands/items */ } }, - // new SubMenuItem { Text = "&View", Items = { /* commands/items */ } }, - }, - ApplicationItems = - { - // application (OS X) or file menu (others) - new ButtonMenuItem { Text = "&Preferences..." }, - }, - QuitItem = quitCommand, - AboutItem = aboutCommand - }; - } - } -} diff --git a/Sources/Microcharts.Samples.Eto/Microcharts.Samples.Eto.csproj b/Sources/Microcharts.Samples.Eto/Microcharts.Samples.Eto.csproj deleted file mode 100644 index a73bac9a..00000000 --- a/Sources/Microcharts.Samples.Eto/Microcharts.Samples.Eto.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - net6.0 - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Eto/Program.cs b/Sources/Microcharts.Samples.Eto/Program.cs deleted file mode 100644 index 55073642..00000000 --- a/Sources/Microcharts.Samples.Eto/Program.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Eto.Forms; - -namespace Microcharts.Samples.Eto -{ - static class Program - { - [STAThread] - static void Main(string[] args) - { - new Application(global::Eto.Platform.Detect).Run(new MainForm()); - } - } -} diff --git a/Sources/Microcharts.Samples.Eto/SampleCharts.cs b/Sources/Microcharts.Samples.Eto/SampleCharts.cs deleted file mode 100644 index a374741b..00000000 --- a/Sources/Microcharts.Samples.Eto/SampleCharts.cs +++ /dev/null @@ -1,44 +0,0 @@ - -namespace Microcharts.Samples.Eto -{ - using SkiaSharp; - public class SampleCharts - { - public ChartEntry[] Entries = new ChartEntry[] - { - new ChartEntry(200) - { - Label = "January", - ValueLabel = "200", - Color = SKColor.Parse("#266489") - }, - new ChartEntry(400) - { - Label = "February", - ValueLabel = "400", - Color = SKColor.Parse("#68B9C0") - }, - new ChartEntry(-100) - { - Label = "March", - ValueLabel = "-100", - Color = SKColor.Parse("#90D585") - } - }; - - public Chart[] Charts { get; set; } - - public SampleCharts() - { - this.Charts = new Chart[] - { - new BarChart() {Entries = this.Entries}, - new PointChart() {Entries = this.Entries}, - new LineChart() {Entries = this.Entries}, - new DonutChart() {Entries = this.Entries}, - new RadialGaugeChart() {Entries = this.Entries}, - new RadarChart() {Entries = this.Entries} - }; - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Assets/AboutAssets.txt b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Assets/AboutAssets.txt deleted file mode 100644 index ca673c64..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/MainActivity.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/MainActivity.cs deleted file mode 100644 index d7299e7a..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/MainActivity.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Android.App; -using Android.Content.PM; -using Android.OS; - -namespace Microcharts.Samples.Forms.Android -{ - [Activity(Label = "Microcharts.Samples.Forms", Theme = "@style/MainTheme", MainLauncher = true, - ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] - public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity - { - protected override void OnCreate(Bundle savedInstanceState) - { - TabLayoutResource = Resource.Layout.Tabbar; - ToolbarResource = Resource.Layout.Toolbar; - - base.OnCreate(savedInstanceState); - global::Xamarin.Forms.Forms.Init(this, savedInstanceState); - LoadApplication(new App()); - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Microcharts.Samples.Forms.Android.csproj b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Microcharts.Samples.Forms.Android.csproj deleted file mode 100644 index d790a0cc..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Microcharts.Samples.Forms.Android.csproj +++ /dev/null @@ -1,91 +0,0 @@ - - - - Debug - AnyCPU - {57F645D7-DBC4-432D-85BE-865900B02AEF} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Microcharts.Samples.Forms.Android - Microcharts.Samples.Forms.Android - True - Resources\Resource.designer.cs - Resource - Properties\AndroidManifest.xml - Resources - Assets - false - v12.0 - Xamarin.Android.Net.AndroidClientHandler - - - true - portable - false - bin\Debug - DEBUG; - prompt - 4 - None - x86;arm64-v8a;x86_64 - - - true - pdbonly - true - bin\Release - prompt - 4 - true - false - arm64-v8a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MSBuild:UpdateGeneratedFiles - - - - - - - {56130029-E689-499B-B180-1A39B1C2E99B} - Microcharts.Samples.Forms - - - - - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Properties/AndroidManifest.xml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Properties/AndroidManifest.xml deleted file mode 100644 index 0e7cfbec..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Properties/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Properties/AssemblyInfo.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Properties/AssemblyInfo.cs deleted file mode 100644 index dcc0c11c..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microcharts.Samples.Forms.Android")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CompanyName")] -[assembly: AssemblyProduct("Microcharts.Samples.Forms.Android")] -[assembly: AssemblyCopyright("Copyright © CompanyName Year")] -[assembly: AssemblyTrademark("CompanyTrademark")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/AboutResources.txt b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/AboutResources.txt deleted file mode 100644 index cb30f20b..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/AboutResources.txt +++ /dev/null @@ -1,50 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.xml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable-hdpi/ - icon.png - - drawable-ldpi/ - icon.png - - drawable-mdpi/ - icon.png - - layout/ - main.xml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called -"Resource" that contains the tokens for each one of the resources included. For example, -for the above Resources layout, this is what the Resource class would expose: - -public class Resource { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main -to reference the layout/main.xml file, or Resource.strings.first_string to reference the first -string in the dictionary file values/strings.xml. diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/layout/Tabbar.axml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/layout/Tabbar.axml deleted file mode 100644 index ad1f87d8..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/layout/Tabbar.axml +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/layout/Toolbar.axml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/layout/Toolbar.axml deleted file mode 100644 index aabd0a3b..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/layout/Toolbar.axml +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/values/colors.xml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/values/colors.xml deleted file mode 100644 index d9f6e0ba..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/values/colors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - #FFFFFF - #3F51B5 - #303F9F - #FF4081 - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/values/styles.xml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/values/styles.xml deleted file mode 100644 index 43b0a58c..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/values/styles.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/AppDelegate.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/AppDelegate.cs deleted file mode 100644 index b34c3a1b..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/AppDelegate.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Foundation; -using UIKit; - -namespace Microcharts.Samples.Forms.iOS -{ - // The UIApplicationDelegate for the application. This class is responsible for launching the - // User Interface of the application, as well as listening (and optionally responding) to - // application events from iOS. - [Register("AppDelegate")] - public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate - { - // - // This method is invoked when the application has loaded and is ready to run. In this - // method you should instantiate the window, load the UI into it and then make the window - // visible. - // - // You have 17 seconds to return from this method, or iOS will terminate your application. - // - public override bool FinishedLaunching(UIApplication app, NSDictionary options) - { - global::Xamarin.Forms.Forms.Init(); - LoadApplication(new App()); - - return base.FinishedLaunching(app, options); - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 98f4d035..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "images": [ - { - "scale": "2x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon40.png" - }, - { - "scale": "3x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon60.png" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon58.png" - }, - { - "scale": "3x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon87.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon80.png" - }, - { - "scale": "3x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "2x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "3x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon180.png" - }, - { - "scale": "1x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon20.png" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "1x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon29.png" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon58.png" - }, - { - "scale": "1x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon80.png" - }, - { - "scale": "1x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon76.png" - }, - { - "scale": "2x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon152.png" - }, - { - "scale": "2x", - "size": "83.5x83.5", - "idiom": "ipad", - "filename": "Icon167.png" - }, - { - "scale": "1x", - "size": "1024x1024", - "idiom": "ios-marketing", - "filename": "Icon1024.png" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Entitlements.plist b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Entitlements.plist deleted file mode 100644 index e9a3005f..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Entitlements.plist +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Info.plist b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Info.plist deleted file mode 100644 index 532c3f4f..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - UIDeviceFamily - - 1 - 2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - MinimumOSVersion - 13.2 - CFBundleDisplayName - Microcharts.Samples.Forms - CFBundleIdentifier - com.companyname.Microcharts.Samples.Forms - CFBundleVersion - 1.0 - UILaunchStoryboardName - LaunchScreen - CFBundleName - Microcharts.Samples.Forms - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Main.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Main.cs deleted file mode 100644 index 4ce6f9eb..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Main.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Foundation; -using UIKit; - -namespace Microcharts.Samples.Forms.iOS -{ - public class Application - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, "AppDelegate"); - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Microcharts.Samples.Forms.iOS.csproj b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Microcharts.Samples.Forms.iOS.csproj deleted file mode 100644 index 42896a92..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Microcharts.Samples.Forms.iOS.csproj +++ /dev/null @@ -1,119 +0,0 @@ - - - - Debug - iPhoneSimulator - 8.0.30703 - 2.0 - {28DC5F01-070C-4117-A46F-C4855430DB4A} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - Microcharts.Samples.Forms.iOS - Resources - Microcharts.Samples.Forms.iOS - NSUrlSessionHandler - - - true - full - false - bin\iPhoneSimulator\Debug - DEBUG - prompt - 4 - false - x86_64 - None - true - - - none - true - bin\iPhoneSimulator\Release - prompt - 4 - None - x86_64 - false - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - ARM64 - iPhone Developer - true - Entitlements.plist - - - none - true - bin\iPhone\Release - prompt - 4 - ARM64 - false - iPhone Developer - Entitlements.plist - - - none - True - bin\iPhone\Ad-Hoc - prompt - 4 - False - ARM64 - True - Automatic:AdHoc - iPhone Distribution - Entitlements.plist - - - none - True - bin\iPhone\AppStore - prompt - 4 - False - ARM64 - Automatic:AppStore - iPhone Distribution - Entitlements.plist - - - - - - - - - - - - false - - - - - - - - - - - - - - - {56130029-E689-499B-B180-1A39B1C2E99B} - Microcharts.Samples.Forms - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Properties/AssemblyInfo.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 57113c24..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microcharts.Samples.Forms.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("CompanyName")] -[assembly: AssemblyProduct("Microcharts.Samples.Forms.iOS")] -[assembly: AssemblyCopyright("Copyright © CompanyName Year")] -[assembly: AssemblyTrademark("CompanyTrademark")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Resources/LaunchScreen.storyboard b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Resources/LaunchScreen.storyboard deleted file mode 100644 index a639c2f1..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.iOS/Resources/LaunchScreen.storyboard +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/App.xaml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/App.xaml deleted file mode 100644 index 81b4666a..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/App.xaml.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/App.xaml.cs deleted file mode 100644 index 466aee30..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/App.xaml.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -[assembly: XamlCompilation(XamlCompilationOptions.Compile)] - -namespace Microcharts.Samples.Forms -{ - public partial class App : Application - { - public App() - { - InitializeComponent(); - - MainPage = new MainPage(); - } - - protected override void OnStart() - { - // Handle when your app starts - } - - protected override void OnSleep() - { - // Handle when your app sleeps - } - - protected override void OnResume() - { - // Handle when your app resumes - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartConfigurationPage.xaml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartConfigurationPage.xaml deleted file mode 100644 index ae866d6c..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartConfigurationPage.xaml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartConfigurationPage.xaml.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartConfigurationPage.xaml.cs deleted file mode 100644 index dbade119..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartConfigurationPage.xaml.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -namespace Microcharts.Samples.Forms -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class ChartConfigurationPage : ContentPage - { - public ChartConfigurationPage(string chartType) - { - Items = Data.CreateXamarinExampleChartItem(chartType).ToList(); - InitializeComponent(); - Title = chartType; - } - - public List Items { get; } - - private void TapGestureRecognizer_Tapped(object sender, EventArgs e) - { - Frame frame = (sender as Frame); - ExampleChartItem exChartItem = frame.BindingContext as ExampleChartItem; - Navigation.PushAsync(new ChartPage(exChartItem)); - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartPage.xaml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartPage.xaml deleted file mode 100644 index 204694cf..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartPage.xaml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartPage.xaml.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartPage.xaml.cs deleted file mode 100644 index 644757ba..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/ChartPage.xaml.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -namespace Microcharts.Samples.Forms -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class ChartPage : ContentPage - { - - public ChartPage(ExampleChartItem chartItem) - { - ExampleChartItem = chartItem; - InitializeComponent(); - Title = ExampleChartItem.ChartType; - - } - - private bool Running = true; - public ExampleChartItem ExampleChartItem { get; } - - protected override void OnDisappearing() - { - Running = false; - base.OnDisappearing(); - } - bool IsDrawing = false; - protected void GenerateDynamicData() - { - Random r = new Random((int)DateTime.Now.Ticks); - LineChart lc = (LineChart)chartView.Chart; - - int ticks = (int)(250 * TimeSpan.TicksPerMillisecond); - - var series = lc.Series; - - int rMax = (int)(lc.MinValue + (lc.MaxValue - lc.MinValue) * 0.66f); - int rMin = (int)(lc.MinValue + (lc.MaxValue - lc.MinValue) * 0.33f); - foreach (var s in series) - { - int count = s.Entries.Count(); - DelayTimer timer = Timer.Create() as DelayTimer; - timer.Start(new TimeSpan(ticks), () => - { - Device.InvokeOnMainThreadAsync(() => - { - var label = DateTime.Now.ToString("mm:ss"); - - int idx = 0; - foreach (var curSeries in series) - { - var entries = curSeries.Entries.ToList(); - bool addLabel = (entries.Count % 1000) == 0; - - if (s == curSeries) - { - var entry = Data.GenerateTimeSeriesEntry(r, idx, 1); - if (!addLabel) entry.First().Label = null; - - entries.AddRange(entry); - - if (entries.Count() > count * 1.5) entries.RemoveAt(0); - } - else - { - var entry = new ChartEntry(null) { ValueLabel = null, Label = label }; - if (!addLabel) entry.Label = null; - - entries.Add(entry); - if (entries.Count() > count * 1.5) entries.RemoveAt(0); - } - - curSeries.Entries = entries; - idx++; - } - - if (!lc.IsAnimating) - { - lc.IsAnimated = false; - lc.Series = series; - if (!IsDrawing) - { - IsDrawing = true; - chartView.InvalidateSurface(); - } - } - }).ContinueWith(t => { - if (t.IsFaulted) Console.WriteLine(t.Exception); - }); - return Running; - }); - ticks += (int)(250 * TimeSpan.TicksPerMillisecond); - } - } - - protected override void OnAppearing() - { - base.OnAppearing(); - - chartView.Chart = ExampleChartItem.Chart; - chartView.ChartPainted += (sender, args) => - { - IsDrawing = false; - }; - - if (!chartView.Chart.IsAnimating) - chartView.Chart.AnimateAsync(true).ConfigureAwait(false); - - if (ExampleChartItem.IsDynamic && (chartView.Chart as LineChart) != null ) - { - GenerateDynamicData(); - } - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/LegacyPage.xaml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/LegacyPage.xaml deleted file mode 100644 index c7425333..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/LegacyPage.xaml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/LegacyPage.xaml.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/LegacyPage.xaml.cs deleted file mode 100644 index 623fe6c5..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/LegacyPage.xaml.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microcharts.Samples.Forms.Model; -using Xamarin.Forms; - -namespace Microcharts.Samples.Forms -{ - public partial class LegacyPage : ContentPage - { - public LegacyPage() - { - var charts = Data.CreateXamarinLegacySample(); - var items = new List(); - for (int i = 0; i < charts.Length; i++) - { - items.Add(new ChartItem(charts[i].GetType().Name, charts[i], i)); - } - Items = items; - InitializeComponent(); - } - - protected override void OnAppearing() - { - base.OnAppearing(); - } - - public List Items { get; } - - private void TapGestureRecognizer_Tapped(object sender, EventArgs e) - { - Frame frame = (sender as Frame); - ChartItem chartItem = frame.BindingContext as ChartItem; - Navigation.PushAsync(new ChartConfigurationPage(chartItem.Name)); - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/MainPage.xaml b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/MainPage.xaml deleted file mode 100644 index a07c0fcb..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/MainPage.xaml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/MainPage.xaml.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/MainPage.xaml.cs deleted file mode 100644 index 07e6c278..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/MainPage.xaml.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using Microcharts.Samples.Forms.Model; -using Xamarin.Forms; - -namespace Microcharts.Samples.Forms -{ - public partial class MainPage : ContentPage - { - public MainPage() - { - var charts = Data.CreateXamarinSample(); - var items = new List(); - for (int i = 0; i < charts.Length; i++) - { - items.Add(new ChartItem(charts[i].GetType().Name, charts[i], i)); - } - Items = items; - InitializeComponent(); - } - - protected override void OnAppearing() - { - base.OnAppearing(); - } - - public List Items { get; } - - private void TapGestureRecognizer_Tapped(object sender, EventArgs e) - { - Frame frame = (sender as Frame); - ChartItem chartItem = frame.BindingContext as ChartItem; - Navigation.PushAsync(new ChartConfigurationPage(chartItem.Name)); - } - - private void TapGestureRecognizerLegacyChartsTapped(object sender, EventArgs e) - { - Navigation.PushAsync(new LegacyPage()); - } - } -} diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/Microcharts.Samples.Forms.csproj b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/Microcharts.Samples.Forms.csproj deleted file mode 100644 index 0251677a..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/Microcharts.Samples.Forms.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - netstandard2.0 - - - - pdbonly - true - - - - - - - - - - - - - - LegacyPage.xaml - - - - - - MSBuild:UpdateDesignTimeXaml - - - MSBuild:UpdateDesignTimeXaml - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/Model/ChartItem.cs b/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/Model/ChartItem.cs deleted file mode 100644 index 463bd686..00000000 --- a/Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms/Model/ChartItem.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace Microcharts.Samples.Forms.Model -{ - public class ChartItem - { - public ChartItem(string name, Chart chart, int index) - { - Name = name; - Chart = chart; - ChartFactory = () => Data.CreateXamarinSample()[index]; - HasSeries = chart is SeriesChart; - } - - public string Name { get; private set; } - public Chart Chart { get; } - public Func ChartFactory { get; } - public bool HasSeries { get; } - } -} diff --git a/Sources/Microcharts.Samples.Maui/App.xaml.cs b/Sources/Microcharts.Samples.Maui/App.xaml.cs index 59399b19..036ebc54 100644 --- a/Sources/Microcharts.Samples.Maui/App.xaml.cs +++ b/Sources/Microcharts.Samples.Maui/App.xaml.cs @@ -1,15 +1,13 @@ -using Microsoft.Maui.Controls; -using Application = Microsoft.Maui.Controls.Application; - namespace Microcharts.Samples.Maui { - public partial class App : Application + public partial class App { public App() { InitializeComponent(); - - MainPage = new NavigationPage(new MainPage()); } + + protected override Window CreateWindow(IActivationState activationState) => + new(new NavigationPage(new MainPage())); } } diff --git a/Sources/Microcharts.Samples.Maui/ChartConfigurationPage.xaml b/Sources/Microcharts.Samples.Maui/ChartConfigurationPage.xaml index 4a1748db..ba25dd6e 100644 --- a/Sources/Microcharts.Samples.Maui/ChartConfigurationPage.xaml +++ b/Sources/Microcharts.Samples.Maui/ChartConfigurationPage.xaml @@ -2,6 +2,9 @@ diff --git a/Sources/Microcharts.Samples.Maui/LegacyPage.xaml b/Sources/Microcharts.Samples.Maui/LegacyPage.xaml index 028f7f5c..bcba8f56 100644 --- a/Sources/Microcharts.Samples.Maui/LegacyPage.xaml +++ b/Sources/Microcharts.Samples.Maui/LegacyPage.xaml @@ -2,8 +2,10 @@ @@ -20,16 +22,18 @@ - + - - + Stroke="LightGray"> + + + + - + - - + - + diff --git a/Sources/Microcharts.Samples.Maui/LegacyPage.xaml.cs b/Sources/Microcharts.Samples.Maui/LegacyPage.xaml.cs index a2e90f3e..20731b82 100644 --- a/Sources/Microcharts.Samples.Maui/LegacyPage.xaml.cs +++ b/Sources/Microcharts.Samples.Maui/LegacyPage.xaml.cs @@ -1,16 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Microcharts.Samples.Maui.Model; -using Microsoft.Maui; -using Microsoft.Maui.Controls; namespace Microcharts.Samples.Maui { - public partial class LegacyPage : ContentPage + public partial class LegacyPage { public LegacyPage() { @@ -24,17 +16,12 @@ public LegacyPage() InitializeComponent(); } - protected override void OnAppearing() - { - base.OnAppearing(); - } - public List Items { get; } private void TapGestureRecognizer_Tapped(object sender, EventArgs e) { - Frame frame = (sender as Frame); - ChartItem chartItem = frame.BindingContext as ChartItem; + var border = sender as Border; + ChartItem chartItem = border.BindingContext as ChartItem; Navigation.PushAsync(new ChartConfigurationPage(chartItem.Name)); } } diff --git a/Sources/Microcharts.Samples.Maui/MainPage.xaml b/Sources/Microcharts.Samples.Maui/MainPage.xaml index af36963b..89772774 100644 --- a/Sources/Microcharts.Samples.Maui/MainPage.xaml +++ b/Sources/Microcharts.Samples.Maui/MainPage.xaml @@ -2,7 +2,8 @@ @@ -16,21 +17,25 @@ FontSize="Subtitle" TextColor="Gray" Text="Tap on item for more examples" /> - + - + - - + Stroke="LightGray"> + + + + - + - - + - + diff --git a/Sources/Microcharts.Samples.Maui/MainPage.xaml.cs b/Sources/Microcharts.Samples.Maui/MainPage.xaml.cs index a641972c..29c69a36 100644 --- a/Sources/Microcharts.Samples.Maui/MainPage.xaml.cs +++ b/Sources/Microcharts.Samples.Maui/MainPage.xaml.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; using Microcharts.Samples.Maui.Model; -using Microsoft.Maui; -using Microsoft.Maui.Controls; namespace Microcharts.Samples.Maui { - public partial class MainPage : ContentPage + public partial class MainPage { public MainPage() { @@ -20,17 +16,12 @@ public MainPage() InitializeComponent(); } - protected override void OnAppearing() - { - base.OnAppearing(); - } - public List Items { get; } private void TapGestureRecognizer_Tapped(object sender, EventArgs e) { - Frame frame = (sender as Frame); - ChartItem chartItem = frame.BindingContext as ChartItem; + var border = sender as Border; + ChartItem chartItem = border.BindingContext as ChartItem; Navigation.PushAsync(new ChartConfigurationPage(chartItem.Name)); } diff --git a/Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj b/Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj index f6e2865b..2dad272d 100644 --- a/Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj +++ b/Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj @@ -1,59 +1,64 @@ - - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 - - - Exe - Microcharts.Samples.Maui - true - true - enable - - - Microcharts Maui - - - com.Microcharts.Samples.Maui - d6c126a3-93f0-4e10-a111-f1a0714bf228 - - - 1.0 - 1 - - 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 + Exe + Microcharts.Samples.Maui + true + true + enable + disable + true + true + + Microcharts Maui + + + com.Microcharts.Samples.Maui + d6c126a3-93f0-4e10-a111-f1a0714bf228 + + + 1.0 + 1 + + 14.2 + 15.0 + 21.0 + 10.0.19041.0 + 10.0.19041.0 + 6.5 + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/AndroidManifest.xml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/AndroidManifest.xml deleted file mode 100644 index 995e6741..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Assets/AboutAssets.txt b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Assets/AboutAssets.txt deleted file mode 100644 index 210a93b8..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,22 +0,0 @@ -To add cross-platform image assets for your Uno Platform app, use the Assets folder -in the shared project instead. Assets in this folder are Android-only assets. - -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Assets/Fonts/uno-fluentui-assets.ttf b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Assets/Fonts/uno-fluentui-assets.ttf deleted file mode 100644 index 05518405..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Assets/Fonts/uno-fluentui-assets.ttf and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Main.Android.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Main.Android.cs deleted file mode 100644 index 8b81d927..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Main.Android.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Com.Nostra13.Universalimageloader.Core; -using Microsoft.UI.Xaml.Media; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Microcharts.Samples.Uno.Droid -{ - [global::Android.App.ApplicationAttribute( - Label = "@string/ApplicationName", - Icon = "@mipmap/icon", - LargeHeap = true, - HardwareAccelerated = true, - Theme = "@style/AppTheme" - )] - public class Application : Microsoft.UI.Xaml.NativeApplication - { - public Application(IntPtr javaReference, JniHandleOwnership transfer) - : base(() => new App(), javaReference, transfer) - { - ConfigureUniversalImageLoader(); - } - - private static void ConfigureUniversalImageLoader() - { - // Create global configuration and initialize ImageLoader with this config - ImageLoaderConfiguration config = new ImageLoaderConfiguration - .Builder(Context) - .Build(); - - ImageLoader.Instance.Init(config); - - ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync; - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/MainActivity.Android.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/MainActivity.Android.cs deleted file mode 100644 index 1507c752..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/MainActivity.Android.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Android.App; -using Android.Content.PM; -using Android.OS; -using Android.Views; -using Android.Widget; - -namespace Microcharts.Samples.Uno -{ - [Activity( - MainLauncher = true, - ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges, - WindowSoftInputMode = SoftInput.AdjustPan | SoftInput.StateHidden - )] - public class MainActivity : Microsoft.UI.Xaml.ApplicationActivity - { - } -} - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/AboutResources.txt b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/AboutResources.txt deleted file mode 100644 index 17e3b133..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/AboutResources.txt +++ /dev/null @@ -1,47 +0,0 @@ -To add cross-platform image assets for your Uno Platform app, use the Assets folder -in the shared project instead. Resources in this folder are Android-only. - -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.axml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable/ - icon.png - - layout/ - main.axml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" -(this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: - -public class R { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.axml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-hdpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-hdpi/icon.png deleted file mode 100644 index 024be3ca..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-hdpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-ldpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-ldpi/icon.png deleted file mode 100644 index 2194c9ca..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-ldpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-mdpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-mdpi/icon.png deleted file mode 100644 index cfa450ba..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-mdpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-tvdpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-tvdpi/icon.png deleted file mode 100644 index 3869c27f..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-tvdpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xhdpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xhdpi/icon.png deleted file mode 100644 index a5cfc6e1..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xhdpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xxhdpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xxhdpi/icon.png deleted file mode 100644 index d6b8da0d..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xxhdpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xxxhdpi/icon.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xxxhdpi/icon.png deleted file mode 100644 index 696295ce..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/mipmap-xxxhdpi/icon.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/values/Strings.xml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/values/Strings.xml deleted file mode 100644 index daad16b4..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/values/Strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Hello World, Click Me! - UnoQuickStart - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/values/Styles.xml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/values/Styles.xml deleted file mode 100644 index f24b9a0c..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/Resources/values/Styles.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/environment.conf b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/environment.conf deleted file mode 100644 index fa6c2e32..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Android/environment.conf +++ /dev/null @@ -1,2 +0,0 @@ -# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/ -MONO_GC_PARAMS=bridge-implementation=tarjan,nursery-size=32m,soft-heap-limit=256m \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Entitlements.plist b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Entitlements.plist deleted file mode 100644 index 24c31036..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Entitlements.plist +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Info.plist b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Info.plist deleted file mode 100644 index f4d5e291..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Info.plist +++ /dev/null @@ -1,43 +0,0 @@ - - - - - CFBundleName - Microcharts.Sample.Uno - CFBundleDisplayName - Microcharts.Sample.Uno - CFBundleIdentifier - com.companyname.changeme - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - UIDeviceFamily - - 2 - - LSApplicationCategoryType - public.app-category.utilities - UILaunchStoryboardName - LaunchScreen - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - XSAppIconAssets - Media.xcassets/AppIcon.appiconset - UIAppFonts - - Fonts/uno-fluentui-assets.ttf - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/LaunchScreen.storyboard b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/LaunchScreen.storyboard deleted file mode 100644 index 04a81ae7..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/LaunchScreen.storyboard +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Main.maccatalyst.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Main.maccatalyst.cs deleted file mode 100644 index 67bf051d..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Main.maccatalyst.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UIKit; - -namespace Microcharts.Samples.Uno -{ - public class EntryPoint - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(App)); - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json deleted file mode 100644 index a5c67023..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "images": [ - { - "scale": "2x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon58.png" - }, - { - "scale": "3x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon87.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon80.png" - }, - { - "scale": "3x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon180.png" - }, - { - "scale": "1x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon20.png" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "1x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon29.png" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon58.png" - }, - { - "scale": "1x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon80.png" - }, - { - "scale": "1x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon76.png" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon40.png" - }, - { - "scale": "3x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon60.png" - }, - { - "scale": "3x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "2x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "2x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon152.png" - }, - { - "scale": "2x", - "size": "83.5x83.5", - "idiom": "ipad", - "filename": "Icon167.png" - }, - { - "scale": "1x", - "size": "1024x1024", - "idiom": "ios-marketing", - "filename": "Icon1024.png" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png deleted file mode 100644 index c7e45b70..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png deleted file mode 100644 index 5f2aea5e..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png deleted file mode 100644 index c28bde8f..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png deleted file mode 100644 index aeeb0769..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png deleted file mode 100644 index 0a851b8d..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png deleted file mode 100644 index 6f1a958b..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png deleted file mode 100644 index 2d1ce797..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png deleted file mode 100644 index a0ab12a4..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png deleted file mode 100644 index 26ef6c93..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png deleted file mode 100644 index 84bfd00e..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png deleted file mode 100644 index b5ee3611..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png deleted file mode 100644 index 5de98b1c..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png deleted file mode 100644 index 53147588..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/Default-568h@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/Default-568h@2x.png deleted file mode 100644 index 29973dcb..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/Default-568h@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf deleted file mode 100644 index 05518405..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/SplashScreen@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/SplashScreen@2x.png deleted file mode 100644 index f8e793d9..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/SplashScreen@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/SplashScreen@3x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/SplashScreen@3x.png deleted file mode 100644 index 8c5f3984..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacCatalyst/Resources/SplashScreen@3x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png deleted file mode 100644 index 5757c31d..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png deleted file mode 100644 index d0fb3572..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png deleted file mode 100644 index 17d637b2..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png deleted file mode 100644 index cf3a6e3e..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png deleted file mode 100644 index dcaaf7fa..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png deleted file mode 100644 index 4810d2d0..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png deleted file mode 100644 index c02a2268..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png deleted file mode 100644 index d257b83a..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png deleted file mode 100644 index a9099508..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index da4b8a99..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6b285452..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images": [ - { - "filename": "AppIcon-16.png", - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-16@2x.png", - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32.png", - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32@2x.png", - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128.png", - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128@2x.png", - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256.png", - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256@2x.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512@2x.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/Contents.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/Contents.json deleted file mode 100644 index 4caf392f..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/unologo.imageset/Contents.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/unologo.imageset/Contents.json deleted file mode 100644 index 9b481d06..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/unologo.imageset/Contents.json +++ /dev/null @@ -1,528 +0,0 @@ -{ - "images": [ - { - "idiom": "universal" - }, - { - "scale": "1x", - "idiom": "universal" - }, - { - "filename": "unoplatform.jpg", - "scale": "2x", - "idiom": "universal" - }, - { - "scale": "3x", - "idiom": "universal" - }, - { - "idiom": "iphone" - }, - { - "scale": "1x", - "idiom": "iphone" - }, - { - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "scale": "2x", - "idiom": "iphone" - }, - { - "scale": "3x", - "idiom": "iphone" - }, - { - "idiom": "ipad" - }, - { - "scale": "1x", - "idiom": "ipad" - }, - { - "scale": "2x", - "idiom": "ipad" - }, - { - "idiom": "watch" - }, - { - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "scale": "2x", - "idiom": "watch" - }, - { - "idiom": "mac" - }, - { - "scale": "1x", - "idiom": "mac" - }, - { - "scale": "2x", - "idiom": "mac" - }, - { - "idiom": "car" - }, - { - "scale": "2x", - "idiom": "car" - }, - { - "scale": "3x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "3x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "3x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "3x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "3x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "3x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "3x", - "idiom": "car" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/unologo.imageset/unoplatform.jpg b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/unologo.imageset/unoplatform.jpg deleted file mode 100644 index da3230e5..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Assets.xcassets/unologo.imageset/unoplatform.jpg and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Entitlements.plist b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Entitlements.plist deleted file mode 100644 index e9a3005f..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Entitlements.plist +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Info.plist b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Info.plist deleted file mode 100644 index 0c798d51..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleName - Microcharts.Sample.Uno.macOS - CFBundleIdentifier - com.companyname.Microcharts.Sample.Uno-macOS - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - CFBundleDevelopmentRegion - en - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - LSApplicationCategoryType - public.app-category.utilities - NSHumanReadableCopyright - ${AuthorCopyright:HtmlEncode} - NSPrincipalClass - NSApplication - XSAppIconAssets - Assets.xcassets/AppIcons.appiconset - ATSApplicationFontsPath - Fonts/uno-fluentui-assets.ttf - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Main.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Main.cs deleted file mode 100644 index a7099bcb..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Main.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AppKit; - -namespace Microcharts.Samples.Uno.macOS -{ - internal static class MainClass - { - static void Main(string[] args) - { - NSApplication.Init(); - NSApplication.SharedApplication.Delegate = new App(); - NSApplication.Main(args); - } - } -} - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Resources/Fonts/uno-fluentui-assets.ttf b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Resources/Fonts/uno-fluentui-assets.ttf deleted file mode 100644 index 05518405..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/MacOS/Resources/Fonts/uno-fluentui-assets.ttf and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Microcharts.Samples.Uno.Mobile.csproj b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Microcharts.Samples.Uno.Mobile.csproj deleted file mode 100644 index 52dff5f4..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Microcharts.Samples.Uno.Mobile.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - net7.0-android - $(TargetFrameworks);net7.0-ios - - true - Exe - - - - - - true - 14.2 - 14.0 - 21.0 - 10.14 - - - - iossimulator-x64 - maccatalyst-x64 - osx-x64 - - - None - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - $(MtouchExtraArgs) --registrar:static - - $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable - - - - - - - - - $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - $(MtouchExtraArgs) --registrar:static - - $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable - - false - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Entitlements.plist b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Entitlements.plist deleted file mode 100644 index 24c31036..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Entitlements.plist +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Info.plist b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Info.plist deleted file mode 100644 index d91e16be..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Info.plist +++ /dev/null @@ -1,63 +0,0 @@ - - - - - CFBundleDisplayName - Microcharts.Sample.Uno - CFBundleIdentifier - com.companyname.Microcharts.Sample.Uno - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UIDeviceFamily - - 1 - 2 - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIAppFonts - - Fonts/uno-fluentui-assets.ttf - - UIViewControllerBasedStatusBarAppearance - - UILaunchImageMinimumOSVersion - 9.0 - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 568} - XSAppIconAssets - Media.xcassets/AppIcons.appiconset - UIApplicationSupportsIndirectInputEvents - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/LaunchScreen.storyboard b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/LaunchScreen.storyboard deleted file mode 100644 index 04a81ae7..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/LaunchScreen.storyboard +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Main.iOS.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Main.iOS.cs deleted file mode 100644 index 67bf051d..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Main.iOS.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UIKit; - -namespace Microcharts.Samples.Uno -{ - public class EntryPoint - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(App)); - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Contents.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Contents.json deleted file mode 100644 index a5c67023..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Contents.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "images": [ - { - "scale": "2x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon58.png" - }, - { - "scale": "3x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon87.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon80.png" - }, - { - "scale": "3x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon180.png" - }, - { - "scale": "1x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon20.png" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "1x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon29.png" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon58.png" - }, - { - "scale": "1x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon80.png" - }, - { - "scale": "1x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon76.png" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon40.png" - }, - { - "scale": "3x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon60.png" - }, - { - "scale": "3x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "2x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "2x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon152.png" - }, - { - "scale": "2x", - "size": "83.5x83.5", - "idiom": "ipad", - "filename": "Icon167.png" - }, - { - "scale": "1x", - "size": "1024x1024", - "idiom": "ios-marketing", - "filename": "Icon1024.png" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png deleted file mode 100644 index c7e45b70..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png deleted file mode 100644 index 5f2aea5e..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png deleted file mode 100644 index c28bde8f..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png deleted file mode 100644 index aeeb0769..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png deleted file mode 100644 index 0a851b8d..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png deleted file mode 100644 index 6f1a958b..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png deleted file mode 100644 index 2d1ce797..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png deleted file mode 100644 index a0ab12a4..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png deleted file mode 100644 index 26ef6c93..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png deleted file mode 100644 index 84bfd00e..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png deleted file mode 100644 index b5ee3611..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png deleted file mode 100644 index 5de98b1c..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png deleted file mode 100644 index 53147588..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json deleted file mode 100644 index 69555e44..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images": [ - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "2x", - "size": "640x960", - "idiom": "iphone" - }, - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "subtype": "retina4", - "scale": "2x", - "size": "640x1136", - "idiom": "iphone" - }, - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "1x", - "size": "768x1024", - "idiom": "ipad" - }, - { - "orientation": "landscape", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "1x", - "size": "1024x768", - "idiom": "ipad" - }, - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "2x", - "size": "1536x2048", - "idiom": "ipad" - }, - { - "orientation": "landscape", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "2x", - "size": "2048x1536", - "idiom": "ipad" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/Default-568h@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/Default-568h@2x.png deleted file mode 100644 index 29973dcb..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/Default-568h@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/Fonts/uno-fluentui-assets.ttf b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/Fonts/uno-fluentui-assets.ttf deleted file mode 100644 index 05518405..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/Fonts/uno-fluentui-assets.ttf and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/SplashScreen@2x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/SplashScreen@2x.png deleted file mode 100644 index f8e793d9..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/SplashScreen@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/SplashScreen@3x.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/SplashScreen@3x.png deleted file mode 100644 index 8c5f3984..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/iOS/Resources/SplashScreen@3x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/App.xaml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/App.xaml deleted file mode 100644 index 03a49b06..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/App.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/App.xaml.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/App.xaml.cs deleted file mode 100644 index eba9973a..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/App.xaml.cs +++ /dev/null @@ -1,183 +0,0 @@ -using Microsoft.Extensions.Logging; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Navigation; -using System; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; - -namespace Microcharts.Samples.Uno -{ - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - public sealed partial class App : Application - { - private Window _window; - - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public App() - { - InitializeLogging(); - - this.InitializeComponent(); - -#if HAS_UNO || NETFX_CORE - this.Suspending += OnSuspending; -#endif - } - - /// - /// Invoked when the application is launched normally by the end user. Other entry points - /// will be used such as when the application is launched to open a specific file. - /// - /// Details about the launch request and process. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { -#if DEBUG - if (System.Diagnostics.Debugger.IsAttached) - { - // this.DebugSettings.EnableFrameRateCounter = true; - } -#endif - -#if NET6_0_OR_GREATER && WINDOWS && !HAS_UNO - _window = new Window(); - _window.Activate(); -#else - _window = Microsoft.UI.Xaml.Window.Current; -#endif - - var rootFrame = _window.Content as Frame; - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == null) - { - // Create a Frame to act as the navigation context and navigate to the first page - rootFrame = new Frame(); - - rootFrame.NavigationFailed += OnNavigationFailed; - - if (args.UWPLaunchActivatedEventArgs.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - // TODO: Load state from previously suspended application - } - - // Place the frame in the current Window - _window.Content = rootFrame; - } - -#if !(NET6_0_OR_GREATER && WINDOWS) - if (args.UWPLaunchActivatedEventArgs.PrelaunchActivated == false) -#endif - { - if (rootFrame.Content == null) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame.Navigate(typeof(MainPage), args.Arguments); - } - // Ensure the current window is active - _window.Activate(); - } - } - - /// - /// Invoked when Navigation to a certain page fails - /// - /// The Frame which failed navigation - /// Details about the navigation failure - void OnNavigationFailed(object sender, NavigationFailedEventArgs e) - { - throw new InvalidOperationException($"Failed to load {e.SourcePageType.FullName}: {e.Exception}"); - } - - /// - /// Invoked when application execution is being suspended. Application state is saved - /// without knowing whether the application will be terminated or resumed with the contents - /// of memory still intact. - /// - /// The source of the suspend request. - /// Details about the suspend request. - private void OnSuspending(object sender, SuspendingEventArgs e) - { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Save application state and stop any background activity - deferral.Complete(); - } - - /// - /// Configures global Uno Platform logging - /// - private static void InitializeLogging() - { -#if DEBUG - // Logging is disabled by default for release builds, as it incurs a significant - // initialization cost from Microsoft.Extensions.Logging setup. If startup performance - // is a concern for your application, keep this disabled. If you're running on web or - // desktop targets, you can use url or command line parameters to enable it. - // - // For more performance documentation: https://platform.uno/docs/articles/Uno-UI-Performance.html - - var factory = LoggerFactory.Create(builder => - { -#if __WASM__ - builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider()); -#elif __IOS__ - builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider()); -#elif NETFX_CORE - builder.AddDebug(); -#else - builder.AddConsole(); -#endif - - // Exclude logs below this level - builder.SetMinimumLevel(LogLevel.Information); - - // Default filters for Uno Platform namespaces - builder.AddFilter("Uno", LogLevel.Warning); - builder.AddFilter("Windows", LogLevel.Warning); - builder.AddFilter("Microsoft", LogLevel.Warning); - - // Generic Xaml events - // builder.AddFilter("Windows.UI.Xaml", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.UIElement", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.FrameworkElement", LogLevel.Trace ); - - // Layouter specific messages - // builder.AddFilter("Windows.UI.Xaml.Controls", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.Controls.Layouter", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.Controls.Panel", LogLevel.Debug ); - - // builder.AddFilter("Windows.Storage", LogLevel.Debug ); - - // Binding related messages - // builder.AddFilter("Windows.UI.Xaml.Data", LogLevel.Debug ); - // builder.AddFilter("Windows.UI.Xaml.Data", LogLevel.Debug ); - - // Binder memory references tracking - // builder.AddFilter("Uno.UI.DataBinding.BinderReferenceHolder", LogLevel.Debug ); - - // RemoteControl and HotReload related - // builder.AddFilter("Uno.UI.RemoteControl", LogLevel.Information); - - // Debug JS interop - // builder.AddFilter("Uno.Foundation.WebAssemblyRuntime", LogLevel.Debug ); - }); - - global::Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory = factory; - -#if HAS_UNO - global::Uno.UI.Adapter.Microsoft.Extensions.Logging.LoggingAdapter.Initialize(); -#endif -#endif - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Assets/SharedAssets.md b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Assets/SharedAssets.md deleted file mode 100644 index c578d778..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Assets/SharedAssets.md +++ /dev/null @@ -1,34 +0,0 @@ -See the documentation about assets here: https://platform.uno/docs/articles/features/working-with-assets.html - -# Here is a cheat sheet: - -1. Add the image file to the `Assets` directory of a shared project. -2. Set the build action to `Content`. -3. (Recommended) Provide an asset for various scales/dpi - -## Examples - -``` -\Assets\Images\logo.scale-100.png -\Assets\Images\logo.scale-200.png -\Assets\Images\logo.scale-400.png - -\Assets\Images\scale-100\logo.png -\Assets\Images\scale-200\logo.png -\Assets\Images\scale-400\logo.png -``` - -## Table of scales - -| Scale | UWP | iOS | Android | -|-------|:-----------:|:--------:|:-------:| -| `100` | scale-100 | @1x | mdpi | -| `125` | scale-125 | N/A | N/A | -| `150` | scale-150 | N/A | hdpi | -| `200` | scale-200 | @2x | xhdpi | -| `300` | scale-300 | @3x | xxhdpi | -| `400` | scale-400 | N/A | xxxhdpi | - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/MainPage.xaml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/MainPage.xaml deleted file mode 100644 index c99cb25b..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/MainPage.xaml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/MainPage.xaml.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/MainPage.xaml.cs deleted file mode 100644 index 64a9ba32..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/MainPage.xaml.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; - -// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409 - -namespace Microcharts.Samples.Uno -{ - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public sealed partial class MainPage : Page - { - public MainPage() - { - this.InitializeComponent(); - var charts = Data.CreateQuickstart(); - this.chart1.Chart = charts[0]; - this.chart2.Chart = charts[1]; - this.chart3.Chart = charts[2]; - this.chart4.Chart = charts[3]; - this.chart5.Chart = charts[4]; - this.chart6.Chart = charts[5]; - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.globs.props b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.globs.props deleted file mode 100644 index 94ce800d..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.globs.props +++ /dev/null @@ -1,34 +0,0 @@ - - - - - <_Globbled_Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="@(Page);@(ApplicationDefinition)"> - Designer - MSBuild:Compile - - - - <_Globbed_Compile Include="$(MSBuildThisFileDirectory)**/*.xaml.cs" Exclude="@(Compile)"> - %(Filename) - - <_Globbed_Compile Include="$(MSBuildThisFileDirectory)**/*.cs" Exclude="@(Compile);@(_Globbed_Compile)" /> - - - <_Globbed_PRIResource Include="$(MSBuildThisFileDirectory)**/*.resw" Exclude="@(PRIResource)" /> - - - <_Globbed_Content Include="$(MSBuildThisFileDirectory)Assets/**/*.*" Exclude="@(Content)" /> - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.projitems b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.projitems deleted file mode 100644 index b2e86190..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.projitems +++ /dev/null @@ -1,39 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 6279c845-92f8-4333-ab99-3d213163593c - - - Microcharts.Samples.Uno - - - - Designer - MSBuild:Compile - - - - - App.xaml - - - MainPage.xaml - - - - - Designer - MSBuild:Compile - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.shproj b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.shproj deleted file mode 100644 index a5aa6534..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Microcharts.Samples.Uno.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 6279c845-92f8-4333-ab99-3d213163593c - 14.0 - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Strings/en/Resources.resw b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Strings/en/Resources.resw deleted file mode 100644 index f1ee0237..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Shared/Strings/en/Resources.resw +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Microcharts.Sample.Uno - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Assets/Fonts/uno-fluentui-assets.ttf b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Assets/Fonts/uno-fluentui-assets.ttf deleted file mode 100644 index 05518405..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Assets/Fonts/uno-fluentui-assets.ttf and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Microcharts.Samples.Uno.Skia.Gtk.csproj b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Microcharts.Samples.Uno.Skia.Gtk.csproj deleted file mode 100644 index 35b5e6e9..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Microcharts.Samples.Uno.Skia.Gtk.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - WinExe - Exe - net6.0 - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Program.cs b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Program.cs deleted file mode 100644 index a3b76882..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Skia.Gtk/Program.cs +++ /dev/null @@ -1,23 +0,0 @@ -using GLib; -using Microcharts.Samples.Uno; -using System; -using Uno.UI.Runtime.Skia; - -namespace Microcharts.Sample.Uno.Skia.Gtk -{ - internal class Program - { - static void Main(string[] args) - { - ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs) - { - Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString()); - expArgs.ExitApplication = true; - }; - - var host = new GtkHost(() => new App()); - - host.Run(); - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/LockScreenLogo.scale-200.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57ad..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/SplashScreen.scale-200.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/SplashScreen.scale-200.png deleted file mode 100644 index 023e7f1f..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square150x150Logo.scale-200.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index af49fec1..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square44x44Logo.scale-200.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index ce342a2e..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index f6c02ce9..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/StoreLogo.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/StoreLogo.png deleted file mode 100644 index 7385b56c..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/StoreLogo.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Wide310x150Logo.scale-200.png b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index 288995b3..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Microcharts.Samples.Uno.Windows.csproj b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Microcharts.Samples.Uno.Windows.csproj deleted file mode 100644 index 3a4f3dc3..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Microcharts.Samples.Uno.Windows.csproj +++ /dev/null @@ -1,60 +0,0 @@ - - - WinExe - net6.0-windows10.0.19041.0 - 10.0.18362.0 - Microcharts.Samples.Uno - app.manifest - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - win10-$(Platform).pubxml - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Microcharts.Samples.Uno.Windows_TemporaryKey.pfx b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Microcharts.Samples.Uno.Windows_TemporaryKey.pfx deleted file mode 100644 index 214372f6..00000000 Binary files a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Microcharts.Samples.Uno.Windows_TemporaryKey.pfx and /dev/null differ diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Package.appxmanifest b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Package.appxmanifest deleted file mode 100644 index 7ebe8433..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Package.appxmanifest +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - Microcharts.Sample.Uno - Microcharts.Sample.Uno - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-arm64.pubxml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-arm64.pubxml deleted file mode 100644 index 8222f33d..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-arm64.pubxml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - FileSystem - arm64 - win10-arm64 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - False - True - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-x64.pubxml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-x64.pubxml deleted file mode 100644 index 6f287591..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-x64.pubxml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - FileSystem - x64 - win10-x64 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - False - True - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-x86.pubxml b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-x86.pubxml deleted file mode 100644 index 1b5476df..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/Properties/win10-x86.pubxml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - FileSystem - x86 - win10-x86 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - False - True - - - diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/launchSettings.json b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/launchSettings.json deleted file mode 100644 index 89fb3425..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/Properties/launchSettings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "profiles": { - "Microcharts.Sample.Uno.Windows": { - "commandName": "MsixPackage" - } - } -} diff --git a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/app.manifest b/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/app.manifest deleted file mode 100644 index bd538e10..00000000 --- a/Sources/Microcharts.Samples.Uno/Microcharts.Samples.Uno.Windows/app.manifest +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - true/PM - PerMonitorV2, PerMonitor - - - diff --git a/Sources/Microcharts.Samples.Uwp/Microcharts.Samples.Uwp.csproj b/Sources/Microcharts.Samples.Uwp/Microcharts.Samples.Uwp.csproj index 604041cd..4258bc31 100644 --- a/Sources/Microcharts.Samples.Uwp/Microcharts.Samples.Uwp.csproj +++ b/Sources/Microcharts.Samples.Uwp/Microcharts.Samples.Uwp.csproj @@ -11,7 +11,7 @@ Microcharts.Samples.Uwp en-US UAP - 10.0.18362.0 + 10.0.22621.0 10.0.18362.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Sources/Microcharts.Samples.iOS/Info.plist b/Sources/Microcharts.Samples.iOS/Info.plist index 8ad9320e..3be58fd9 100644 --- a/Sources/Microcharts.Samples.iOS/Info.plist +++ b/Sources/Microcharts.Samples.iOS/Info.plist @@ -13,7 +13,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 13.2 + 15.0 UIDeviceFamily 12 diff --git a/Sources/Microcharts.Samples.iOS/Microcharts.Samples.iOS.csproj b/Sources/Microcharts.Samples.iOS/Microcharts.Samples.iOS.csproj index 367e81d4..bd2211a7 100644 --- a/Sources/Microcharts.Samples.iOS/Microcharts.Samples.iOS.csproj +++ b/Sources/Microcharts.Samples.iOS/Microcharts.Samples.iOS.csproj @@ -1,112 +1,28 @@  - + - Debug - iPhoneSimulator - {E8626BE1-E233-4F4A-9084-673A987B9231} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + net10.0-ios Exe + disable + true + 15.0 + full Microcharts.Samples.iOS Resources Microcharts.Samples.iOS - NSUrlSessionHandler - - true - full - false - bin\iPhoneSimulator\Debug - DEBUG - prompt - 4 - false - x86_64 - None - true - false - - - none - true - bin\iPhoneSimulator\Release - prompt - 4 - None - x86_64 - false - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - ARM64 - Entitlements.plist + iPhone Developer - true - false - - none - true - bin\iPhone\Release - prompt - 4 - Entitlements.plist - ARM64 - false - iPhone Developer - - - - - - - - - - - - MainViewController.cs - - - - - - - - - - - - false - - - + - + + + - - {8657b9bf-9d8e-4d3a-a5b2-23e9c0161909} - Microcharts.iOS - false - false - - - {6fbe798d-bb43-4bb5-9c61-d6dd5b0e623a} - Microcharts.Samples - - - {d07d3e94-e645-4035-a142-5f933a15d585} - Microcharts - + - - \ No newline at end of file + diff --git a/Sources/Microcharts.Samples.iOS/Properties/AssemblyInfo.cs b/Sources/Microcharts.Samples.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 527a4bf7..00000000 --- a/Sources/Microcharts.Samples.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microcharts.Samples.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microcharts.Samples.iOS")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("E8626BE1-E233-4F4A-9084-673A987B9231")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sources/Microcharts.Samples.iOS/ViewController.cs b/Sources/Microcharts.Samples.iOS/ViewController.cs index 746b9958..268e700a 100644 --- a/Sources/Microcharts.Samples.iOS/ViewController.cs +++ b/Sources/Microcharts.Samples.iOS/ViewController.cs @@ -56,8 +56,8 @@ private void Reload(object sender, EventArgs e) CreateChartCard(new BarChart { Entries = entries, BarAreaAlpha = areaAlpha }); CreateChartCard(new PointChart { Entries = entries, PointAreaAlpha = areaAlpha, PointSize = pointSize }); CreateChartCard(new LineChart { Entries = entries, LineAreaAlpha = areaAlpha, PointMode = PointMode.Square, PointSize = pointSize, LineSize = lineSizeSlider.Value, LineMode = lineMode }); - CreateChartCard(new RadialGaugeChart { Entries = entries, LineAreaAlpha = areaAlpha, MaxValue = entries.Max(x => Math.Abs(x.Value) + 100) }); - CreateChartCard(new RadarChart { Entries = entries, MaxValue = entries.Max(x => Math.Abs(x.Value) + 100) }); + CreateChartCard(new RadialGaugeChart { Entries = entries, LineAreaAlpha = areaAlpha, MaxValue = entries.Max(x => Math.Abs(x.Value!.Value) + 100) }); + CreateChartCard(new RadarChart { Entries = entries, MaxValue = entries.Max(x => Math.Abs(x.Value!.Value) + 100) }); if (!hasSingleColor) { diff --git a/Sources/Microcharts.Samples.macOS/AppDelegate.cs b/Sources/Microcharts.Samples.macOS/AppDelegate.cs deleted file mode 100644 index 24af9991..00000000 --- a/Sources/Microcharts.Samples.macOS/AppDelegate.cs +++ /dev/null @@ -1,23 +0,0 @@ -using AppKit; -using Foundation; - -namespace Microcharts.Samples.macOS -{ - [Register("AppDelegate")] - public class AppDelegate : NSApplicationDelegate - { - public AppDelegate() - { - } - - public override void DidFinishLaunching(NSNotification notification) - { - // Insert code here to initialize your application - } - - public override void WillTerminate(NSNotification notification) - { - // Insert code here to tear down your application - } - } -} diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png deleted file mode 100644 index d0b5a809..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png deleted file mode 100644 index f4c8d290..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png deleted file mode 100644 index ebb5a0fe..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png deleted file mode 100644 index 0986d31b..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png deleted file mode 100644 index f4c8d290..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png deleted file mode 100644 index a142c83f..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png deleted file mode 100644 index 0986d31b..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png deleted file mode 100644 index 412d6ca9..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png deleted file mode 100644 index a142c83f..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index e99022ae..00000000 Binary files a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6b285452..00000000 --- a/Sources/Microcharts.Samples.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images": [ - { - "filename": "AppIcon-16.png", - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-16@2x.png", - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32.png", - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32@2x.png", - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128.png", - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128@2x.png", - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256.png", - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256@2x.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512@2x.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.macOS/Assets.xcassets/Contents.json b/Sources/Microcharts.Samples.macOS/Assets.xcassets/Contents.json deleted file mode 100644 index 4caf392f..00000000 --- a/Sources/Microcharts.Samples.macOS/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Sources/Microcharts.Samples.macOS/Entitlements.plist b/Sources/Microcharts.Samples.macOS/Entitlements.plist deleted file mode 100644 index 9ae59937..00000000 --- a/Sources/Microcharts.Samples.macOS/Entitlements.plist +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Sources/Microcharts.Samples.macOS/Info.plist b/Sources/Microcharts.Samples.macOS/Info.plist deleted file mode 100644 index fd2b35dc..00000000 --- a/Sources/Microcharts.Samples.macOS/Info.plist +++ /dev/null @@ -1,33 +0,0 @@ - - - - - CFBundleName - Microcharts - CFBundleIdentifier - com.Microcharts - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.12 - CFBundleDevelopmentRegion - en - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - NSHumanReadableCopyright - ${AuthorCopyright:HtmlEncode} - NSPrincipalClass - NSApplication - NSMainStoryboardFile - Main - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - - - diff --git a/Sources/Microcharts.Samples.macOS/Main.cs b/Sources/Microcharts.Samples.macOS/Main.cs deleted file mode 100644 index a860b6e7..00000000 --- a/Sources/Microcharts.Samples.macOS/Main.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AppKit; - -namespace Microcharts.Samples.macOS -{ - static class MainClass - { - static void Main(string[] args) - { - NSApplication.Init(); - NSApplication.Main(args); - } - } -} diff --git a/Sources/Microcharts.Samples.macOS/Main.storyboard b/Sources/Microcharts.Samples.macOS/Main.storyboard deleted file mode 100644 index 13284d2b..00000000 --- a/Sources/Microcharts.Samples.macOS/Main.storyboard +++ /dev/null @@ -1,681 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Samples.macOS/Microcharts.Samples.macOS.csproj b/Sources/Microcharts.Samples.macOS/Microcharts.Samples.macOS.csproj deleted file mode 100644 index 370fe9fe..00000000 --- a/Sources/Microcharts.Samples.macOS/Microcharts.Samples.macOS.csproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - Debug - AnyCPU - {1F1EDFB9-8305-46AD-B427-DDD92A87969E} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - Microcharts.Samples.macOS - Microcharts.Sample.macOS - v2.0 - Xamarin.Mac - Resources - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false - Mac Developer - false - false - false - true - true - HttpClientHandler - None - x86_64 - - - pdbonly - true - bin\Release - - - prompt - 4 - false - true - false - true - true - true - SdkOnly - HttpClientHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ViewController.cs - - - - - - - - - - - {6fbe798d-bb43-4bb5-9c61-d6dd5b0e623a} - Microcharts.Samples - - - {D07D3E94-E645-4035-A142-5F933A15D585} - Microcharts - - - {5F02212C-95CB-42A3-850F-C076267BB5DC} - Microcharts.macOS - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples.macOS/ViewController.cs b/Sources/Microcharts.Samples.macOS/ViewController.cs deleted file mode 100644 index 091bed76..00000000 --- a/Sources/Microcharts.Samples.macOS/ViewController.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; - -using AppKit; -using Microcharts.macOS; -using System.Linq; - -namespace Microcharts.Samples.macOS -{ - public partial class ViewController : NSViewController - { - public ViewController(IntPtr handle) : base(handle) - { - } - - public override void ViewDidLoad() - { - base.ViewDidLoad(); - - var chartView = new ChartView() - { - Chart = Data.CreateQuickstart().ElementAt(2), - Frame = this.View.Bounds, - AutoresizingMask = NSViewResizingMask.WidthSizable | NSViewResizingMask.HeightSizable - }; - - this.View.AddSubview(chartView); - } - } -} diff --git a/Sources/Microcharts.Samples.macOS/ViewController.designer.cs b/Sources/Microcharts.Samples.macOS/ViewController.designer.cs deleted file mode 100644 index f4137aa0..00000000 --- a/Sources/Microcharts.Samples.macOS/ViewController.designer.cs +++ /dev/null @@ -1,18 +0,0 @@ -// WARNING -// -// This file has been generated automatically by Xamarin Studio to store outlets and -// actions made in the UI designer. If it is removed, they will be lost. -// Manual changes to this file may not be handled correctly. -// -using Foundation; - -namespace Microcharts.Samples.macOS -{ - [Register("ViewController")] - partial class ViewController - { - void ReleaseDesignerOutlets() - { - } - } -} diff --git a/Sources/Microcharts.Samples.macOS/app.config b/Sources/Microcharts.Samples.macOS/app.config deleted file mode 100644 index addd28c2..00000000 --- a/Sources/Microcharts.Samples.macOS/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/Microcharts.Samples/Data.cs b/Sources/Microcharts.Samples/Data.cs index 92a51743..4f715243 100644 --- a/Sources/Microcharts.Samples/Data.cs +++ b/Sources/Microcharts.Samples/Data.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using SkiaSharp; +#pragma warning disable CS0618 // Type or member is obsolete namespace Microcharts.Samples { @@ -91,8 +92,8 @@ public static (string label, int value)[] NegativeData = public static Chart[] CreateXamarinLegacySample() { ChartEntry[] entries = GenerateDefaultXamarinEntries(); - return new Chart[] - { + return + [ new LegacyBarChart { Entries = entries, @@ -113,16 +114,16 @@ public static Chart[] CreateXamarinLegacySample() LabelTextSize = 42, PointMode = PointMode.Square, PointSize = 18, - }, - }; + } + ]; } public static Chart[] CreateXamarinSample() { ChartEntry[] entries = GenerateDefaultXamarinEntries(); Random r = new Random(18); - return new Chart[] - { + return + [ new BarChart { LabelOrientation = Orientation.Horizontal, @@ -235,14 +236,14 @@ public static Chart[] CreateXamarinSample() { Entries = entries, LabelTextSize = 42 - }, - }; + } + ]; } private static ChartEntry[] GenerateDefaultXamarinEntries() { - return new[] - { + return + [ new ChartEntry(112) { Label = "UWP", @@ -273,36 +274,25 @@ private static ChartEntry[] GenerateDefaultXamarinEntries() ValueLabel = "514", Color = SKColor.Parse("#3498db"), } - }; + ]; } public static IEnumerable CreateXamarinExampleChartItem(string chartType) { - switch (chartType) + return chartType switch { - case nameof(LegacyBarChart): - return GenerateBarChartExample(); - case nameof(LegacyPointChart): - return GeneratePointChartExample(); - case nameof(LegacyLineChart): - return GenerateLineChartExample(); - case nameof(DonutChart): - return GenerateDonutChartExample(); - case nameof(RadialGaugeChart): - return GenerateRadialGaugeChartExample(); - case nameof(HalfRadialGaugeChart): - return GenerateHalfRadialGaugeChartExample(); - case nameof(RadarChart): - return GenerateRadarChartExample(); - case nameof(BarChart): - return GenerateGroupedBarChartExample(); - case nameof(PointChart): - return GeneratePointSeriesChartExample(); - case nameof(LineChart): - return GenerateLineSeriesChartExample(); - default: - return null; - } + nameof(LegacyBarChart) => GenerateBarChartExample(), + nameof(LegacyPointChart) => GeneratePointChartExample(), + nameof(LegacyLineChart) => GenerateLineChartExample(), + nameof(DonutChart) => GenerateDonutChartExample(), + nameof(RadialGaugeChart) => GenerateRadialGaugeChartExample(), + nameof(HalfRadialGaugeChart) => GenerateHalfRadialGaugeChartExample(), + nameof(RadarChart) => GenerateRadarChartExample(), + nameof(BarChart) => GenerateGroupedBarChartExample(), + nameof(PointChart) => GeneratePointSeriesChartExample(), + nameof(LineChart) => GenerateLineSeriesChartExample(), + _ => null + }; } private static IEnumerable GenerateLineChartExample() @@ -357,8 +347,6 @@ private static IEnumerable GenerateLineChartExample() YAxisPosition = Position.Left } }; - - yield break; } private static IEnumerable GenerateDonutChartExample() @@ -402,8 +390,6 @@ private static IEnumerable GenerateDonutChartExample() LabelMode = LabelMode.RightOnly }, }; - - yield break; } private static IEnumerable GenerateRadialGaugeChartExample() @@ -418,8 +404,6 @@ private static IEnumerable GenerateRadialGaugeChartExample() LabelTextSize = 42 }, }; - - yield break; } private static IEnumerable GenerateHalfRadialGaugeChartExample() @@ -450,13 +434,11 @@ private static IEnumerable GenerateRadarChartExample() LabelTextSize = 42 }, }; - - yield break; } private static IEnumerable GenerateGroupedBarChartExample() { - Random r = new Random((int)DateTime.Now.Ticks); + var r = new Random((int)DateTime.Now.Ticks); yield return new ExampleChartItem() { ExampleName = "Default", @@ -1181,8 +1163,6 @@ private static IEnumerable GeneratePointSeriesChartExample() } }, }; - - yield break; } private static IEnumerable GenerateLineSeriesChartExample() @@ -1493,8 +1473,6 @@ private static IEnumerable GeneratePointChartExample() YAxisPosition = Position.Left } }; - - yield break; } private static IEnumerable GenerateBarChartExample() @@ -1541,8 +1519,6 @@ private static IEnumerable GenerateBarChartExample() YAxisPosition = Position.Left } }; - - yield break; } public static IEnumerable GenerateTimeSeriesEntry( Random r, int idx, int seconds, bool withNulls = true) @@ -1692,7 +1668,7 @@ public static ChartEntry[] CreateEntries(int values, bool hasPositiveValues, boo } else { - data = new (string label, int value)[0]; + data = []; } data = data.Take(values).ToArray(); diff --git a/Sources/Microcharts.Samples/Microcharts.Samples.csproj b/Sources/Microcharts.Samples/Microcharts.Samples.csproj index fca91c95..2116d81f 100644 --- a/Sources/Microcharts.Samples/Microcharts.Samples.csproj +++ b/Sources/Microcharts.Samples/Microcharts.Samples.csproj @@ -1,13 +1,8 @@  - - netstandard2.0 + net10.0 - - - - diff --git a/Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj b/Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj deleted file mode 100644 index 29656877..00000000 --- a/Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - netstandard2.0; - enable - 9 - - Simple, cross-platform chart library for Uno WinUI. - WinUI dotnet chart skia skiasharp windows uno - - - - $(DefineConstants)TRACE;WINUI - - - - $(DefineConstants)TRACE;WINUI - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Uno/Microcharts.Uno.csproj b/Sources/Microcharts.Uno/Microcharts.Uno.csproj deleted file mode 100644 index de370ec1..00000000 --- a/Sources/Microcharts.Uno/Microcharts.Uno.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - netstandard2.0 - enable - 9 - - Simple, cross-platform chart library for Uno. - dotnet chart skia skiasharp uno - - - - - - - - - - - - - - - - diff --git a/Sources/Microcharts.Uwp/Microcharts.Uwp.csproj b/Sources/Microcharts.Uwp/Microcharts.Uwp.csproj index fc297df6..b45eb847 100644 --- a/Sources/Microcharts.Uwp/Microcharts.Uwp.csproj +++ b/Sources/Microcharts.Uwp/Microcharts.Uwp.csproj @@ -11,7 +11,7 @@ Microcharts.Uwp en-US UAP - 10.0.19041.0 + 10.0.22621.0 10.0.17134.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -119,7 +119,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Sources/Microcharts.WinUI/Microcharts.WinUI.csproj b/Sources/Microcharts.WinUI/Microcharts.WinUI.csproj index 6bf6fcee..933bbbaf 100644 --- a/Sources/Microcharts.WinUI/Microcharts.WinUI.csproj +++ b/Sources/Microcharts.WinUI/Microcharts.WinUI.csproj @@ -26,7 +26,7 @@ - + diff --git a/Sources/Microcharts.iOS/Microcharts.iOS.csproj b/Sources/Microcharts.iOS/Microcharts.iOS.csproj index 45397afb..5132cc9e 100644 --- a/Sources/Microcharts.iOS/Microcharts.iOS.csproj +++ b/Sources/Microcharts.iOS/Microcharts.iOS.csproj @@ -1,64 +1,16 @@ - - + - Debug - AnyCPU - {8657B9BF-9D8E-4D3A-A5B2-23E9C0161909} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library + net10.0-ios + disable + true + true Microcharts.iOS Microcharts.iOS - Resources - latest - Simple, cross-platform chart library for Xamarin.iOS. - xamarin ios chart skia + Simple, cross-platform chart library for dotnet iOS. + maui ios chart skia - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - iPhone Developer - true - true - true - true - 62738 - false - - - - - - - none - true - bin\Release - - - prompt - 3 - iPhone Developer - true - SdkOnly - - - - - - - - - - - - - - + 6.5.0 runtime; build; native; contentfiles; analyzers; buildtransitive @@ -66,10 +18,6 @@ - - {D07D3E94-E645-4035-A142-5F933A15D585} - Microcharts - + - - + \ No newline at end of file diff --git a/Sources/Microcharts.iOS/Properties/AssemblyInfo.cs b/Sources/Microcharts.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 0e21123b..00000000 --- a/Sources/Microcharts.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Microcharts.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("${AuthorCopyright}")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Sources/Microcharts.macOS/ChartView.cs b/Sources/Microcharts.macOS/ChartView.cs deleted file mode 100644 index baf86695..00000000 --- a/Sources/Microcharts.macOS/ChartView.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using Foundation; -using SkiaSharp; -using SkiaSharp.Views.Mac; - -namespace Microcharts.macOS -{ - [Register("ChartView")] - public class ChartView : SKCanvasView - { - #region Constructors - - public ChartView() - { - Initialize(); - } - - [Preserve] - public ChartView(IntPtr handle) : base(handle) - { - } - - public override void AwakeFromNib() - { - base.AwakeFromNib(); - Initialize(); - } - - private void Initialize() - { - this.PaintSurface += OnPaintCanvas; - } - - #endregion - - #region Fields - - private InvalidatedWeakEventHandler handler; - - private Chart chart; - - #endregion - - #region Properties - - public Chart Chart - { - get => this.chart; - set - { - if (this.chart != value) - { - if (this.chart != null) - { - handler.Dispose(); - this.handler = null; - } - - this.chart = value; - this.InvalidateChart(); - - if (this.chart != null) - { - this.handler = this.chart.ObserveInvalidate(this, (view) => view.InvalidateChart()); - } - } - } - } - - #endregion - - #region Methods - - private void InvalidateChart() => this.SetNeedsDisplayInRect(this.Bounds); - - private void OnPaintCanvas(object sender, SKPaintSurfaceEventArgs e) - { - if (this.chart != null) - { - this.chart.Draw(e.Surface.Canvas, e.Info.Width, e.Info.Height); - } - else - { - e.Surface.Canvas.Clear(SKColors.Transparent); - } - } - - #endregion - } -} diff --git a/Sources/Microcharts.macOS/Microcharts.macOS.csproj b/Sources/Microcharts.macOS/Microcharts.macOS.csproj deleted file mode 100644 index 5b8c2d85..00000000 --- a/Sources/Microcharts.macOS/Microcharts.macOS.csproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - Debug - AnyCPU - {5F02212C-95CB-42A3-850F-C076267BB5DC} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Microcharts.macOS - Microcharts.macOS - v2.0 - Xamarin.Mac - Resources - latest - Simple, cross-platform chart library for Xamarin.Mac. - xamarin mac chart skia - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false - false - false - false - false - - - - - - - - - true - bin\Release - - - prompt - 3 - false - false - false - false - false - - - - - - - - - - - - - - - - - - - 6.5.0 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - {D07D3E94-E645-4035-A142-5F933A15D585} - Microcharts - - - - \ No newline at end of file diff --git a/Sources/Microcharts.macOS/Properties/AssemblyInfo.cs b/Sources/Microcharts.macOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 22211750..00000000 --- a/Sources/Microcharts.macOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Microcharts.macOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("${AuthorCopyright}")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Sources/Microcharts.sln b/Sources/Microcharts.sln index d12c1f24..932117f8 100644 --- a/Sources/Microcharts.sln +++ b/Sources/Microcharts.sln @@ -8,60 +8,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{4F0AFDCA-C6AB-43A5-9F52-C271DCDC46FD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Forms", "Microcharts.Forms\Microcharts.Forms.csproj", "{09B1401F-E6C1-42E9-A721-8A4FCD77B14A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Forms", "Microcharts.Samples.Forms\Microcharts.Samples.Forms\Microcharts.Samples.Forms.csproj", "{72AAF4AA-B414-4E26-BCE2-C25DBC0F498C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples", "Microcharts.Samples\Microcharts.Samples.csproj", "{299BCEF9-2A16-4AA0-81EE-1DC075F18FED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.Forms.Android", "Microcharts.Samples.Forms\Microcharts.Samples.Forms.Android\Microcharts.Samples.Forms.Android.csproj", "{57F645D7-DBC4-432D-85BE-865900B02AEF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.Forms.iOS", "Microcharts.Samples.Forms\Microcharts.Samples.Forms.iOS\Microcharts.Samples.Forms.iOS.csproj", "{28DC5F01-070C-4117-A46F-C4855430DB4A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Avalonia", "Microcharts.Avalonia\Microcharts.Avalonia.csproj", "{7255A6CD-3F59-44AB-9CA4-5269D8E9D762}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Droid", "Microcharts.Droid\Microcharts.Droid.csproj", "{18125022-45E6-46EC-855C-B36E4D41484D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Eto", "Microcharts.Eto\Microcharts.Eto.csproj", "{9F697786-6B47-4D76-A1B1-756246AA8EAE}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.iOS", "Microcharts.iOS\Microcharts.iOS.csproj", "{8657B9BF-9D8E-4D3A-A5B2-23E9C0161909}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.macOS", "Microcharts.macOS\Microcharts.macOS.csproj", "{5F02212C-95CB-42A3-850F-C076267BB5DC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Maui", "Microcharts.Maui\Microcharts.Maui.csproj", "{D0E9420B-C2D7-4556-9117-4F7C9009C0EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Uno", "Microcharts.Uno\Microcharts.Uno.csproj", "{3841C36D-39A6-4F3B-8CC6-702CDA252EF5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Uno.WinUI", "Microcharts.Uno.WinUI\Microcharts.Uno.WinUI.csproj", "{F8293FD5-928F-40F4-A54B-764C6BE21993}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Uwp", "Microcharts.Uwp\Microcharts.Uwp.csproj", "{4E28FCDE-60F6-45AE-B444-701D5F30BEFF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.WinUI", "Microcharts.WinUI\Microcharts.WinUI.csproj", "{7AF9A20B-09BD-4EE1-8CB1-E1C8E090DC8B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.Android", "Microcharts.Samples.Android\Microcharts.Samples.Android.csproj", "{CC996DF4-E262-45B8-A450-D1E881FBE54D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Avalonia", "Microcharts.Samples.Avalonia\Microcharts.Samples.Avalonia.csproj", "{582B34F4-B6A1-414E-96ED-608FEF7EABBA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Eto", "Microcharts.Samples.Eto\Microcharts.Samples.Eto.csproj", "{2DC35D6A-9581-4491-9B76-9CDA37B05E8F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.iOS", "Microcharts.Samples.iOS\Microcharts.Samples.iOS.csproj", "{E8626BE1-E233-4F4A-9084-673A987B9231}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.macOS", "Microcharts.Samples.macOS\Microcharts.Samples.macOS.csproj", "{1F1EDFB9-8305-46AD-B427-DDD92A87969E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Maui", "Microcharts.Samples.Maui\Microcharts.Samples.Maui.csproj", "{5B563D75-B77C-437F-92AE-0AE4BA3E4E52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Uno.Mobile", "Microcharts.Samples.Uno\Microcharts.Samples.Uno.Mobile\Microcharts.Samples.Uno.Mobile.csproj", "{96546BD0-8097-4643-8E55-A6DF95563957}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Uno.Skia.Gtk", "Microcharts.Samples.Uno\Microcharts.Samples.Uno.Skia.Gtk\Microcharts.Samples.Uno.Skia.Gtk.csproj", "{E47F45AD-7EB7-4FCA-AD2F-13A1E1FCCE8F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.Uno.Windows", "Microcharts.Samples.Uno\Microcharts.Samples.Uno.Windows\Microcharts.Samples.Uno.Windows.csproj", "{DDE822A1-E422-4DD3-9D93-97FF9ECF0ED7}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microcharts.Samples.Uwp", "Microcharts.Samples.Uwp\Microcharts.Samples.Uwp.csproj", "{33901013-B4A3-4182-9048-49F2CF940429}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microcharts.Samples.WinUI", "Microcharts.Samples.WinUI\Microcharts.Samples.WinUI.csproj", "{3BC8F77F-992B-4E0F-962F-C60C28C1DA7F}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microcharts.Samples.Uno.Shared", "Microcharts.Samples.Uno\Microcharts.Samples.Uno.Shared\Microcharts.Samples.Uno.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A0AF5E95-DCE8-44D6-B2F1-CBEC22A07345}" ProjectSection(SolutionItems) = preProject ..\.github\workflows\CI-MacOS.yml = ..\.github\workflows\CI-MacOS.yml @@ -1878,10 +1850,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BCCD19D6-0567-4462-A494-5848BD95715F} EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Microcharts.Samples.Uno\Microcharts.Samples.Uno.Shared\Microcharts.Samples.Uno.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - Microcharts.Samples.Uno\Microcharts.Samples.Uno.Shared\Microcharts.Samples.Uno.Shared.projitems*{96546bd0-8097-4643-8e55-a6df95563957}*SharedItemsImports = 5 - Microcharts.Samples.Uno\Microcharts.Samples.Uno.Shared\Microcharts.Samples.Uno.Shared.projitems*{dde822a1-e422-4dd3-9d93-97ff9ecf0ed7}*SharedItemsImports = 5 - Microcharts.Samples.Uno\Microcharts.Samples.Uno.Shared\Microcharts.Samples.Uno.Shared.projitems*{e47f45ad-7eb7-4fca-ad2f-13a1e1fcce8f}*SharedItemsImports = 5 - EndGlobalSection EndGlobal diff --git a/Sources/Microcharts/Charts/AxisBasedChart.cs b/Sources/Microcharts/Charts/AxisBasedChart.cs index fc195bd3..b7024d82 100644 --- a/Sources/Microcharts/Charts/AxisBasedChart.cs +++ b/Sources/Microcharts/Charts/AxisBasedChart.cs @@ -30,6 +30,8 @@ public AxisBasedChart() Style = SKPaintStyle.StrokeAndFill, }; + YAxisTextFont = new SKFont(); + YAxisLinesPaint = new SKPaint { Color = SKColors.Black.WithAlpha(0x50), @@ -150,6 +152,11 @@ public float SerieLabelTextSize /// public SKPaint YAxisTextPaint { get; set; } + /// + /// Y Axis Font + /// + public SKFont YAxisTextFont { get; set; } + /// /// Y Axis Paint /// @@ -178,7 +185,7 @@ public override void DrawContent(SKCanvas canvas, int width, int height) float minValue = MinValue; //This function might change the min/max value - width = MeasureHelper.CalculateYAxis(ShowYAxisText, ShowYAxisLines, entries, YAxisMaxTicks, YAxisTextPaint, YAxisPosition, width, fixedRange, ref maxValue, ref minValue, out float yAxisXShift, out List yAxisIntervalLabels); + width = MeasureHelper.CalculateYAxis(ShowYAxisText, ShowYAxisLines, entries, YAxisMaxTicks, YAxisTextPaint, YAxisTextFont, YAxisPosition, width, fixedRange, ref maxValue, ref minValue, out float yAxisXShift, out List yAxisIntervalLabels); float valRange = maxValue - minValue; var firstSerie = Series.FirstOrDefault(); @@ -204,7 +211,7 @@ public override void DrawContent(SKCanvas canvas, int width, int height) var itemSize = CalculateItemSize(nbItems, width, height, footerHeight + headerHeight + legendHeight); var barSize = CalculateBarSize(itemSize, Series.Count()); var origin = CalculateYOrigin(itemSize.Height, headerWithLegendHeight, maxValue, minValue, valRange); - DrawHelper.DrawYAxis(ShowYAxisText, ShowYAxisLines, YAxisPosition, YAxisTextPaint, YAxisLinesPaint, Margin, AnimationProgress, maxValue, valRange, canvas, width, yAxisXShift, yAxisIntervalLabels, headerHeight, itemSize, origin); + DrawHelper.DrawYAxis(ShowYAxisText, ShowYAxisLines, YAxisPosition, YAxisTextFont, YAxisTextPaint, YAxisLinesPaint, Margin, AnimationProgress, maxValue, valRange, canvas, width, yAxisXShift, yAxisIntervalLabels, headerHeight, itemSize, origin); int nbSeries = series.Count(); for (int serieIndex = 0; serieIndex < nbSeries; serieIndex++) @@ -319,7 +326,7 @@ private void DrawLegend(SKCanvas canvas, SKRect[] seriesNameSize, float legendHe { var serie = series[i]; var serieBound = seriesNameSize[i]; - + float legentItemWidth = Margin + SerieLabelTextSize + Margin + serieBound.Width; if (legentItemWidth > width) { @@ -351,29 +358,28 @@ private float GenerateSerieLegend(SKCanvas canvas, float lineHeight, float origi var lblColor = LabelColor.WithAlpha((byte)(LabelColor.Alpha * AnimationProgress)); var yPosition = origin + (nbLine - 1) * (lineHeight + Margin); var rect = SKRect.Create(currentWidthUsed + Margin, yPosition, SerieLabelTextSize, SerieLabelTextSize); - using (var paint = new SKPaint - { - Style = SKPaintStyle.Fill, - Color = legendColor - }) + using (var paint = new SKPaint()) { + paint.Style = SKPaintStyle.Fill; + paint.Color = legendColor; canvas.DrawRect(rect, paint); } currentWidthUsed += Margin + SerieLabelTextSize + Margin; + using (var font = new SKFont()) using (var paint = new SKPaint()) { - paint.TextSize = SerieLabelTextSize; + font.Size = SerieLabelTextSize; + font.Typeface = Typeface; + paint.IsAntialias = true; paint.Color = lblColor; paint.IsStroke = false; - paint.Typeface = Typeface; - var bounds = new SKRect(); - paint.MeasureText(serie.Name, ref bounds); + font.MeasureText(serie.Name, out var bounds); //Vertical center align the text to the legend color box float textYPosition = rect.Bottom - ((rect.Bottom - rect.Top) / 2) + (bounds.Height / 2); - canvas.DrawText(serie.Name, currentWidthUsed, textYPosition, paint); + canvas.DrawText(serie.Name, currentWidthUsed, textYPosition, font, paint); currentWidthUsed += bounds.Width; } @@ -426,24 +432,22 @@ private float CalculateYOrigin(float itemHeight, float headerHeight, float max, private Dictionary MeasureValueLabels() { var dict = new Dictionary(); - using (var paint = new SKPaint()) + using var font = new SKFont(); + font.Size = valueLabelTextSize; + + foreach (var e in entries) { - paint.TextSize = ValueLabelTextSize; - foreach (var e in entries) + SKRect bounds; + if (string.IsNullOrEmpty(e.ValueLabel)) { - SKRect bounds; - if (string.IsNullOrEmpty(e.ValueLabel)) - { - bounds = SKRect.Empty; - } - else - { - bounds = new SKRect(); - paint.MeasureText(e.ValueLabel, ref bounds); - } - - dict.Add(e, bounds); + bounds = SKRect.Empty; } + else + { + font.MeasureText(e.ValueLabel, out bounds); + } + + dict.Add(e, bounds); } return dict; diff --git a/Sources/Microcharts/Charts/Legacy/LegacyPointChart.cs b/Sources/Microcharts/Charts/Legacy/LegacyPointChart.cs index 9b67288d..6012fefd 100644 --- a/Sources/Microcharts/Charts/Legacy/LegacyPointChart.cs +++ b/Sources/Microcharts/Charts/Legacy/LegacyPointChart.cs @@ -34,6 +34,8 @@ public LegacyPointChart() Style = SKPaintStyle.StrokeAndFill, }; + YAxisTextFont = new SKFont(); + YAxisLinesPaint = new SKPaint { Color = SKColors.Black.WithAlpha(0x50), @@ -77,6 +79,11 @@ public LegacyPointChart() /// public SKPaint YAxisTextPaint { get; set; } + /// + /// Y Axis Font + /// + public SKFont YAxisTextFont { get; set; } + /// /// Y Axis Paint /// @@ -130,7 +137,7 @@ public override void DrawContent(SKCanvas canvas, int width, int height) { float maxValue = MaxValue; float minValue = MinValue; - width = MeasureHelper.CalculateYAxis(ShowYAxisText, ShowYAxisLines, Entries, YAxisMaxTicks, YAxisTextPaint, YAxisPosition, width, false, ref maxValue, ref minValue, out float yAxisXShift, out List yAxisIntervalLabels); + width = MeasureHelper.CalculateYAxis(ShowYAxisText, ShowYAxisLines, Entries, YAxisMaxTicks, YAxisTextPaint, YAxisTextFont, YAxisPosition, width, false, ref maxValue, ref minValue, out float yAxisXShift, out List yAxisIntervalLabels); var labels = Entries.Select(x => x.Label).ToArray(); var labelSizes = MeasureHelper.MeasureTexts(labels, LabelTextSize); var footerHeight = MeasureHelper.CalculateFooterHeaderHeight(Margin, LabelTextSize, labelSizes, LabelOrientation); @@ -142,7 +149,7 @@ public override void DrawContent(SKCanvas canvas, int width, int height) var itemSize = CalculateItemSize(width, height, footerHeight, headerHeight); var origin = CalculateYOrigin(itemSize.Height, headerHeight); var points = CalculatePoints(itemSize, origin, headerHeight, yAxisXShift); - DrawHelper.DrawYAxis(ShowYAxisText, ShowYAxisLines, YAxisPosition, YAxisTextPaint, YAxisLinesPaint, Margin, AnimationProgress, MaxValue, ValueRange, canvas, width, yAxisXShift, yAxisIntervalLabels, headerHeight, itemSize, origin); + DrawHelper.DrawYAxis(ShowYAxisText, ShowYAxisLines, YAxisPosition, YAxisTextFont, YAxisTextPaint, YAxisLinesPaint, Margin, AnimationProgress, MaxValue, ValueRange, canvas, width, yAxisXShift, yAxisIntervalLabels, headerHeight, itemSize, origin); DrawAreas(canvas, points, itemSize, origin, headerHeight); DrawPoints(canvas, points); diff --git a/Sources/Microcharts/Extensions/CanvasExtensions.cs b/Sources/Microcharts/Extensions/CanvasExtensions.cs index efc32afa..2ae8b7c1 100644 --- a/Sources/Microcharts/Extensions/CanvasExtensions.cs +++ b/Sources/Microcharts/Extensions/CanvasExtensions.cs @@ -22,60 +22,54 @@ public static void DrawCaptionLabels(this SKCanvas canvas, string label, SKColor if (hasLabel) { - using (var paint = new SKPaint - { - TextSize = textSize, - IsAntialias = true, - Color = labelColor, - IsStroke = false, - TextAlign = horizontalAlignment, - Typeface = typeface - }) - { - var bounds = new SKRect(); - var text = label; - paint.MeasureText(text, ref bounds); + using var font = new SKFont(); + font.Size = textSize; + font.Typeface = typeface; - var y = point.Y - ((bounds.Top + bounds.Bottom) / 2) - space; + using var paint = new SKPaint(); + paint.IsAntialias = true; + paint.Color = labelColor; + paint.IsStroke = false; - canvas.DrawText(text, point.X, y, paint); + var text = label; + font.MeasureText(text, out var bounds); - var labelBounds = GetAbsolutePositionRect(point.X, y, bounds, horizontalAlignment); - totalBounds = labelBounds.Standardized; - } + var y = point.Y - ((bounds.Top + bounds.Bottom) / 2) - space; + + canvas.DrawText(text, point.X, y, horizontalAlignment, font, paint); + + var labelBounds = GetAbsolutePositionRect(point.X, y, bounds, horizontalAlignment); + totalBounds = labelBounds.Standardized; } if (hasValueLabel) { - using (var paint = new SKPaint() - { - TextSize = textSize, - IsAntialias = true, - FakeBoldText = true, - Color = valueColor, - IsStroke = false, - TextAlign = horizontalAlignment, - Typeface = typeface - }) - { - var bounds = new SKRect(); - var text = value; - paint.MeasureText(text, ref bounds); + using var font = new SKFont(); + font.Size = textSize; + font.Typeface = typeface; + font.Embolden = true; + + using var paint = new SKPaint(); + paint.IsAntialias = true; + paint.Color = valueColor; + paint.IsStroke = false; + + var text = value; + font.MeasureText(text, out var bounds); - var y = point.Y - ((bounds.Top + bounds.Bottom) / 2) + space; + var y = point.Y - ((bounds.Top + bounds.Bottom) / 2) + space; - canvas.DrawText(text, point.X, y, paint); + canvas.DrawText(text, point.X, y, horizontalAlignment, font, paint); - var valueBounds = GetAbsolutePositionRect(point.X, y, bounds, horizontalAlignment); + var valueBounds = GetAbsolutePositionRect(point.X, y, bounds, horizontalAlignment); - if (totalBounds.IsEmpty) - { - totalBounds = valueBounds.Standardized; - } - else - { - totalBounds.Union(valueBounds.Standardized); - } + if (totalBounds.IsEmpty) + { + totalBounds = valueBounds.Standardized; + } + else + { + totalBounds.Union(valueBounds.Standardized); } } } @@ -143,12 +137,14 @@ public static void DrawGradientLine(this SKCanvas canvas, SKPoint startPoint, SK /// /// The canvas. /// The text to display + /// The text alignment + /// The font to use for text and calculations /// The paint to use for text and calculations /// The baseLine point where to vertically draw /// https://stackoverflow.com/questions/27631736/meaning-of-top-ascent-baseline-descent-bottom-and-leading-in-androids-font - public static void DrawTextCenteredVertically(this SKCanvas canvas, string text, SKPaint paint, SKPoint point) + public static void DrawTextCenteredVertically(this SKCanvas canvas, string text, SKTextAlign textAlign, SKFont font, SKPaint paint, SKPoint point) { - canvas.DrawTextCenteredVertically(text, paint, point.X, point.Y); + canvas.DrawTextCenteredVertically(text, textAlign, font, paint, point.X, point.Y); } /// @@ -156,14 +152,16 @@ public static void DrawTextCenteredVertically(this SKCanvas canvas, string text, /// /// The canvas. /// The text to display + /// The text alignment + /// The font to use for text and calculations /// The paint to use for text and calculations /// The baseLine point x where to vertically draw /// The baseLine point y where to vertically draw /// https://stackoverflow.com/questions/27631736/meaning-of-top-ascent-baseline-descent-bottom-and-leading-in-androids-font - public static void DrawTextCenteredVertically(this SKCanvas canvas, string text, SKPaint paint, float x, float y) + public static void DrawTextCenteredVertically(this SKCanvas canvas, string text, SKTextAlign textAlign, SKFont font, SKPaint paint, float x, float y) { - var textY = y + (((-paint.FontMetrics.Ascent + paint.FontMetrics.Descent) / 2) - paint.FontMetrics.Descent); - canvas.DrawText(text, x, textY, paint); + var textY = y + (((-font.Metrics.Ascent + font.Metrics.Descent) / 2) - font.Metrics.Descent); + canvas.DrawText(text, x, textY, textAlign, font, paint); } /// diff --git a/Sources/Microcharts/Helpers/DelayTimer.cs b/Sources/Microcharts/Helpers/DelayTimer.cs index 98d454be..36c5cab3 100644 --- a/Sources/Microcharts/Helpers/DelayTimer.cs +++ b/Sources/Microcharts/Helpers/DelayTimer.cs @@ -1,4 +1,4 @@ -// Copyright (c) Aloïs DENIEL. All rights reserved. +// Copyright (c) Aloïs DENIEL. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using Microcharts.Abstracts; @@ -7,6 +7,7 @@ namespace Microcharts { using System; using System.Threading.Tasks; + using ITimer = Abstracts.ITimer; /// /// A timer based on Task.Delay. diff --git a/Sources/Microcharts/Helpers/DrawHelper.cs b/Sources/Microcharts/Helpers/DrawHelper.cs index 06a8fcdb..f69a3fc2 100644 --- a/Sources/Microcharts/Helpers/DrawHelper.cs +++ b/Sources/Microcharts/Helpers/DrawHelper.cs @@ -16,18 +16,20 @@ internal enum YPositionBehavior internal static class DrawHelper { - + internal static void DrawLabel(SKCanvas canvas, Orientation orientation, YPositionBehavior yPositionBehavior, SKSize itemSize, SKPoint point, SKColor color, SKRect bounds, string text, float textSize, SKTypeface typeface) { using (new SKAutoCanvasRestore(canvas)) { + using (var font = new SKFont()) using (var paint = new SKPaint()) { - paint.TextSize = textSize; + font.Size = textSize; + font.Typeface = typeface; + paint.IsAntialias = true; paint.Color = color; paint.IsStroke = false; - paint.Typeface = typeface; if (orientation == Orientation.Vertical) { @@ -57,13 +59,13 @@ internal static void DrawLabel(SKCanvas canvas, Orientation orientation, YPositi if (bounds.Width > itemSize.Width) { text = text.Substring(0, Math.Min(3, text.Length)); - paint.MeasureText(text, ref bounds); + font.MeasureText(text, out bounds); } if (bounds.Width > itemSize.Width) { text = text.Substring(0, Math.Min(1, text.Length)); - paint.MeasureText(text, ref bounds); + font.MeasureText(text, out bounds); } var y = point.Y; @@ -87,12 +89,12 @@ internal static void DrawLabel(SKCanvas canvas, Orientation orientation, YPositi canvas.Translate(point.X - (bounds.Width / 2), y); } - canvas.DrawText(text, 0, 0, paint); + canvas.DrawText(text, 0, 0, font, paint); } } } - internal static void DrawYAxis(bool showYAxisText, bool showYAxisLines, Position yAxisPosition, SKPaint yAxisTextPaint, SKPaint yAxisLinesPaint, float margin, float animationProgress, float maxValue, float valueRange, SKCanvas canvas, int width, float yAxisXShift, List yAxisIntervalLabels, float headerHeight, SKSize itemSize, float origin) + internal static void DrawYAxis(bool showYAxisText, bool showYAxisLines, Position yAxisPosition, SKFont yAxisTextFont, SKPaint yAxisTextPaint, SKPaint yAxisLinesPaint, float margin, float animationProgress, float maxValue, float valueRange, SKCanvas canvas, int width, float yAxisXShift, List yAxisIntervalLabels, float headerHeight, SKSize itemSize, float origin) { if (showYAxisText || showYAxisLines) { @@ -107,7 +109,7 @@ internal static void DrawYAxis(bool showYAxisText, bool showYAxisLines, Position if (showYAxisText) { - DrawYAxisText(yAxisTextPaint, yAxisPosition, canvas, intervals); + DrawYAxisText(yAxisTextFont, yAxisTextPaint, yAxisPosition, canvas, intervals); } if (showYAxisLines) @@ -129,17 +131,17 @@ internal static void DrawYAxis(bool showYAxisText, bool showYAxisLines, Position /// /// Shows a Y axis /// + /// /// /// /// /// - private static void DrawYAxisText(SKPaint yAxisTextPaint, Position yAxisPosition, SKCanvas canvas, IEnumerable<(string Label, SKPoint Point)> intervals) + private static void DrawYAxisText(SKFont yAxisTextFont, SKPaint yAxisTextPaint, Position yAxisPosition, SKCanvas canvas, IEnumerable<(string Label, SKPoint Point)> intervals) { - var pt = yAxisTextPaint.Clone(); - pt.TextAlign = yAxisPosition == Position.Left ? SKTextAlign.Right : SKTextAlign.Left; + var textAlign = yAxisPosition == Position.Left ? SKTextAlign.Right : SKTextAlign.Left; foreach (var @int in intervals) - canvas.DrawTextCenteredVertically(@int.Label, pt, @int.Point.X, @int.Point.Y); + canvas.DrawTextCenteredVertically(@int.Label, textAlign, yAxisTextFont, yAxisTextPaint, @int.Point.X, @int.Point.Y); } /// diff --git a/Sources/Microcharts/Helpers/MeasureHelper.cs b/Sources/Microcharts/Helpers/MeasureHelper.cs index 958a1d54..48c37b83 100644 --- a/Sources/Microcharts/Helpers/MeasureHelper.cs +++ b/Sources/Microcharts/Helpers/MeasureHelper.cs @@ -12,18 +12,16 @@ internal static class MeasureHelper /// The texts bounds. internal static SKRect[] MeasureTexts(string[] texts, float textSize) { - using (var paint = new SKPaint()) - { - paint.TextSize = textSize; - return MeasureTexts(texts, paint); - } + using var font = new SKFont(); + font.Size = textSize; + return MeasureTexts(texts, font); } /// /// Measures the text values. /// /// The texts bounds. - internal static SKRect[] MeasureTexts(string[] texts, SKPaint paint) + internal static SKRect[] MeasureTexts(string[] texts, SKFont font) { return texts.Select(text => { @@ -32,8 +30,7 @@ internal static SKRect[] MeasureTexts(string[] texts, SKPaint paint) return SKRect.Empty; } - var bounds = new SKRect(); - paint.MeasureText(text, ref bounds); + font.MeasureText(text, out var bounds); return bounds; }).ToArray(); } @@ -68,7 +65,7 @@ internal static float CalculateFooterHeaderHeight(float margin, float textSize, return result; } - internal static int CalculateYAxis(bool showYAxisText, bool showYAxisLines, IEnumerable entries, int yAxisMaxTicks, SKPaint yAxisTextPaint, Position yAxisPosition, int width, bool fixedRange, ref float maxValue, ref float minValue, out float yAxisXShift, out List yAxisIntervalLabels) + internal static int CalculateYAxis(bool showYAxisText, bool showYAxisLines, IEnumerable entries, int yAxisMaxTicks, SKPaint yAxisTextPaint, SKFont yAxisTextFont, Position yAxisPosition, int width, bool fixedRange, ref float maxValue, ref float minValue, out float yAxisXShift, out List yAxisIntervalLabels) { yAxisXShift = 0.0f; yAxisIntervalLabels = new List(); @@ -106,7 +103,7 @@ internal static int CalculateYAxis(bool showYAxisText, bool showYAxisLines, IEnu .ToList(); var longestYAxisLabel = yAxisIntervalLabels.Aggregate(string.Empty, (max, cur) => max.Length > cur.ToString().Length ? max : cur.ToString()); - var longestYAxisLabelWidth = MeasureHelper.MeasureTexts(new string[] { longestYAxisLabel }, yAxisTextPaint).Select(b => b.Width).FirstOrDefault(); + var longestYAxisLabelWidth = MeasureTexts([longestYAxisLabel], yAxisTextFont).Select(b => b.Width).FirstOrDefault(); yAxisWidth = (int)(width - longestYAxisLabelWidth) - 10; if (yAxisPosition == Position.Left) { diff --git a/Sources/Microcharts/Helpers/Timer.cs b/Sources/Microcharts/Helpers/Timer.cs index bb7631e6..b8b381bd 100644 --- a/Sources/Microcharts/Helpers/Timer.cs +++ b/Sources/Microcharts/Helpers/Timer.cs @@ -1,4 +1,4 @@ -// Copyright (c) Aloïs DENIEL. All rights reserved. +// Copyright (c) Aloïs DENIEL. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using Microcharts.Abstracts; @@ -16,6 +16,6 @@ public static class Timer /// Gets or sets a factory used to instanciate timers. /// /// The factory function. - public static Func Create { get; set; } = () => new DelayTimer(); + public static Func Create { get; set; } = () => new DelayTimer(); } } diff --git a/Sources/Microcharts/Microcharts.csproj b/Sources/Microcharts/Microcharts.csproj index c7b7310d..589b3c23 100644 --- a/Sources/Microcharts/Microcharts.csproj +++ b/Sources/Microcharts/Microcharts.csproj @@ -1,16 +1,18 @@ - - - netstandard2.0 - Microcharts.Core - Core components for Microcharts. - microcharts - true - $(NoWarn);CS1591 - - - - - - + + Microcharts.Core + Core components for Microcharts. + net10.0;net10.0-ios;net10.0-maccatalyst;net10.0-android + $(TargetFrameworks);net10.0-windows10.0.19041.0 + Library + enable + microcharts + true + true + true + $(NoWarn);CS1591 + + + + diff --git a/assets/Icon.png b/assets/Icon.png new file mode 100644 index 00000000..f23dc4cf Binary files /dev/null and b/assets/Icon.png differ diff --git a/assets/Icon.svg b/assets/Icon.svg new file mode 100644 index 00000000..047a2ec9 --- /dev/null +++ b/assets/Icon.svg @@ -0,0 +1,67 @@ + + diff --git a/buildpackages-maui.sh b/buildpackages-maui.sh new file mode 100755 index 00000000..5f10d8f3 --- /dev/null +++ b/buildpackages-maui.sh @@ -0,0 +1,9 @@ +dotnet pack --configuration=Release Sources/Microcharts/Microcharts.csproj +dotnet pack --configuration=Release Sources/Microcharts.Maui/Microcharts.Maui.csproj +dotnet pack --configuration=Release Sources/Microcharts.Droid/Microcharts.Droid.csproj +dotnet pack --configuration=Release Sources/Microcharts.iOS/Microcharts.iOS.csproj +dotnet pack --configuration=Release Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj + +dotnet build --configuration=Release Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj +dotnet build --configuration=Release Sources/Microcharts.Samples.Android/Microcharts.Samples.Android.csproj +dotnet build --configuration=Release Sources/Microcharts.Samples.iOS/Microcharts.Samples.iOS.csproj diff --git a/buildpackages.cmd b/buildpackages.cmd index 277ec987..1aee2638 100644 --- a/buildpackages.cmd +++ b/buildpackages.cmd @@ -2,14 +2,9 @@ dotnet msbuild /t:restore /p:Configuration=Release Sources\Microcharts.sln msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts\Microcharts.csproj msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Droid\Microcharts.Droid.csproj -msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Forms\Microcharts.Forms.csproj msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.iOS\Microcharts.iOS.csproj rem msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.macOS\Microcharts.macOS.csproj msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Uwp\Microcharts.Uwp.csproj -msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Avalonia\Microcharts.Avalonia.csproj -msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Eto\Microcharts.Eto.csproj msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Maui\Microcharts.Maui.csproj -msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Uno\Microcharts.Uno.csproj -msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Uno.WinUI\Microcharts.Uno.WinUI.csproj msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.WinUI\Microcharts.WinUI.csproj dotnet pack Sources\Microcharts.Metapackage\Microcharts.Metapackage.csproj diff --git a/clean.sh b/clean.sh new file mode 100755 index 00000000..4c4099f4 --- /dev/null +++ b/clean.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Define the starting directory (use current directory or specify a path) +START_DIR="$(pwd)" + +# Find and remove all 'bin' and 'obj' folders recursively +find "$START_DIR" -type d \( -name "bin" -o -name "obj" \) -exec echo "Deleting: {}" \; -exec rm -rf {} + + +echo "Cleanup complete."