Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed border styling of data grid view #511

Merged
merged 7 commits into from
May 19, 2023
Merged

Changed border styling of data grid view #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fdf35a
refactor: change border styling of data grid view
vinothvino42 May 17, 2023
a72f154
Merge branch 'main' into datagrid-issue
vinothvino42 May 18, 2023
b9d08bb
refactor: update data grid styling
vinothvino42 May 18, 2023
71dda81
feat: add json schema for data grid view
vinothvino42 May 18, 2023
3b2372b
Update datagrid styles and json schema
vinothvino42 May 19, 2023
9cd41b7
Merge branch 'main' into datagrid-issue
vinothvino42 May 19, 2023
df10796
Merge branch 'main' into datagrid-issue
vinothvino42 May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions assets/schema/ensemble_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,92 @@
}
]
},
"DataGrid-payload": {
"type": "object",
"allOf": [
{
"$ref": "#/$defs/DataRow-Templated-payload"
},
{
"properties": {
"children": {
"$ref": "#/$defs/DataRow"
},
"styles": {
"allOf": [
{
"$ref": "#/$defs/baseStyles"
},
{
"$ref": "#/$defs/boxLayoutStyles"
},
{
"headingTextStyle": {
"type": "object",
"description": "Set the text style for the heading text",
"$ref": "#/$defs/TextStyle"
},
"dataTextStyle": {
"type": "object",
"description": "Set the text style for the data item text",
"$ref": "#/$defs/TextStyle"
}
}
]
},
"horizontalMargin": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this goes into styles also.

"type": "integer",
"description": "The leading and trailing gap for the DataGrid view.",
"minimum": 0
},
"dataRowHeight": {
"type": "integer",
"description": "Set the height of the data row item.",
"minimum": 0
},
"headingRowHeight": {
"type": "integer",
"description": "Set the height of the heading row item.",
"minimum": 0
},
"columnSpacing": {
"type": "number",
"description": "Set the padding for the column.",
"minimum": 0
}
}
}
]
},
"DataRow-Templated-payload": {
"type": "object",
"properties": {
"item-template": {
"type": "object",
"properties": {
"data": {
"type": "string",
"description": "Bind to an array of data from an API response or a variable"
},
"name": {
"type": "string",
"description": "Set the name to reference as you iterate through the array of data"
},
"template": {
"$ref": "#/$defs/DataRow",
"description": "The data row widget to render for each item"
}
}
}
}
},
"DataRow": {
"type": "array",
"description": "List of widgets",
"items": {
"$ref": "#/$defs/Widget"
}
},
"Stack-payload": {
"type": "object",
"required": ["children"],
Expand Down
57 changes: 23 additions & 34 deletions lib/layout/data_grid.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@ class DataGrid extends StatefulWidget
'DataColumns': (List cols) {
this.cols = cols;
},
'headingTextStyle': (Map styles) {
controller.headingTextController = TextController();
TextUtils.setStyles(styles, controller.headingTextController!);
},
'dataTextStyle': (Map styles) {
controller.dataTextController = TextController();
TextUtils.setStyles(styles, controller.dataTextController!);
},
'horizontalMargin': (val) =>
controller.horizontalMargin = Utils.optionalDouble(val),
'dataRowHeight': (val) =>
Expand All @@ -80,29 +72,6 @@ class DataGrid extends StatefulWidget
controller.columnSpacing = Utils.optionalDouble(val),
'dividerThickness': (val) =>
controller.dividerThickness = Utils.optionalDouble(val),
'border': (Map val) {
Map<String, dynamic> map = {};
val.forEach((key, value) {
if (value is Map) {
Color color = Utils.getColor(value['color']) ?? Colors.black;
double width = Utils.getDouble(value['width'], fallback: 1.0);
map[key] = BorderSide(color: color, width: width);
} else if (key == 'borderRadius') {
double? radius = Utils.optionalDouble(value);
map[key] = (radius == null)
? BorderRadius.zero
: BorderRadius.circular(radius);
}
});
controller.border = TableBorder(
top: map['top'] ?? BorderSide.none,
right: map['right'] ?? BorderSide.none,
bottom: map['bottom'] ?? BorderSide.none,
left: map['left'] ?? BorderSide.none,
horizontalInside: map['horizontalInside'] ?? BorderSide.none,
verticalInside: map['verticalInside'] ?? BorderSide.none,
borderRadius: map['borderRadius'] ?? BorderRadius.zero);
},
};
}
}
Expand Down Expand Up @@ -173,7 +142,7 @@ class EnsembleDataRowState extends State<EnsembleDataRow> {
}
}

class DataGridController extends WidgetController {
class DataGridController extends BoxController {
List<Widget>? children;
double? horizontalMargin;
TextController? headingTextController;
Expand All @@ -182,7 +151,22 @@ class DataGridController extends WidgetController {
double? columnSpacing;
TextController? dataTextController;
double? dividerThickness;
TableBorder border = const TableBorder();

@override
Map<String, Function> getBaseSetters() {
Map<String, Function> setters = super.getBaseSetters();
setters.addAll({
'headingText': (Map styles) {
headingTextController = TextController();
TextUtils.setStyles(styles, headingTextController!);
},
'dataText': (Map styles) {
dataTextController = TextController();
TextUtils.setStyles(styles, dataTextController!);
},
});
return setters;
}
}

class DataGridState extends WidgetState<DataGrid> with TemplatedWidgetState {
Expand Down Expand Up @@ -317,7 +301,12 @@ class DataGridState extends WidgetState<DataGrid> with TemplatedWidgetState {
dataTextStyle: dataTextStyle,
columnSpacing: widget.controller.columnSpacing,
dividerThickness: widget.controller.dividerThickness,
border: widget.controller.border,
border: TableBorder.all(
color: widget.controller.borderColor ?? Colors.black,
width: widget.controller.borderWidth?.toDouble() ?? 1.0,
borderRadius:
widget.controller.borderRadius?.getValue() ?? BorderRadius.zero,
),
);
return SingleChildScrollView(
scrollDirection: Axis.vertical,
Expand Down