diff --git a/packages/devtools_app/assets/scripts/inspector_polyfill_script.dart b/packages/devtools_app/assets/scripts/inspector_polyfill_script.dart index 64682c5b411..a4b1cd079a7 100644 --- a/packages/devtools_app/assets/scripts/inspector_polyfill_script.dart +++ b/packages/devtools_app/assets/scripts/inspector_polyfill_script.dart @@ -114,7 +114,6 @@ String addServiceExtensions() { groupName: groupName, summaryTree: true, subtreeDepth: subtreeDepth, - includeProperties: false, service: instance, addAdditionalPropertiesCallback: (node, delegate) { final Map additionalJson = {}; diff --git a/packages/devtools_app/lib/src/debugger/flutter/breakpoints.dart b/packages/devtools_app/lib/src/debugger/flutter/breakpoints.dart index 0882b8f594a..ff4722c1edb 100644 --- a/packages/devtools_app/lib/src/debugger/flutter/breakpoints.dart +++ b/packages/devtools_app/lib/src/debugger/flutter/breakpoints.dart @@ -72,7 +72,6 @@ class _BreakpointPickerState extends State { child: Padding( padding: const EdgeInsets.all(borderPadding), child: Row( - crossAxisAlignment: CrossAxisAlignment.center, children: [ Padding( padding: const EdgeInsets.only( diff --git a/packages/devtools_app/lib/src/debugger/flutter/scripts.dart b/packages/devtools_app/lib/src/debugger/flutter/scripts.dart index 7890234f786..ffa8a555bdf 100644 --- a/packages/devtools_app/lib/src/debugger/flutter/scripts.dart +++ b/packages/devtools_app/lib/src/debugger/flutter/scripts.dart @@ -141,7 +141,6 @@ class ScriptPickerState extends State { child: Container( padding: const EdgeInsets.all(densePadding), child: Row( - crossAxisAlignment: CrossAxisAlignment.center, children: [ Icon( icon, diff --git a/packages/devtools_app/lib/src/flutter/connect_screen.dart b/packages/devtools_app/lib/src/flutter/connect_screen.dart index 7ed07fb5745..b29747426c7 100644 --- a/packages/devtools_app/lib/src/flutter/connect_screen.dart +++ b/packages/devtools_app/lib/src/flutter/connect_screen.dart @@ -78,7 +78,6 @@ class _ConnectScreenBodyState extends State { final CallbackDwell connectDebounce = CallbackDwell(_connect); return Row( - mainAxisAlignment: MainAxisAlignment.start, children: [ SizedBox( width: 350.0, diff --git a/packages/devtools_app/lib/src/flutter/notifications.dart b/packages/devtools_app/lib/src/flutter/notifications.dart index 1fb69536782..082d06310ab 100644 --- a/packages/devtools_app/lib/src/flutter/notifications.dart +++ b/packages/devtools_app/lib/src/flutter/notifications.dart @@ -89,7 +89,6 @@ class NotificationsState extends State<_NotificationsProvider> if (_overlayEntry == null) { _overlayEntry = OverlayEntry( maintainState: true, - opaque: false, builder: _buildOverlay, ); SchedulerBinding.instance.scheduleFrameCallback((_) { @@ -142,7 +141,6 @@ class NotificationsState extends State<_NotificationsProvider> child: SingleChildScrollView( reverse: true, child: Column( - verticalDirection: VerticalDirection.down, mainAxisSize: MainAxisSize.min, children: _notifications, ), diff --git a/packages/devtools_app/lib/src/flutter/tree.dart b/packages/devtools_app/lib/src/flutter/tree.dart index 20cc996112d..406afc7ab3f 100644 --- a/packages/devtools_app/lib/src/flutter/tree.dart +++ b/packages/devtools_app/lib/src/flutter/tree.dart @@ -106,7 +106,6 @@ class _TreeViewItemState> extends State> padding: EdgeInsets.only(left: nodeIndent(widget.data)), child: Row( mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, textBaseline: TextBaseline.alphabetic, children: [ widget.data.isExpandable diff --git a/packages/devtools_app/lib/src/http/_http_date.dart b/packages/devtools_app/lib/src/http/_http_date.dart index 2d4da42a80f..5f7f2e84275 100644 --- a/packages/devtools_app/lib/src/http/_http_date.dart +++ b/packages/devtools_app/lib/src/http/_http_date.dart @@ -270,7 +270,7 @@ class HttpDate { expect("GMT"); } expectEnd(); - return new DateTime.utc(year, month + 1, day, hours, minutes, seconds, 0); + return new DateTime.utc(year, month + 1, day, hours, minutes, seconds); } // Parse a cookie date string. @@ -397,6 +397,6 @@ class HttpDate { if (minute > 59) error(); if (second > 59) error(); - return new DateTime.utc(year, month, dayOfMonth, hour, minute, second, 0); + return new DateTime.utc(year, month, dayOfMonth, hour, minute, second); } } diff --git a/packages/devtools_app/lib/src/inspector/diagnostics_node.dart b/packages/devtools_app/lib/src/inspector/diagnostics_node.dart index bc8cad09e86..876b983066b 100644 --- a/packages/devtools_app/lib/src/inspector/diagnostics_node.dart +++ b/packages/devtools_app/lib/src/inspector/diagnostics_node.dart @@ -382,7 +382,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree { Future> get valueProperties async { if (_valueProperties == null) { if (propertyType == null || valueRef?.id == null) { - _valueProperties = Future.value(null); + _valueProperties = Future.value(); return _valueProperties; } if (isEnumProperty()) { @@ -401,7 +401,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree { propertyNames = ['codePoint']; break; default: - _valueProperties = Future.value(null); + _valueProperties = Future.value(); return _valueProperties; } _valueProperties = (await inspectorService) diff --git a/packages/devtools_app/lib/src/inspector/flutter/inspector_tree_flutter.dart b/packages/devtools_app/lib/src/inspector/flutter/inspector_tree_flutter.dart index 1b44a307143..31a1d72e0e8 100644 --- a/packages/devtools_app/lib/src/inspector/flutter/inspector_tree_flutter.dart +++ b/packages/devtools_app/lib/src/inspector/flutter/inspector_tree_flutter.dart @@ -535,7 +535,6 @@ class InspectorRowContent extends StatelessWidget { child: ClipRect( child: Row( mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, textBaseline: TextBaseline.alphabetic, children: [ node.showExpandCollapse diff --git a/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/arrow.dart b/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/arrow.dart index a97d26b80f3..7ea0e93051e 100644 --- a/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/arrow.dart +++ b/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/arrow.dart @@ -95,8 +95,6 @@ class ArrowWrapper extends StatelessWidget { Widget build(BuildContext context) { return Flex( direction: direction, - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.start, children: [ Expanded( child: Container( diff --git a/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/flex.dart b/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/flex.dart index 460732362d7..a48eaa0a39e 100644 --- a/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/flex.dart +++ b/packages/devtools_app/lib/src/inspector/flutter/layout_explorer/flex/flex.dart @@ -557,7 +557,6 @@ class _FlexLayoutExplorerWidgetState extends State decoration: BoxDecoration( border: Border.all( color: theme.primaryColorLight, - width: 1.0, ), ), margin: const EdgeInsets.only(top: margin, left: margin), @@ -677,7 +676,6 @@ class _FlexLayoutExplorerWidgetState extends State for (var alignment in alignmentEnumEntries) Row( mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( flex: 2, @@ -709,7 +707,6 @@ class _FlexLayoutExplorerWidgetState extends State padding: const EdgeInsets.symmetric(vertical: margin), child: Row( mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( child: Text( @@ -1024,7 +1021,6 @@ class FlexChildVisualizer extends StatelessWidget { left: margin, ), child: Column( - mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end, children: [ Flexible( diff --git a/packages/devtools_app/lib/src/inspector/inspector_controller.dart b/packages/devtools_app/lib/src/inspector/inspector_controller.dart index e32faa0dc97..0a937d07a30 100644 --- a/packages/devtools_app/lib/src/inspector/inspector_controller.dart +++ b/packages/devtools_app/lib/src/inspector/inspector_controller.dart @@ -296,7 +296,7 @@ class InspectorController extends DisposableController if (!visibleToUser) { // We will refresh again once we are visible. // There is a risk a refresh got triggered before the view was visble. - return Future.value(null); + return Future.value(); } // TODO(jacobr): refresh the tree as well as just the properties. @@ -340,7 +340,7 @@ class InspectorController extends DisposableController Future onForceRefresh() { assert(!_disposed); if (!visibleToUser || _disposed) { - return Future.value(null); + return Future.value(); } recomputeTreeRoot(null, null, false); diff --git a/packages/devtools_app/lib/src/inspector/inspector_service.dart b/packages/devtools_app/lib/src/inspector/inspector_service.dart index d26ca26661e..024cd2d42fb 100644 --- a/packages/devtools_app/lib/src/inspector/inspector_service.dart +++ b/packages/devtools_app/lib/src/inspector/inspector_service.dart @@ -532,7 +532,7 @@ class ObjectGroup { Future _callServiceExtension( String extension, Map args) { if (disposed) { - return Future.value(null); + return Future.value(); } return inspectorLibrary.addRequest(this, () async { @@ -871,7 +871,7 @@ class ObjectGroup { Future setSelectionInspector( InspectorInstanceRef selection, bool uiAlreadyUpdated) { if (disposed) { - return Future.value(null); + return Future.value(); } inspectorService._trackClientSelfTriggeredSelection(selection); if (useDaemonApi) { @@ -1032,7 +1032,7 @@ class InspectorObjectGroupManager { } if (_next == null) { // There is no pending update. - return Future.value(null); + return Future.value(); } _pendingNext = Completer(); diff --git a/packages/devtools_app/lib/src/logging/flutter/logging_screen.dart b/packages/devtools_app/lib/src/logging/flutter/logging_screen.dart index 50c26e1ab44..bb0c88da639 100644 --- a/packages/devtools_app/lib/src/logging/flutter/logging_screen.dart +++ b/packages/devtools_app/lib/src/logging/flutter/logging_screen.dart @@ -109,7 +109,6 @@ class _LoggingScreenState extends State Widget build(BuildContext context) { return Column(children: [ Row( - mainAxisAlignment: MainAxisAlignment.start, children: [ clearButton(onPressed: _clearLogs), const Spacer(), diff --git a/packages/devtools_app/lib/src/memory/flutter/memory_chart.dart b/packages/devtools_app/lib/src/memory/flutter/memory_chart.dart index 8a9d65f7d62..53d82745bdf 100644 --- a/packages/devtools_app/lib/src/memory/flutter/memory_chart.dart +++ b/packages/devtools_app/lib/src/memory/flutter/memory_chart.dart @@ -208,7 +208,6 @@ class MemoryChartState extends State with AutoDisposeMixin { ? const SizedBox() : Column( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, children: [ SizedBox( height: defaultChartHeight, @@ -279,15 +278,9 @@ class MemoryChartState extends State with AutoDisposeMixin { ..textSize = 2.0; */ }, - highLightPerTapEnabled: true, backgroundColor: chartBackgroundColor, doubleTapToZoomEnabled: false, - drawGridBackground: false, - dragXEnabled: true, - dragYEnabled: true, // TODO(terry): For now disable zoom with double-click. - scaleXEnabled: true, - scaleYEnabled: true, pinchZoomEnabled: false, description: desc, marker: _selectedDartChart, @@ -349,11 +342,7 @@ class MemoryChartState extends State with AutoDisposeMixin { ..textSize = 2.0; */ }, - highLightPerTapEnabled: true, backgroundColor: chartBackgroundColor, - drawGridBackground: false, - dragXEnabled: true, - dragYEnabled: true, // TOD(terry): Disable zoom via double-click. Consider +/- button // for a controlled zoom in/zoom out. scaleXEnabled: false, diff --git a/packages/devtools_app/lib/src/memory/flutter/memory_filter.dart b/packages/devtools_app/lib/src/memory/flutter/memory_filter.dart index 59ca242f912..abeb958a03d 100644 --- a/packages/devtools_app/lib/src/memory/flutter/memory_filter.dart +++ b/packages/devtools_app/lib/src/memory/flutter/memory_filter.dart @@ -326,7 +326,6 @@ class SnapshotFilterState extends State child: Padding( padding: const EdgeInsets.only(left: 15), child: Column( - mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ Column( @@ -338,28 +337,24 @@ class SnapshotFilterState extends State labelText: 'Filter Snapshot'), ), Row( - mainAxisAlignment: MainAxisAlignment.start, children: [ privateClasses, const Text('Hide Private Class e.g.,_className'), ], ), Row( - mainAxisAlignment: MainAxisAlignment.start, children: [ zeroInstances, const Text('Hide Classes with No Instances'), ], ), Row( - mainAxisAlignment: MainAxisAlignment.start, children: [ libraryNoInstances, const Text('Hide Library with No Instances'), ], ), Row( - mainAxisAlignment: MainAxisAlignment.start, children: [ const Padding(padding: EdgeInsets.only(top: 30)), Text('Hide Libraries or Packages ' diff --git a/packages/devtools_app/lib/src/memory/flutter/memory_screen.dart b/packages/devtools_app/lib/src/memory/flutter/memory_screen.dart index b74712a5830..6a73c3feb26 100644 --- a/packages/devtools_app/lib/src/memory/flutter/memory_screen.dart +++ b/packages/devtools_app/lib/src/memory/flutter/memory_screen.dart @@ -249,7 +249,6 @@ class MemoryBodyState extends State with AutoDisposeMixin { valueListenable: controller.paused, builder: (context, paused, _) { return Row( - crossAxisAlignment: CrossAxisAlignment.center, children: [ OutlineButton( key: MemoryScreen.pauseButtonKey, @@ -312,7 +311,6 @@ class MemoryBodyState extends State with AutoDisposeMixin { Widget _buildMemoryControls(TextTheme textTheme) { return Row( - crossAxisAlignment: CrossAxisAlignment.center, children: [ _memorySourceDropdown(textTheme), const SizedBox(width: defaultSpacing), diff --git a/packages/devtools_app/lib/src/timeline/flutter/timeline_screen.dart b/packages/devtools_app/lib/src/timeline/flutter/timeline_screen.dart index d35496913da..5dab18b420b 100644 --- a/packages/devtools_app/lib/src/timeline/flutter/timeline_screen.dart +++ b/packages/devtools_app/lib/src/timeline/flutter/timeline_screen.dart @@ -365,7 +365,6 @@ class TimelineConfigurationsDialog extends StatelessWidget { padding: const EdgeInsets.all(defaultSpacing), child: Column( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ ...headerInColumn(theme.textTheme, 'Recorded Streams'), @@ -428,7 +427,6 @@ class TimelineConfigurationsDialog extends StatelessWidget { }) { return Row( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, children: [ ValueListenableBuilder( valueListenable: listenable, diff --git a/packages/devtools_app/lib/src/ui/flutter/dialog.dart b/packages/devtools_app/lib/src/ui/flutter/dialog.dart index 9d9c50537d7..eb03ef94de5 100644 --- a/packages/devtools_app/lib/src/ui/flutter/dialog.dart +++ b/packages/devtools_app/lib/src/ui/flutter/dialog.dart @@ -12,7 +12,7 @@ class DialogCancelButton extends StatelessWidget { Widget build(BuildContext context) { return FlatButton( onPressed: () { - Navigator.of(context, rootNavigator: false).pop(dialogDefault); + Navigator.of(context).pop(dialogDefault); }, child: const Text('Cancel'), ); @@ -30,7 +30,7 @@ class DialogOkButton extends StatelessWidget { return FlatButton( onPressed: () { if (onOk != null) onOk(); - Navigator.of(context, rootNavigator: false).pop(dialogDefault); + Navigator.of(context).pop(dialogDefault); }, child: const Text('OK'), ); diff --git a/packages/devtools_app/lib/src/ui/icons.dart b/packages/devtools_app/lib/src/ui/icons.dart index 0f18a82dd48..ce5f7196038 100644 --- a/packages/devtools_app/lib/src/ui/icons.dart +++ b/packages/devtools_app/lib/src/ui/icons.dart @@ -248,6 +248,5 @@ Image createImageIcon(String url) { image: AssetImage(url), height: defaultIconSize, width: defaultIconSize, - color: null, ); } diff --git a/packages/devtools_app/test/flutter/extent_delegate_test.dart b/packages/devtools_app/test/flutter/extent_delegate_test.dart index cc92df11d44..2eee0266d25 100644 --- a/packages/devtools_app/test/flutter/extent_delegate_test.dart +++ b/packages/devtools_app/test/flutter/extent_delegate_test.dart @@ -195,7 +195,6 @@ void main() { extentDelegate: extentDelegate, ); final RenderViewport root = RenderViewport( - axisDirection: AxisDirection.down, crossAxisDirection: AxisDirection.right, offset: ViewportOffset.zero(), cacheExtent: 0, diff --git a/packages/devtools_app/test/http_request_data_table_source_test.dart b/packages/devtools_app/test/http_request_data_table_source_test.dart index 7a2966b6107..f6cab1418c5 100644 --- a/packages/devtools_app/test/http_request_data_table_source_test.dart +++ b/packages/devtools_app/test/http_request_data_table_source_test.dart @@ -56,7 +56,7 @@ void main() { ); expect( - dataTable.formatRequestTime(DateTime(2020, 1, 16, 13, 0, 0)), + dataTable.formatRequestTime(DateTime(2020, 1, 16, 13)), '13:00:00 1/16/2020', ); });