sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
tzw
2021-09-11 11:30:44 +06:30
parent dbf3ba99c4
commit 5712e20f19
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/pages/widgets/my_data_table.dart
View File

@@ -83,11 +83,7 @@ class MyDataRow {
/// ///
/// The [cells] argument must not be null. /// The [cells] argument must not be null.
MyDataRow.byIndex({ MyDataRow.byIndex({
<<<<<<< HEAD
int index = 0,
=======
int? index, int? index,
>>>>>>> upstream/master
this.selected = false, this.selected = false,
this.onSelectChanged, this.onSelectChanged,
required this.cells, required this.cells,
@@ -626,10 +622,6 @@ class MyDataTable extends StatelessWidget {
final List<TableColumnWidth> tableColumns = (columns.length + final List<TableColumnWidth> tableColumns = (columns.length +
(showCheckboxColumn ? 1 : 0)) as List<TableColumnWidth>; (showCheckboxColumn ? 1 : 0)) as List<TableColumnWidth>;
<<<<<<< HEAD
=======
>>>>>>> upstream/master
final List<TableRow> tableRows = List<TableRow>.generate( final List<TableRow> tableRows = List<TableRow>.generate(
rows.length + 1, // the +1 is for the header row rows.length + 1, // the +1 is for the header row
(int index) { (int index) {
@@ -761,19 +753,11 @@ class TableRowInkWell extends InkResponse {
/// Creates an ink well for a table row. /// Creates an ink well for a table row.
const TableRowInkWell({ const TableRowInkWell({
Key? key, Key? key,
<<<<<<< HEAD
Widget child,
GestureTapCallback onTap,
GestureTapCallback onDoubleTap,
GestureLongPressCallback onLongPress,
ValueChanged<bool> onHighlightChanged,
=======
Widget? child, Widget? child,
GestureTapCallback? onTap, GestureTapCallback? onTap,
GestureTapCallback? onDoubleTap, GestureTapCallback? onDoubleTap,
GestureLongPressCallback? onLongPress, GestureLongPressCallback? onLongPress,
ValueChanged<bool>? onHighlightChanged, ValueChanged<bool>? onHighlightChanged,
>>>>>>> upstream/master
}) : super( }) : super(
key: key, key: key,
child: child, child: child,
@@ -839,16 +823,6 @@ class _SortArrow extends StatefulWidget {
} }
class _SortArrowState extends State<_SortArrow> with TickerProviderStateMixin { class _SortArrowState extends State<_SortArrow> with TickerProviderStateMixin {
<<<<<<< HEAD
late AnimationController _opacityController;
late Animation<double> _opacityAnimation;
late AnimationController _orientationController;
late Animation<double> _orientationAnimation;
double _orientationOffset = 0.0;
late bool _down;
=======
AnimationController? _opacityController; AnimationController? _opacityController;
Animation<double>? _opacityAnimation; Animation<double>? _opacityAnimation;
@@ -857,7 +831,6 @@ class _SortArrowState extends State<_SortArrow> with TickerProviderStateMixin {
double _orientationOffset = 0.0; double _orientationOffset = 0.0;
bool? _down; bool? _down;
>>>>>>> upstream/master
static final Animatable<double> _turnTween = static final Animatable<double> _turnTween =
Tween<double>(begin: 0.0, end: math.pi) Tween<double>(begin: 0.0, end: math.pi)
@@ -904,11 +877,7 @@ class _SortArrowState extends State<_SortArrow> with TickerProviderStateMixin {
void didUpdateWidget(_SortArrow oldWidget) { void didUpdateWidget(_SortArrow oldWidget) {
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
bool skipArrow = false; bool skipArrow = false;
<<<<<<< HEAD
final bool newDown = widget.down;
=======
final bool newDown = widget.down ?? _down!; final bool newDown = widget.down ?? _down!;
>>>>>>> upstream/master
if (oldWidget.visible != widget.visible) { if (oldWidget.visible != widget.visible) {
if (widget.visible! && if (widget.visible! &&
(_opacityController!.status == AnimationStatus.dismissed)) { (_opacityController!.status == AnimationStatus.dismissed)) {