Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ String addServiceExtensions() {
groupName: groupName,
summaryTree: true,
subtreeDepth: subtreeDepth,
includeProperties: false,
service: instance,
addAdditionalPropertiesCallback: (node, delegate) {
final Map<String, Object> additionalJson = <String, Object>{};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class _BreakpointPickerState extends State<BreakpointPicker> {
child: Padding(
padding: const EdgeInsets.all(borderPadding),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Padding(
padding: const EdgeInsets.only(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ class ScriptPickerState extends State<ScriptPicker> {
child: Container(
padding: const EdgeInsets.all(densePadding),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Icon(
icon,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class _ConnectScreenBodyState extends State<ConnectScreenBody> {
final CallbackDwell connectDebounce = CallbackDwell(_connect);

return Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 350.0,
Expand Down
2 changes: 0 additions & 2 deletions packages/devtools_app/lib/src/flutter/notifications.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ class NotificationsState extends State<_NotificationsProvider>
if (_overlayEntry == null) {
_overlayEntry = OverlayEntry(
maintainState: true,
opaque: false,
builder: _buildOverlay,
);
SchedulerBinding.instance.scheduleFrameCallback((_) {
Expand Down Expand Up @@ -142,7 +141,6 @@ class NotificationsState extends State<_NotificationsProvider>
child: SingleChildScrollView(
reverse: true,
child: Column(
verticalDirection: VerticalDirection.down,
mainAxisSize: MainAxisSize.min,
children: _notifications,
),
Expand Down
1 change: 0 additions & 1 deletion packages/devtools_app/lib/src/flutter/tree.dart
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ class _TreeViewItemState<T extends TreeNode<T>> extends State<TreeViewItem<T>>
padding: EdgeInsets.only(left: nodeIndent(widget.data)),
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
textBaseline: TextBaseline.alphabetic,
children: [
widget.data.isExpandable
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools_app/lib/src/http/_http_date.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree {
Future<Map<String, InstanceRef>> get valueProperties async {
if (_valueProperties == null) {
if (propertyType == null || valueRef?.id == null) {
_valueProperties = Future.value(null);
_valueProperties = Future.value();
return _valueProperties;
}
if (isEnumProperty()) {
Expand All @@ -401,7 +401,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree {
propertyNames = ['codePoint'];
break;
default:
_valueProperties = Future.value(null);
_valueProperties = Future.value();
return _valueProperties;
}
_valueProperties = (await inspectorService)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,6 @@ class InspectorRowContent extends StatelessWidget {
child: ClipRect(
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
textBaseline: TextBaseline.alphabetic,
children: [
node.showExpandCollapse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ class ArrowWrapper extends StatelessWidget {
Widget build(BuildContext context) {
return Flex(
direction: direction,
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Container(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,6 @@ class _FlexLayoutExplorerWidgetState extends State<FlexLayoutExplorerWidget>
decoration: BoxDecoration(
border: Border.all(
color: theme.primaryColorLight,
width: 1.0,
),
),
margin: const EdgeInsets.only(top: margin, left: margin),
Expand Down Expand Up @@ -677,7 +676,6 @@ class _FlexLayoutExplorerWidgetState extends State<FlexLayoutExplorerWidget>
for (var alignment in alignmentEnumEntries)
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 2,
Expand Down Expand Up @@ -709,7 +707,6 @@ class _FlexLayoutExplorerWidgetState extends State<FlexLayoutExplorerWidget>
padding: const EdgeInsets.symmetric(vertical: margin),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Text(
Expand Down Expand Up @@ -1024,7 +1021,6 @@ class FlexChildVisualizer extends StatelessWidget {
left: margin,
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Flexible(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -340,7 +340,7 @@ class InspectorController extends DisposableController
Future<void> onForceRefresh() {
assert(!_disposed);
if (!visibleToUser || _disposed) {
return Future.value(null);
return Future.value();
}
recomputeTreeRoot(null, null, false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ class ObjectGroup {
Future<Object> _callServiceExtension(
String extension, Map<String, Object> args) {
if (disposed) {
return Future.value(null);
return Future.value();
}

return inspectorLibrary.addRequest(this, () async {
Expand Down Expand Up @@ -871,7 +871,7 @@ class ObjectGroup {
Future<void> setSelectionInspector(
InspectorInstanceRef selection, bool uiAlreadyUpdated) {
if (disposed) {
return Future.value(null);
return Future.value();
}
inspectorService._trackClientSelfTriggeredSelection(selection);
if (useDaemonApi) {
Expand Down Expand Up @@ -1032,7 +1032,7 @@ class InspectorObjectGroupManager {
}
if (_next == null) {
// There is no pending update.
return Future.value(null);
return Future.value();
}

_pendingNext = Completer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ class _LoggingScreenState extends State<LoggingScreenBody>
Widget build(BuildContext context) {
return Column(children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
clearButton(onPressed: _clearLogs),
const Spacer(),
Expand Down
11 changes: 0 additions & 11 deletions packages/devtools_app/lib/src/memory/flutter/memory_chart.dart
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ class MemoryChartState extends State<MemoryChart> with AutoDisposeMixin {
? const SizedBox()
: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
height: defaultChartHeight,
Expand Down Expand Up @@ -279,15 +278,9 @@ class MemoryChartState extends State<MemoryChart> 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,
Expand Down Expand Up @@ -349,11 +342,7 @@ class MemoryChartState extends State<MemoryChart> 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ class SnapshotFilterState extends State<SnapshotFilterDialog>
child: Padding(
padding: const EdgeInsets.only(left: 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
Expand All @@ -338,28 +337,24 @@ class SnapshotFilterState extends State<SnapshotFilterDialog>
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 '
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ class MemoryBodyState extends State<MemoryBody> with AutoDisposeMixin {
valueListenable: controller.paused,
builder: (context, paused, _) {
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
OutlineButton(
key: MemoryScreen.pauseButtonKey,
Expand Down Expand Up @@ -312,7 +311,6 @@ class MemoryBodyState extends State<MemoryBody> with AutoDisposeMixin {

Widget _buildMemoryControls(TextTheme textTheme) {
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
_memorySourceDropdown(textTheme),
const SizedBox(width: defaultSpacing),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -428,7 +427,6 @@ class TimelineConfigurationsDialog extends StatelessWidget {
}) {
return Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
children: [
ValueListenableBuilder(
valueListenable: listenable,
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools_app/lib/src/ui/flutter/dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
);
Expand All @@ -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'),
);
Expand Down
1 change: 0 additions & 1 deletion packages/devtools_app/lib/src/ui/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,5 @@ Image createImageIcon(String url) {
image: AssetImage(url),
height: defaultIconSize,
width: defaultIconSize,
color: null,
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ void main() {
extentDelegate: extentDelegate,
);
final RenderViewport root = RenderViewport(
axisDirection: AxisDirection.down,
crossAxisDirection: AxisDirection.right,
offset: ViewportOffset.zero(),
cacheExtent: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
);
});
Expand Down