Browse Source

Replace type parameter text for Text

Rustam Sayfutdinov 3 years ago
parent
commit
8a57dceb9d

+ 2 - 1
QuestPDF.Examples/DefaultTextStyleExamples.cs

@@ -1,4 +1,5 @@
 using System.Drawing;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Linq;
 using NUnit.Framework;
 using NUnit.Framework;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Examples.Engine;
@@ -43,7 +44,7 @@ namespace QuestPDF.Examples
                                         .Height(50)
                                         .Height(50)
                                         .AlignCenter()
                                         .AlignCenter()
                                         .AlignMiddle()
                                         .AlignMiddle()
-                                        .Text(i)
+                                        .Text(i.ToString(CultureInfo.InvariantCulture))
                                         .FontSize(16 + i / 4);   
                                         .FontSize(16 + i / 4);   
                                 }
                                 }
                             });
                             });

+ 3 - 2
QuestPDF.Examples/DynamicOptimizedExample.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Linq;
 using NUnit.Framework;
 using NUnit.Framework;
 using QuestPDF.Elements;
 using QuestPDF.Elements;
@@ -126,9 +127,9 @@ namespace QuestPDF.Examples
                         .Padding(5)
                         .Padding(5)
                         .Row(row =>
                         .Row(row =>
                         {
                         {
-                            row.ConstantItem(30).Text(index + 1);
+                            row.ConstantItem(30).Text((index + 1).ToString(CultureInfo.InvariantCulture));
                             row.RelativeItem().Text(item.ItemName);
                             row.RelativeItem().Text(item.ItemName);
-                            row.ConstantItem(50).AlignRight().Text(item.Count);
+                            row.ConstantItem(50).AlignRight().Text(item.Count.ToString(CultureInfo.InvariantCulture));
                             row.ConstantItem(50).AlignRight().Text($"{item.Price}$");
                             row.ConstantItem(50).AlignRight().Text($"{item.Price}$");
                             row.ConstantItem(50).AlignRight().Text($"{item.Count*item.Price}$");
                             row.ConstantItem(50).AlignRight().Text($"{item.Count*item.Price}$");
                         });
                         });

+ 3 - 2
QuestPDF.Examples/DynamicSimpleTableExample.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Linq;
 using NUnit.Framework;
 using NUnit.Framework;
 using QuestPDF.Elements;
 using QuestPDF.Elements;
@@ -96,9 +97,9 @@ namespace QuestPDF.Examples
                         {
                         {
                             var item = Items[index];
                             var item = Items[index];
                                 
                                 
-                            table.Cell().Element(Style).Text(index + 1);
+                            table.Cell().Element(Style).Text((index + 1).ToString(CultureInfo.InvariantCulture));
                             table.Cell().Element(Style).Text(item.ItemName);
                             table.Cell().Element(Style).Text(item.ItemName);
-                            table.Cell().Element(Style).AlignRight().Text(item.Count);
+                            table.Cell().Element(Style).AlignRight().Text(item.Count.ToString(CultureInfo.InvariantCulture));
                             table.Cell().Element(Style).AlignRight().Text($"{item.Price}$");
                             table.Cell().Element(Style).AlignRight().Text($"{item.Price}$");
                             table.Cell().Element(Style).AlignRight().Text($"{item.Count*item.Price}$");
                             table.Cell().Element(Style).AlignRight().Text($"{item.Count*item.Price}$");
 
 

+ 5 - 4
QuestPDF.Examples/TableExamples.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Linq;
 using NUnit.Framework;
 using NUnit.Framework;
 using QuestPDF.Drawing;
 using QuestPDF.Drawing;
@@ -389,12 +390,12 @@ namespace QuestPDF.Examples
                                 table.Cell().Element(CellStyle).ExtendHorizontal().AlignLeft().Text(page.name);
                                 table.Cell().Element(CellStyle).ExtendHorizontal().AlignLeft().Text(page.name);
                                         
                                         
                                 // inches
                                 // inches
-                                table.Cell().Element(CellStyle).Text(page.width);
-                                table.Cell().Element(CellStyle).Text(page.height);
+                                table.Cell().Element(CellStyle).Text(page.width.ToString(CultureInfo.InvariantCulture));
+                                table.Cell().Element(CellStyle).Text(page.height.ToString(CultureInfo.InvariantCulture));
                                         
                                         
                                 // points
                                 // points
-                                table.Cell().Element(CellStyle).Text(page.width * inchesToPoints);
-                                table.Cell().Element(CellStyle).Text(page.height * inchesToPoints);
+                                table.Cell().Element(CellStyle).Text((page.width * inchesToPoints).ToString(CultureInfo.InvariantCulture));
+                                table.Cell().Element(CellStyle).Text((page.height * inchesToPoints).ToString(CultureInfo.InvariantCulture));
                                         
                                         
                                 IContainer CellStyle(IContainer container) => DefaultCellStyle(container, Colors.White); 
                                 IContainer CellStyle(IContainer container) => DefaultCellStyle(container, Colors.White); 
                             }
                             }

+ 2 - 2
QuestPDF.Examples/TextExamples.cs

@@ -523,7 +523,7 @@ namespace QuestPDF.Examples
 
 
                         page.Content().Column(column =>
                         page.Content().Column(column =>
                         {
                         {
-                            column.Item().Text(null);
+                            column.Item().Text((string) null);
 
 
                             column.Item().Text(text =>
                             column.Item().Text(text =>
                             {
                             {
@@ -555,7 +555,7 @@ namespace QuestPDF.Examples
 
 
                         page.Content().Column(column =>
                         page.Content().Column(column =>
                         {
                         {
-                            column.Item().Text(null);
+                            column.Item().Text((string) null);
 
 
                             column.Item().Text(text =>
                             column.Item().Text(text =>
                             {
                             {

+ 9 - 3
QuestPDF/Fluent/TextExtensions.cs

@@ -281,11 +281,17 @@ namespace QuestPDF.Fluent
         {
         {
             element.Text(text).Style(style);
             element.Text(text).Style(style);
         }
         }
-        
+
+        [Obsolete("Please use an overload where the text parameter is passed explicitly as a string.")]
         public static TextSpanDescriptor Text(this IContainer element, object? text)
         public static TextSpanDescriptor Text(this IContainer element, object? text)
         {
         {
-            var descriptor = (TextSpanDescriptor) null;
-            element.Text(x => descriptor = x.Span(text?.ToString()));
+            return element.Text(text?.ToString());
+        }
+
+        public static TextSpanDescriptor Text(this IContainer element, string? text)
+        {
+            var descriptor = (TextSpanDescriptor) null!;
+            element.Text(x => descriptor = x.Span(text));
             return descriptor;
             return descriptor;
         }
         }
     }
     }