Improve Table.fromTextArray()

 # Changelog
 # Changelog
 
 
+## 1.8.0
+
+- Improve Table.fromTextArray()
+
 ## 1.7.1
 ## 1.7.1
 
 
 - Fix justified text softWrap issue
 - Fix justified text softWrap issue

@@ -187,48 +187,156 @@ class FractionColumnWidth extends TableColumnWidth {
   }
   }
 }
 }
 
 
+typedef OnCellFormat = String Function(int index, dynamic data);
+
 /// A widget that uses the table layout algorithm for its children.
 /// A widget that uses the table layout algorithm for its children.
 class Table extends Widget implements SpanningWidget {
 class Table extends Widget implements SpanningWidget {
-  Table(
-      {this.children = const <TableRow>[],
+  Table({
+    this.children = const <TableRow>[],
     this.border,
     this.border,
     this.defaultVerticalAlignment = TableCellVerticalAlignment.top,
     this.defaultVerticalAlignment = TableCellVerticalAlignment.top,
     this.columnWidths,
     this.columnWidths,
     this.defaultColumnWidth = const IntrinsicColumnWidth(),
     this.defaultColumnWidth = const IntrinsicColumnWidth(),
-      this.tableWidth = TableWidth.max})
-      : assert(children != null),
+    this.tableWidth = TableWidth.max,
+  })  : assert(children != null),
         assert(defaultColumnWidth != null),
         assert(defaultColumnWidth != null),
         assert(defaultVerticalAlignment != null),
         assert(defaultVerticalAlignment != null),
         super();
         super();
 
 
   factory Table.fromTextArray({
   factory Table.fromTextArray({
-    @required Context context,
-    @required List<List<String>> data,
-    EdgeInsets margin = const EdgeInsets.all(5),
+    Context context,
+    @required List<List<dynamic>> data,
+    @deprecated EdgeInsets margin,
+    EdgeInsets cellPadding = const EdgeInsets.all(5),
+    double cellHeight = 0,
+    Alignment cellAlignment = Alignment.topLeft,
+    Map<int, Alignment> cellAlignments,
+    TextStyle cellStyle,
+    TextStyle oddCellStyle,
+    OnCellFormat cellFormat,
+    int headerCount = 1,
+    List<dynamic> headers,
+    EdgeInsets headerPadding,
+    double headerHeight,
+    Alignment headerAlignment = Alignment.center,
+    Map<int, Alignment> headerAlignments,
+    TextStyle headerStyle,
+    OnCellFormat headerFormat,
+    TableBorder border = const TableBorder(),
+    Map<int, TableColumnWidth> columnWidths,
+    IntrinsicColumnWidth defaultColumnWidth = const IntrinsicColumnWidth(),
+    TableWidth tableWidth = TableWidth.max,
+    BoxDecoration headerDecoration,
+    BoxDecoration rowDecoration,
+    BoxDecoration oddRowDecoration,
   }) {
   }) {
+    assert(data != null);
+    assert(headerCount != null && headerCount >= 0);
+    assert(cellHeight != null);
+
+    if (margin != null) {
+      cellPadding = margin;
+    }
+
+    if (context != null) {
+      final ThemeData theme = Theme.of(context);
+      headerStyle ??= theme.tableHeader;
+      cellStyle ??= theme.tableCell;
+    }
+
+    headerPadding ??= cellPadding;
+    headerHeight ??= cellHeight;
+    oddRowDecoration ??= rowDecoration;
+    oddCellStyle ??= cellStyle;
+    cellAlignments ??= const <int, Alignment>{};
+    headerAlignments ??= cellAlignments;
+
     final List<TableRow> rows = <TableRow>[];
     final List<TableRow> rows = <TableRow>[];
-    for (List<String> row in data) {
+
+    int rowNum = 0;
+    if (headers != null) {
+      final List<Widget> tableRow = <Widget>[];
+
+      for (final dynamic cell in headers) {
+        tableRow.add(
+          Container(
+            alignment: headerAlignments[tableRow.length] ?? headerAlignment,
+            padding: headerPadding,
+            constraints: BoxConstraints(minHeight: headerHeight),
+            child: Text(
+              headerFormat == null
+                  ? cell.toString()
+                  : headerFormat(tableRow.length, cell),
+              style: headerStyle,
+            ),
+          ),
+        );
+      }
+      rows.add(TableRow(
+        children: tableRow,
+        repeat: true,
+        decoration: headerDecoration,
+      ));
+      rowNum++;
+    }
+
+    for (final List<dynamic> row in data) {
       final List<Widget> tableRow = <Widget>[];
       final List<Widget> tableRow = <Widget>[];
-      if (row == data.first) {
-        for (String cell in row) {
-          tableRow.add(Container(
-              alignment: Alignment.center,
-              margin: margin,
-              child: Text(cell, style: Theme.of(context).tableHeader)));
+      final bool isOdd = (rowNum - headerCount) % 2 != 0;
+
+      if (rowNum < headerCount) {
+        for (final dynamic cell in row) {
+          tableRow.add(
+            Container(
+              alignment: headerAlignments[tableRow.length] ?? headerAlignment,
+              padding: headerPadding,
+              constraints: BoxConstraints(minHeight: headerHeight),
+              child: Text(
+                headerFormat == null
+                    ? cell.toString()
+                    : headerFormat(tableRow.length, cell),
+                style: headerStyle,
+              ),
+            ),
+          );
         }
         }
       } else {
       } else {
-        for (String cell in row) {
-          tableRow.add(Container(
-              margin: margin,
-              child: Text(cell, style: Theme.of(context).tableCell)));
+        for (final dynamic cell in row) {
+          tableRow.add(
+            Container(
+              alignment: cellAlignments[tableRow.length] ?? cellAlignment,
+              padding: cellPadding,
+              constraints: BoxConstraints(minHeight: cellHeight),
+              child: Text(
+                cellFormat == null
+                    ? cell.toString()
+                    : cellFormat(tableRow.length, cell),
+                style: isOdd ? oddCellStyle : cellStyle,
+              ),
+            ),
+          );
         }
         }
       }
       }
-      rows.add(TableRow(children: tableRow, repeat: row == data.first));
+
+      BoxDecoration decoration = isOdd ? oddRowDecoration : rowDecoration;
+      if (rowNum < headerCount) {
+        decoration = headerDecoration;
+      }
+
+      rows.add(TableRow(
+        children: tableRow,
+        repeat: rowNum < headerCount,
+        decoration: decoration,
+      ));
+      rowNum++;
     }
     }
     return Table(
     return Table(
-        border: const TableBorder(),
-        tableWidth: TableWidth.max,
-        children: rows);
+      border: border,
+      tableWidth: tableWidth,
+      children: rows,
+      columnWidths: columnWidths,
+      defaultColumnWidth: defaultColumnWidth,
+    );
   }
   }
 
 
   @override
   @override

@@ -4,7 +4,7 @@ description: A pdf producer for Dart. It can create pdf files for both web or fl
 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
 repository: https://github.com/DavBfr/dart_pdf
 repository: https://github.com/DavBfr/dart_pdf
 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
-version: 1.7.1
+version: 1.8.0
 
 
 environment:
 environment:
   sdk: ">=2.3.0 <3.0.0"
   sdk: ">=2.3.0 <3.0.0"

@@ -186,6 +186,52 @@ void main() {
     );
     );
   });
   });
 
 
+  test('Table fromTextArray', () {
+    pdf.addPage(Page(
+      build: (Context context) => Table.fromTextArray(
+        context: context,
+        tableWidth: TableWidth.min,
+        data: <List<dynamic>>[
+          <dynamic>['One', 'Two', 'Three'],
+          <dynamic>[1, 2, 3],
+          <dynamic>[4, 5, 6],
+        ],
+      ),
+    ));
+  });
+
+  test('Table fromTextArray with formatting', () {
+    pdf.addPage(Page(
+      build: (Context context) => Table.fromTextArray(
+        border: null,
+        cellAlignment: Alignment.center,
+        headerDecoration: const BoxDecoration(
+          borderRadius: 2,
+          color: PdfColors.indigo,
+        ),
+        headerHeight: 25,
+        cellHeight: 40,
+        headerStyle: TextStyle(
+          color: PdfColors.white,
+          fontWeight: FontWeight.bold,
+        ),
+        rowDecoration: const BoxDecoration(
+          border: BoxBorder(
+            bottom: true,
+            color: PdfColors.indigo,
+            width: .5,
+          ),
+        ),
+        headers: <dynamic>['One', 'Two', 'Three'],
+        data: <List<dynamic>>[
+          <dynamic>[1, 2, 3],
+          <dynamic>[4, 5, 6],
+          <dynamic>[7, 8, 9],
+        ],
+      ),
+    ));
+  });
+
   tearDownAll(() {
   tearDownAll(() {
     final File file = File('widgets-table.pdf');
     final File file = File('widgets-table.pdf');
     file.writeAsBytesSync(pdf.save());
     file.writeAsBytesSync(pdf.save());

@@ -164,7 +164,7 @@ void main() {
           build: (Context context) => <Widget>[
           build: (Context context) => <Widget>[
             Table.fromTextArray(
             Table.fromTextArray(
               context: context,
               context: context,
-              margin: const EdgeInsets.all(3),
+              cellPadding: const EdgeInsets.all(3),
               data: <List<String>>[
               data: <List<String>>[
                 <String>['Company', 'Contact', 'Country'],
                 <String>['Company', 'Contact', 'Country'],
                 <String>['Alfreds Futterkiste', 'Maria Anders', 'Germany'],
                 <String>['Alfreds Futterkiste', 'Maria Anders', 'Germany'],