Merge pull request #199 from dotnet-ad/develop

0.9.5
microcharts-dotnet · Jul 27, 2020 · 34dd463 · 34dd463
2 parents 82b229d + 9fe70a9
commit 34dd463
Show file tree

Hide file tree

Showing 76 changed files with 318 additions and 14,543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,9 @@ paket-files/
 
 # Mac folder file
 .DS_Store
+
+
+# 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
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
diff --git a/Documentation/api/.gitignore b/Documentation/api/.gitignore
diff --git a/Documentation/api/.manifest b/Documentation/api/.manifest
diff --git a/Documentation/docfx.json b/Documentation/docfx.json
diff --git a/Documentation/guides/quickstart.md b/Documentation/guides/quickstart.md
diff --git a/Documentation/guides/toc.yml b/Documentation/guides/toc.yml
diff --git a/Documentation/images/Android-Screenshot.png b/Documentation/images/Android-Screenshot.png
diff --git a/Documentation/images/Bar.png b/Documentation/images/Bar.png
diff --git a/Documentation/images/Bikr.gif b/Documentation/images/Bikr.gif
diff --git a/Documentation/images/Donut.png b/Documentation/images/Donut.png
diff --git a/Documentation/images/Line.png b/Documentation/images/Line.png
diff --git a/Documentation/images/Logo.png b/Documentation/images/Logo.png
diff --git a/Documentation/images/Logo.sketch b/Documentation/images/Logo.sketch
diff --git a/Documentation/images/Point.png b/Documentation/images/Point.png
diff --git a/Documentation/images/Radar.png b/Documentation/images/Radar.png
diff --git a/Documentation/images/RadialGauge.png b/Documentation/images/RadialGauge.png
diff --git a/Documentation/images/UWP-Screenshot.PNG b/Documentation/images/UWP-Screenshot.PNG
diff --git a/Documentation/images/iOS-Screenshot.png b/Documentation/images/iOS-Screenshot.png
diff --git a/Documentation/index.md b/Documentation/index.md
diff --git a/Documentation/samples/bikr.md b/Documentation/samples/bikr.md
diff --git a/Documentation/samples/toc.yml b/Documentation/samples/toc.yml
diff --git a/Documentation/toc.yml b/Documentation/toc.yml
diff --git a/NuGet/Package.Forms.nuspec b/NuGet/Package.Forms.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Microcharts.Forms</id>
-    <version>0.9.0</version>
+    <version>0.9.5</version>
     <title>Microcharts for Xamarin.Forms</title>
     <authors>Aloïs Deniel, Ed Lomonaco</authors>
     <owners>Aloïs Deniel, Ed Lomonaco</owners>
@@ -15,14 +15,17 @@
     <dependencies>
         <group targetFramework="netstandard2.0">
             <dependency id="Microcharts" version="0.9.0" />
-            <dependency id="Xamarin.Forms" version="2.4.0.282" />
-            <dependency id="System.ValueTuple" version="4.4.0" />
-            <dependency id="SkiaSharp.Views.Forms" version="1.59.1.1" />
+            <dependency id="SkiaSharp" version="2.80.1" />
+            <dependency id="SkiaSharp.HarfBuzz" version="2.80.1" />
+            <dependency id="SkiaSharp.Views.Forms" version="2.80.1" />
+            <dependency id="System.ValueTuple" version="4.5.0" />
+            <dependency id="Xamarin.Forms" version="4.7.0.1179" />
         </group>
     </dependencies>
   </metadata>
    <files>
      <!-- .NET Standard 2.0 -->
+     <file src="..\Sources\Microcharts\bin\Release\netstandard2.0\Microcharts.dll" target="lib\netstandard2.0\Microcharts.dll"/>
      <file src="..\Sources\Microcharts.Forms\bin\Release\netstandard2.0\Microcharts.Forms.dll" target="lib\netstandard2.0\Microcharts.Forms.dll"/>
    </files>
 </package>
diff --git a/NuGet/Package.nuspec b/NuGet/Package.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Microcharts</id>
-    <version>0.9.0</version>
+    <version>0.9.5</version>
     <title>Microcharts</title>
     <authors>Aloïs Deniel, Ed Lomonaco</authors>
     <owners>Aloïs Deniel, Ed Lomonaco</owners>
@@ -15,6 +15,7 @@
     <dependencies>
         <group targetFramework="netstandard2.0">
             <dependency id="SkiaSharp" version="2.80.1" />
+            <dependency id="SkiaSharp.HarfBuzz" version="2.80.1" />
             <dependency id="System.ValueTuple" version="4.5.0" />
         </group>
         <group targetFramework="monoandroid1.0">

diff --git a/README.md b/README.md
@@ -18,9 +18,9 @@ More info on how you can help can be found [here](https://github.com/dotnet-ad/M
 
 ## Gallery
 
-![gallery](Documentation/images/Bikr.gif)
- 
-![gallery](Documentation/images/Gallery.png)
+![animation gallery](assets/animations.gif)
+
+![gallery](assets/Gallery.png)
 
 ## Install
 

diff --git a/Sources/Droid/Assets/AboutAssets.txt b/Sources/Droid/Assets/AboutAssets.txt