merge

lib/pages/widgets/my_data_table.dart

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