fixed bug with labels not correctly applying formatting.

eman1986 · eman1986 · commit 3e0d98da5032 · 2020-08-06T22:30:41.000-04:00
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.5.5</version>
+    <version>0.9.5.6</version>
     <title>Microcharts for Xamarin.Forms</title>
     <authors>Aloïs Deniel, Ed Lomonaco</authors>
     <owners>Aloïs Deniel, Ed Lomonaco</owners>
@@ -14,7 +14,7 @@
     <tags>xamarin.forms chart skia</tags>
     <dependencies>
         <group targetFramework="netstandard2.0">
-            <dependency id="Microcharts" version="0.9.5.5" />
+            <dependency id="Microcharts" version="0.9.5.6" />
             <dependency id="SkiaSharp" version="2.80.1" />
             <dependency id="SkiaSharp.Views.Forms" version="2.80.1" />
             <dependency id="System.ValueTuple" version="4.5.0" />
diff --git a/NuGet/Package.nuspec b/NuGet/Package.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Microcharts</id>
-    <version>0.9.5.5</version>
+    <version>0.9.5.6</version>
     <title>Microcharts</title>
     <authors>Aloïs Deniel, Ed Lomonaco</authors>
     <owners>Aloïs Deniel, Ed Lomonaco</owners>
diff --git a/Sources/Microcharts/Charts/PointChart.cs b/Sources/Microcharts/Charts/PointChart.cs
@@ -280,10 +280,7 @@ protected void DrawLabels(SKCanvas canvas, string[] texts, SKPoint[] points, SKR
                                     canvas.Translate(point.X - (bounds.Width / 2), y);
                                 }
 
-                                var rs = new RichString(text)
-                                    .FontSize(LabelTextSize)
-                                    .TextColor(colors[i])
-                                    .TextDirection(TextDirection);
+                                var rs = new RichString().Add(text, fontSize: LabelTextSize, textColor: colors[i], textDirection: TextDirection);
 
                                 rs.Paint(canvas, new TextPaintOptions
                                 {
diff --git a/Sources/Microcharts/Extensions/CanvasExtensions.cs b/Sources/Microcharts/Extensions/CanvasExtensions.cs
@@ -39,10 +39,7 @@ public static void DrawCaptionLabels(this SKCanvas canvas, string label, SKColor
 
                         var y = point.Y - ((bounds.Top + bounds.Bottom) / 2) - space;
 
-                        var rs = new RichString(text)
-                            .FontSize(textSize)
-                            .TextColor(labelColor)
-                            .TextDirection(textDirection);
+                        var rs = new RichString().Add(text, fontSize: textSize, textColor: labelColor, textDirection: textDirection);
 
                         rs.Paint(canvas, new SKPoint(point.X, y), new TextPaintOptions
                         {

Original file line number	Diff line number	Diff line change
`@@ -280,10 +280,7 @@ protected void DrawLabels(SKCanvas canvas, string[] texts, SKPoint[] points, SKR`
`280`	`280`	`canvas.Translate(point.X - (bounds.Width / 2), y);`
`281`	`281`	`}`
`282`	`282`
`283`		`- var rs = new RichString(text)`
`284`		`- .FontSize(LabelTextSize)`
`285`		`- .TextColor(colors[i])`
`286`		`- .TextDirection(TextDirection);`
	`283`	`+ var rs = new RichString().Add(text, fontSize: LabelTextSize, textColor: colors[i], textDirection: TextDirection);`
`287`	`284`
`288`	`285`	`rs.Paint(canvas, new TextPaintOptions`
`289`	`286`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,7 @@ public static void DrawCaptionLabels(this SKCanvas canvas, string label, SKColor`
`39`	`39`
`40`	`40`	`var y = point.Y - ((bounds.Top + bounds.Bottom) / 2) - space;`
`41`	`41`
`42`		`- var rs = new RichString(text)`
`43`		`- .FontSize(textSize)`
`44`		`- .TextColor(labelColor)`
`45`		`- .TextDirection(textDirection);`
	`42`	`+ var rs = new RichString().Add(text, fontSize: textSize, textColor: labelColor, textDirection: textDirection);`
`46`	`43`
`47`	`44`	`rs.Paint(canvas, new SKPoint(point.X, y), new TextPaintOptions`
`48`	`45`	`{`