From 12a0b8abdc9698f5041d3a53ce32fba9e4ebea07 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Thu, 14 Jan 2021 10:54:16 -0600 Subject: [PATCH 01/11] Render the "Import File" button. --- .../src/app_size/file_import_container.dart | 47 +- packages/devtools_app/pubspec.lock | 761 ++++++++++++++++++ packages/devtools_app/pubspec.yaml | 34 +- 3 files changed, 812 insertions(+), 30 deletions(-) create mode 100644 packages/devtools_app/pubspec.lock diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index 5be1dc0ac6f..886e3967bcc 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:flutter/foundation.dart'; +import 'package:file_selector/file_selector.dart'; import '../common_widgets.dart'; import '../config_specific/drag_and_drop/drag_and_drop.dart'; @@ -118,8 +121,7 @@ class _FileImportContainerState extends State { child: _buildImportedFileDisplay(), ), ), - // TODO(kenz): uncomment once file picker support is added - // _buildImportButton(), + if (_shouldShowImportButton) _buildImportButton(), // Horizontal spacer with flex value of 1. const Flexible( child: SizedBox(height: rowHeight), @@ -138,18 +140,35 @@ class _FileImportContainerState extends State { ); } -// TODO(kenz): uncomment once file picker support is added -// Widget _buildImportButton() { -// return Row( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// OutlinedButton( -// onPressed: () {}, -// child: const MaterialIconLabel(Icons.file_upload, 'Import File'), -// ), -// ], -// ); -// } + Widget _buildImportButton() { + return Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + OutlinedButton( + onPressed: () async { + final acceptedTypeGroups = [ + XTypeGroup(extensions: ['.json']), + ]; + final file = await openFile(acceptedTypeGroups: acceptedTypeGroups); + final json = jsonDecode(await file.readAsString()); + final devToolsJsonFile = DevToolsJsonFile( + name: file.name, + lastModifiedTime: await file.lastModified(), + data: json, + ); + _handleImportedFile(devToolsJsonFile); + }, + child: const MaterialIconLabel(Icons.file_upload, 'Import File'), + ), + ], + ); + } + + // Only show the import button in linux, macOS and web. + bool get _shouldShowImportButton => + kIsWeb || + defaultTargetPlatform == TargetPlatform.linux || + defaultTargetPlatform == TargetPlatform.macOS; Widget _buildActionButton() { return Column( diff --git a/packages/devtools_app/pubspec.lock b/packages/devtools_app/pubspec.lock new file mode 100644 index 00000000000..25ef1da10d6 --- /dev/null +++ b/packages/devtools_app/pubspec.lock @@ -0,0 +1,761 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "12.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "0.40.6" + ansi_up: + dependency: "direct main" + description: + name: ansi_up + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2" + ansicolor: + dependency: "direct main" + description: + name: ansicolor + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.0" + async: + dependency: "direct main" + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.5.0-nullsafety.3" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0-nullsafety.3" + browser_launcher: + dependency: transitive + description: + name: browser_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.8" + build: + dependency: transitive + description: + name: build + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.0" + build_config: + dependency: transitive + description: + name: build_config + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.5" + build_daemon: + dependency: transitive + description: + name: build_daemon + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.4" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.1" + build_runner: + dependency: "direct dev" + description: + name: build_runner + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.11" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.5" + built_collection: + dependency: transitive + description: + name: built_collection + url: "https://pub.dartlang.org" + source: hosted + version: "4.3.2" + built_value: + dependency: transitive + description: + name: built_value + url: "https://pub.dartlang.org" + source: hosted + version: "7.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.5" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0-nullsafety.3" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.3" + code_builder: + dependency: transitive + description: + name: code_builder + url: "https://pub.dartlang.org" + source: hosted + version: "3.5.0" + collection: + dependency: "direct main" + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0-nullsafety.5" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + coverage: + dependency: transitive + description: + name: coverage + url: "https://pub.dartlang.org" + source: hosted + version: "0.14.2" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.5" + dart_style: + dependency: transitive + description: + name: dart_style + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.10" + devtools: + dependency: "direct dev" + description: + path: "../devtools" + relative: true + source: path + version: "0.9.6" + devtools_server: + dependency: "direct overridden" + description: + path: "../devtools_server" + relative: true + source: path + version: "0.9.6" + devtools_shared: + dependency: "direct main" + description: + path: "../devtools_shared" + relative: true + source: path + version: "0.9.6" + devtools_testing: + dependency: "direct dev" + description: + path: "../devtools_testing" + relative: true + source: path + version: "0.9.6" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0-nullsafety.3" + file: + dependency: "direct main" + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "5.2.1" + file_selector: + dependency: "direct main" + description: + name: file_selector + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0+2" + file_selector_linux: + dependency: "direct main" + description: + name: file_selector_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1" + file_selector_macos: + dependency: "direct main" + description: + name: file_selector_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1" + file_selector_platform_interface: + dependency: transitive + description: + name: file_selector_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + file_selector_web: + dependency: "direct main" + description: + name: file_selector_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0+1" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "0.10.11" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + graphs: + dependency: transitive + description: + name: graphs + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + http: + dependency: "direct main" + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.2" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.4" + intl: + dependency: "direct main" + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.16.1" + io: + dependency: transitive + description: + name: io + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.4" + js: + dependency: "direct main" + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3-nullsafety.3" + json_annotation: + dependency: transitive + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.1" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "0.11.4" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.10-nullsafety.3" + meta: + dependency: "direct main" + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0-nullsafety.6" + mime: + dependency: "direct main" + description: + name: mime + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.7" + mockito: + dependency: "direct dev" + description: + name: mockito + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.3" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4" + node_interop: + dependency: transitive + description: + name: node_interop + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" + node_io: + dependency: transitive + description: + name: node_io + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + node_preamble: + dependency: transitive + description: + name: node_preamble + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.12" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.3" + package_resolver: + dependency: transitive + description: + name: package_resolver + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.10" + path: + dependency: "direct main" + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0-nullsafety.3" + pedantic: + dependency: "direct main" + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0-nullsafety.3" + platform_detect: + dependency: transitive + description: + name: platform_detect + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + pool: + dependency: transitive + description: + name: pool + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.0-nullsafety.3" + provider: + dependency: "direct main" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "4.3.2+3" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.7" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.5" + shelf: + dependency: transitive + description: + name: shelf + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.9" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shelf_proxy: + dependency: transitive + description: + name: shelf_proxy + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0+7" + shelf_static: + dependency: transitive + description: + name: shelf_static + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.9+1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.3" + simple_lint_rules: + dependency: "direct dev" + description: + name: simple_lint_rules + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1+1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.10+1" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0-nullsafety.4" + source_maps: + dependency: transitive + description: + name: source_maps + url: "https://pub.dartlang.org" + source: hosted + version: "0.10.10-nullsafety.3" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0-nullsafety.4" + sse: + dependency: "direct main" + description: + name: sse + url: "https://pub.dartlang.org" + source: hosted + version: "3.6.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0-nullsafety.6" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0-nullsafety.3" + stream_transform: + dependency: transitive + description: + name: stream_transform + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + string_scanner: + dependency: "direct main" + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.3" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0-nullsafety.3" + test: + dependency: "direct dev" + description: + name: test + url: "https://pub.dartlang.org" + source: hosted + version: "1.16.0-nullsafety.13" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.19-nullsafety.6" + test_core: + dependency: transitive + description: + name: test_core + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.12-nullsafety.12" + timing: + dependency: transitive + description: + name: timing + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.1+3" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0-nullsafety.5" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "5.7.10" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+4" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+9" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.9" + url_launcher_web: + dependency: "direct main" + description: + name: url_launcher_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.5+1" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+3" + usage: + dependency: transitive + description: + name: usage + url: "https://pub.dartlang.org" + source: hosted + version: "3.4.2" + uuid: + dependency: transitive + description: + name: uuid + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.2" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0-nullsafety.5" + vm_service: + dependency: "direct main" + description: + name: vm_service + url: "https://pub.dartlang.org" + source: hosted + version: "5.5.0" + vm_snapshot_analysis: + dependency: "direct main" + description: + name: vm_snapshot_analysis + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.5" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.7+15" + web_socket_channel: + dependency: "direct main" + description: + name: web_socket_channel + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + webkit_inspection_protocol: + dependency: "direct dev" + description: + name: webkit_inspection_protocol + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.4" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" +sdks: + dart: ">=2.12.0-0.0 <3.0.0" + flutter: ">=1.22.0" diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index b79624ec42a..cd88e7f151b 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -11,23 +11,26 @@ version: 0.9.6+2 homepage: https://github.com/flutter/devtools environment: - sdk: '>=2.10.0 <3.0.0' + sdk: ">=2.10.0 <3.0.0" # The flutter desktop support interacts with build scripts on the Flutter # side that are not yet stable, so it requires a very recent version of # Flutter. This version will increase regularly as the build scripts change. - flutter: '>=1.10.0' + flutter: ">=1.10.0" dependencies: - ansi_up: - ^0.0.2 + ansi_up: ^0.0.2 # path: ../../third_party/packages/ansi_up # Pin ansicolor to version before pre-NNBD version 1.1.0, should be ^1.0.5 - # See https://github.com/flutter/devtools/issues/2530 + # See https://github.com/flutter/devtools/issues/2530 ansicolor: 1.0.5 - async: ^2.0.0 + async: ^2.0.0 collection: ^1.15.0-nnbd devtools_shared: 0.9.6+2 file: ^5.1.0 + file_selector: ^0.7.0 + file_selector_linux: ^0.0.1 + file_selector_macos: ^0.0.1 + file_selector_web: ^0.7.0 flutter: sdk: flutter flutter_web_plugins: @@ -59,8 +62,7 @@ dev_dependencies: # (temporary home for canonical lints) simple_lint_rules: ^1.0.0 test: any # This version is pinned by Flutter so we don't need to set one explicitly. - webkit_inspection_protocol: '>=0.5.0 <0.8.0' - + webkit_inspection_protocol: ">=0.5.0 <0.8.0" flutter: uses-material-design: true @@ -113,12 +115,12 @@ flutter: - asset: fonts/Octicons.ttf dependency_overrides: -# The "#OVERRIDE_FOR_DEVELOPMENT" lines are stripped out when we publish. -# All overriden dependencies are published together so there is no harm -# in treating them like they are part of a mono-repo while developing. + # The "#OVERRIDE_FOR_DEVELOPMENT" lines are stripped out when we publish. + # All overriden dependencies are published together so there is no harm + # in treating them like they are part of a mono-repo while developing. devtools_server: #OVERRIDE_FOR_DEVELOPMENT - path: ../devtools_server #OVERRIDE_FOR_DEVELOPMENT - devtools_shared: #OVERRIDE_FOR_DEVELOPMENT - path: ../devtools_shared #OVERRIDE_FOR_DEVELOPMENT - devtools_testing: #OVERRIDE_FOR_DEVELOPMENT - path: ../devtools_testing #OVERRIDE_FOR_DEVELOPMENT + path: ../devtools_server #OVERRIDE_FOR_DEVELOPMENT + devtools_shared: #OVERRIDE_FOR_DEVELOPMENT + path: ../devtools_shared #OVERRIDE_FOR_DEVELOPMENT + devtools_testing: #OVERRIDE_FOR_DEVELOPMENT + path: ../devtools_testing #OVERRIDE_FOR_DEVELOPMENT From 016fd27edd3e8eec414c0fc65fbf5d2205ea81f8 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Thu, 14 Jan 2021 12:21:14 -0600 Subject: [PATCH 02/11] Fix the extension. --- .../devtools_app/lib/src/app_size/file_import_container.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index 886e3967bcc..f3669cee300 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -147,7 +147,7 @@ class _FileImportContainerState extends State { OutlinedButton( onPressed: () async { final acceptedTypeGroups = [ - XTypeGroup(extensions: ['.json']), + XTypeGroup(extensions: ['json']), ]; final file = await openFile(acceptedTypeGroups: acceptedTypeGroups); final json = jsonDecode(await file.readAsString()); From 744a9df2135fc3bf75f13b4de44fec31eaa8a4b1 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Thu, 14 Jan 2021 12:26:42 -0600 Subject: [PATCH 03/11] Add support for windows --- .../lib/src/app_size/file_import_container.dart | 9 +-------- packages/devtools_app/pubspec.lock | 7 +++++++ packages/devtools_app/pubspec.yaml | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index f3669cee300..c64d4b08448 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -4,7 +4,6 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; import 'package:file_selector/file_selector.dart'; import '../common_widgets.dart'; @@ -121,7 +120,7 @@ class _FileImportContainerState extends State { child: _buildImportedFileDisplay(), ), ), - if (_shouldShowImportButton) _buildImportButton(), + _buildImportButton(), // Horizontal spacer with flex value of 1. const Flexible( child: SizedBox(height: rowHeight), @@ -164,12 +163,6 @@ class _FileImportContainerState extends State { ); } - // Only show the import button in linux, macOS and web. - bool get _shouldShowImportButton => - kIsWeb || - defaultTargetPlatform == TargetPlatform.linux || - defaultTargetPlatform == TargetPlatform.macOS; - Widget _buildActionButton() { return Column( mainAxisAlignment: MainAxisAlignment.center, diff --git a/packages/devtools_app/pubspec.lock b/packages/devtools_app/pubspec.lock index 25ef1da10d6..06ce3120d7f 100644 --- a/packages/devtools_app/pubspec.lock +++ b/packages/devtools_app/pubspec.lock @@ -274,6 +274,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.7.0+1" + file_selector_windows: + dependency: "direct main" + description: + name: file_selector_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1" fixnum: dependency: transitive description: diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index cd88e7f151b..aa824b40b11 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: file_selector_linux: ^0.0.1 file_selector_macos: ^0.0.1 file_selector_web: ^0.7.0 + file_selector_windows: ^0.0.1 flutter: sdk: flutter flutter_web_plugins: From 4cb0f2eaba6a10b0fdc5bfb2185308ce062bb475 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Thu, 14 Jan 2021 13:15:32 -0600 Subject: [PATCH 04/11] Change _buildImportedFileDisplay format --- .../lib/src/app_size/file_import_container.dart | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index c64d4b08448..ec2db90ebcb 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -129,15 +129,11 @@ class _FileImportContainerState extends State { ); } - Widget _buildImportedFileDisplay() { - return Text( - importedFile?.path ?? 'No File Selected', - style: TextStyle( - color: Theme.of(context).textTheme.headline1.color, - ), - textAlign: TextAlign.left, - ); - } + Widget _buildImportedFileDisplay() => Text( + importedFile?.path ?? 'No File Selected', + style: TextStyle(color: Theme.of(context).textTheme.headline1.color), + textAlign: TextAlign.left, + ); Widget _buildImportButton() { return Row( From b7bd935ebc6063a4379551b6b49a45ddbf9313cb Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Fri, 15 Jan 2021 13:39:50 -0600 Subject: [PATCH 05/11] Reorganize code --- .../lib/src/app_size/file_import_container.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index ec2db90ebcb..45166c7fb87 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -142,14 +142,15 @@ class _FileImportContainerState extends State { OutlinedButton( onPressed: () async { final acceptedTypeGroups = [ - XTypeGroup(extensions: ['json']), + XTypeGroup(extensions: ['json']) ]; final file = await openFile(acceptedTypeGroups: acceptedTypeGroups); - final json = jsonDecode(await file.readAsString()); + final data = jsonDecode(await file.readAsString()); + final lastModifiedTime = await file.lastModified(); final devToolsJsonFile = DevToolsJsonFile( + data: data, name: file.name, - lastModifiedTime: await file.lastModified(), - data: json, + lastModifiedTime: lastModifiedTime, ); _handleImportedFile(devToolsJsonFile); }, From 9ec532989c7ef0385ce88cfa1b5be47dc6045521 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Fri, 15 Jan 2021 14:09:47 -0600 Subject: [PATCH 06/11] Restore pubspec format --- packages/devtools_app/pubspec.yaml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index aa824b40b11..e091a32f38a 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -11,19 +11,20 @@ version: 0.9.6+2 homepage: https://github.com/flutter/devtools environment: - sdk: ">=2.10.0 <3.0.0" + sdk: '>=2.10.0 <3.0.0' # The flutter desktop support interacts with build scripts on the Flutter # side that are not yet stable, so it requires a very recent version of # Flutter. This version will increase regularly as the build scripts change. - flutter: ">=1.10.0" + flutter: '>=1.10.0' dependencies: - ansi_up: ^0.0.2 + ansi_up: + ^0.0.2 # path: ../../third_party/packages/ansi_up # Pin ansicolor to version before pre-NNBD version 1.1.0, should be ^1.0.5 - # See https://github.com/flutter/devtools/issues/2530 + # See https://github.com/flutter/devtools/issues/2530 ansicolor: 1.0.5 - async: ^2.0.0 + async: ^2.0.0 collection: ^1.15.0-nnbd devtools_shared: 0.9.6+2 file: ^5.1.0 @@ -63,7 +64,8 @@ dev_dependencies: # (temporary home for canonical lints) simple_lint_rules: ^1.0.0 test: any # This version is pinned by Flutter so we don't need to set one explicitly. - webkit_inspection_protocol: ">=0.5.0 <0.8.0" + webkit_inspection_protocol: '>=0.5.0 <0.8.0' + flutter: uses-material-design: true @@ -116,12 +118,12 @@ flutter: - asset: fonts/Octicons.ttf dependency_overrides: - # The "#OVERRIDE_FOR_DEVELOPMENT" lines are stripped out when we publish. - # All overriden dependencies are published together so there is no harm - # in treating them like they are part of a mono-repo while developing. +# The "#OVERRIDE_FOR_DEVELOPMENT" lines are stripped out when we publish. +# All overriden dependencies are published together so there is no harm +# in treating them like they are part of a mono-repo while developing. devtools_server: #OVERRIDE_FOR_DEVELOPMENT - path: ../devtools_server #OVERRIDE_FOR_DEVELOPMENT - devtools_shared: #OVERRIDE_FOR_DEVELOPMENT - path: ../devtools_shared #OVERRIDE_FOR_DEVELOPMENT - devtools_testing: #OVERRIDE_FOR_DEVELOPMENT - path: ../devtools_testing #OVERRIDE_FOR_DEVELOPMENT + path: ../devtools_server #OVERRIDE_FOR_DEVELOPMENT + devtools_shared: #OVERRIDE_FOR_DEVELOPMENT + path: ../devtools_shared #OVERRIDE_FOR_DEVELOPMENT + devtools_testing: #OVERRIDE_FOR_DEVELOPMENT + path: ../devtools_testing #OVERRIDE_FOR_DEVELOPMENT From d38453b5774a36f04d5efa2852d3ef66e7c92ef7 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Fri, 15 Jan 2021 14:24:57 -0600 Subject: [PATCH 07/11] Refactor the file importer --- .../src/app_size/file_import_container.dart | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index 45166c7fb87..45f1abe1676 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -140,20 +140,7 @@ class _FileImportContainerState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ OutlinedButton( - onPressed: () async { - final acceptedTypeGroups = [ - XTypeGroup(extensions: ['json']) - ]; - final file = await openFile(acceptedTypeGroups: acceptedTypeGroups); - final data = jsonDecode(await file.readAsString()); - final lastModifiedTime = await file.lastModified(); - final devToolsJsonFile = DevToolsJsonFile( - data: data, - name: file.name, - lastModifiedTime: lastModifiedTime, - ); - _handleImportedFile(devToolsJsonFile); - }, + onPressed: _importFile, child: const MaterialIconLabel(Icons.file_upload, 'Import File'), ), ], @@ -183,6 +170,21 @@ class _FileImportContainerState extends State { ); } + void _importFile() async { + final acceptedTypeGroups = [ + XTypeGroup(extensions: ['json']) + ]; + final file = await openFile(acceptedTypeGroups: acceptedTypeGroups); + final data = jsonDecode(await file.readAsString()); + final lastModifiedTime = await file.lastModified(); + final devToolsJsonFile = DevToolsJsonFile( + data: data, + name: file.name, + lastModifiedTime: lastModifiedTime, + ); + _handleImportedFile(devToolsJsonFile); + } + // TODO(kenz): add error handling to ensure we only allow importing supported // files. void _handleImportedFile(DevToolsJsonFile file) { From 3b0ba839d0d509fd50f534d891f5e05c2946a076 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Fri, 15 Jan 2021 14:31:05 -0600 Subject: [PATCH 08/11] Add a different overflow strategy --- .../devtools_app/lib/src/app_size/file_import_container.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index 45f1abe1676..d2207806b52 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -131,6 +131,7 @@ class _FileImportContainerState extends State { Widget _buildImportedFileDisplay() => Text( importedFile?.path ?? 'No File Selected', + overflow: TextOverflow.ellipsis, style: TextStyle(color: Theme.of(context).textTheme.headline1.color), textAlign: TextAlign.left, ); From e802e7138fca9ea2d83d22451cdee7b4e011dea6 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Fri, 15 Jan 2021 14:33:39 -0600 Subject: [PATCH 09/11] Revert formatting --- .../lib/src/app_size/file_import_container.dart | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index d2207806b52..17664721e8e 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -129,12 +129,16 @@ class _FileImportContainerState extends State { ); } - Widget _buildImportedFileDisplay() => Text( - importedFile?.path ?? 'No File Selected', - overflow: TextOverflow.ellipsis, - style: TextStyle(color: Theme.of(context).textTheme.headline1.color), - textAlign: TextAlign.left, - ); + Widget _buildImportedFileDisplay() { + return Text( + importedFile?.path ?? 'No File Selected', + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: Theme.of(context).textTheme.headline1.color, + ), + textAlign: TextAlign.left, + ); + } Widget _buildImportButton() { return Row( From 6f1081ff7c4847c00e1a11a2020163e2acc9cee9 Mon Sep 17 00:00:00 2001 From: Juanjo Tugores Date: Thu, 21 Jan 2021 21:06:44 -0600 Subject: [PATCH 10/11] Make extensions an optional argument. --- .../src/app_size/file_import_container.dart | 8 +- packages/devtools_app/pubspec.lock | 768 ------------------ 2 files changed, 5 insertions(+), 771 deletions(-) delete mode 100644 packages/devtools_app/pubspec.lock diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index 17664721e8e..6c0953f6535 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -21,6 +21,7 @@ class FileImportContainer extends StatefulWidget { this.onAction, this.onFileSelected, this.onError, + this.extensions = const ['json'], Key key, }) : super(key: key); @@ -37,6 +38,9 @@ class FileImportContainer extends StatefulWidget { final void Function(String error) onError; + // The file's extensions where we are going to get the data from. + final List extensions; + @override _FileImportContainerState createState() => _FileImportContainerState(); } @@ -176,9 +180,7 @@ class _FileImportContainerState extends State { } void _importFile() async { - final acceptedTypeGroups = [ - XTypeGroup(extensions: ['json']) - ]; + final acceptedTypeGroups = [XTypeGroup(extensions: widget.extensions)]; final file = await openFile(acceptedTypeGroups: acceptedTypeGroups); final data = jsonDecode(await file.readAsString()); final lastModifiedTime = await file.lastModified(); diff --git a/packages/devtools_app/pubspec.lock b/packages/devtools_app/pubspec.lock deleted file mode 100644 index 06ce3120d7f..00000000000 --- a/packages/devtools_app/pubspec.lock +++ /dev/null @@ -1,768 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - url: "https://pub.dartlang.org" - source: hosted - version: "12.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - url: "https://pub.dartlang.org" - source: hosted - version: "0.40.6" - ansi_up: - dependency: "direct main" - description: - name: ansi_up - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.2" - ansicolor: - dependency: "direct main" - description: - name: ansicolor - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.0" - async: - dependency: "direct main" - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.5.0-nullsafety.3" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.3" - browser_launcher: - dependency: transitive - description: - name: browser_launcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.8" - build: - dependency: transitive - description: - name: build - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.0" - build_config: - dependency: transitive - description: - name: build_config - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.5" - build_daemon: - dependency: transitive - description: - name: build_daemon - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.1" - build_runner: - dependency: "direct dev" - description: - name: build_runner - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.11" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - url: "https://pub.dartlang.org" - source: hosted - version: "6.1.5" - built_collection: - dependency: transitive - description: - name: built_collection - url: "https://pub.dartlang.org" - source: hosted - version: "4.3.2" - built_value: - dependency: transitive - description: - name: built_value - url: "https://pub.dartlang.org" - source: hosted - version: "7.1.0" - characters: - dependency: transitive - description: - name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.5" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.3" - checked_yaml: - dependency: transitive - description: - name: checked_yaml - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.4" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.3" - code_builder: - dependency: transitive - description: - name: code_builder - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" - collection: - dependency: "direct main" - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.15.0-nullsafety.5" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - coverage: - dependency: transitive - description: - name: coverage - url: "https://pub.dartlang.org" - source: hosted - version: "0.14.2" - cross_file: - dependency: transitive - description: - name: cross_file - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.5" - dart_style: - dependency: transitive - description: - name: dart_style - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.10" - devtools: - dependency: "direct dev" - description: - path: "../devtools" - relative: true - source: path - version: "0.9.6" - devtools_server: - dependency: "direct overridden" - description: - path: "../devtools_server" - relative: true - source: path - version: "0.9.6" - devtools_shared: - dependency: "direct main" - description: - path: "../devtools_shared" - relative: true - source: path - version: "0.9.6" - devtools_testing: - dependency: "direct dev" - description: - path: "../devtools_testing" - relative: true - source: path - version: "0.9.6" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.3" - file: - dependency: "direct main" - description: - name: file - url: "https://pub.dartlang.org" - source: hosted - version: "5.2.1" - file_selector: - dependency: "direct main" - description: - name: file_selector - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.0+2" - file_selector_linux: - dependency: "direct main" - description: - name: file_selector_linux - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.1" - file_selector_macos: - dependency: "direct main" - description: - name: file_selector_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.1" - file_selector_platform_interface: - dependency: transitive - description: - name: file_selector_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" - file_selector_web: - dependency: "direct main" - description: - name: file_selector_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.0+1" - file_selector_windows: - dependency: "direct main" - description: - name: file_selector_windows - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.1" - fixnum: - dependency: transitive - description: - name: fixnum - url: "https://pub.dartlang.org" - source: hosted - version: "0.10.11" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - glob: - dependency: transitive - description: - name: glob - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - graphs: - dependency: transitive - description: - name: graphs - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - http: - dependency: "direct main" - description: - name: http - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.2" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.0" - http_parser: - dependency: transitive - description: - name: http_parser - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.4" - intl: - dependency: "direct main" - description: - name: intl - url: "https://pub.dartlang.org" - source: hosted - version: "0.16.1" - io: - dependency: transitive - description: - name: io - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.4" - js: - dependency: "direct main" - description: - name: js - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.3-nullsafety.3" - json_annotation: - dependency: transitive - description: - name: json_annotation - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.1" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.4" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.10-nullsafety.3" - meta: - dependency: "direct main" - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0-nullsafety.6" - mime: - dependency: "direct main" - description: - name: mime - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.7" - mockito: - dependency: "direct dev" - description: - name: mockito - url: "https://pub.dartlang.org" - source: hosted - version: "4.1.3" - nested: - dependency: transitive - description: - name: nested - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.4" - node_interop: - dependency: transitive - description: - name: node_interop - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.1" - node_io: - dependency: transitive - description: - name: node_io - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - node_preamble: - dependency: transitive - description: - name: node_preamble - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.12" - package_config: - dependency: transitive - description: - name: package_config - url: "https://pub.dartlang.org" - source: hosted - version: "1.9.3" - package_resolver: - dependency: transitive - description: - name: package_resolver - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.10" - path: - dependency: "direct main" - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0-nullsafety.3" - pedantic: - dependency: "direct main" - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0-nullsafety.3" - platform_detect: - dependency: transitive - description: - name: platform_detect - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.0" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - pool: - dependency: transitive - description: - name: pool - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.0-nullsafety.3" - provider: - dependency: "direct main" - description: - name: provider - url: "https://pub.dartlang.org" - source: hosted - version: "4.3.2+3" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.4" - pubspec_parse: - dependency: transitive - description: - name: pubspec_parse - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.7" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.5" - shelf: - dependency: transitive - description: - name: shelf - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.9" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shelf_proxy: - dependency: transitive - description: - name: shelf_proxy - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0+7" - shelf_static: - dependency: transitive - description: - name: shelf_static - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.9+1" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.3" - simple_lint_rules: - dependency: "direct dev" - description: - name: simple_lint_rules - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1+1" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_gen: - dependency: transitive - description: - name: source_gen - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.10+1" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.4" - source_maps: - dependency: transitive - description: - name: source_maps - url: "https://pub.dartlang.org" - source: hosted - version: "0.10.10-nullsafety.3" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0-nullsafety.4" - sse: - dependency: "direct main" - description: - name: sse - url: "https://pub.dartlang.org" - source: hosted - version: "3.6.0" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0-nullsafety.6" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.3" - stream_transform: - dependency: transitive - description: - name: stream_transform - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - string_scanner: - dependency: "direct main" - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.3" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.3" - test: - dependency: "direct dev" - description: - name: test - url: "https://pub.dartlang.org" - source: hosted - version: "1.16.0-nullsafety.13" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.19-nullsafety.6" - test_core: - dependency: transitive - description: - name: test_core - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.12-nullsafety.12" - timing: - dependency: transitive - description: - name: timing - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.1+3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0-nullsafety.5" - url_launcher: - dependency: "direct main" - description: - name: url_launcher - url: "https://pub.dartlang.org" - source: hosted - version: "5.7.10" - url_launcher_linux: - dependency: transitive - description: - name: url_launcher_linux - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.1+4" - url_launcher_macos: - dependency: transitive - description: - name: url_launcher_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.1+9" - url_launcher_platform_interface: - dependency: transitive - description: - name: url_launcher_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.9" - url_launcher_web: - dependency: "direct main" - description: - name: url_launcher_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.5+1" - url_launcher_windows: - dependency: transitive - description: - name: url_launcher_windows - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.1+3" - usage: - dependency: transitive - description: - name: usage - url: "https://pub.dartlang.org" - source: hosted - version: "3.4.2" - uuid: - dependency: transitive - description: - name: uuid - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.2" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.5" - vm_service: - dependency: "direct main" - description: - name: vm_service - url: "https://pub.dartlang.org" - source: hosted - version: "5.5.0" - vm_snapshot_analysis: - dependency: "direct main" - description: - name: vm_snapshot_analysis - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.5" - watcher: - dependency: transitive - description: - name: watcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.7+15" - web_socket_channel: - dependency: "direct main" - description: - name: web_socket_channel - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - webkit_inspection_protocol: - dependency: "direct dev" - description: - name: webkit_inspection_protocol - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.4" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.1" -sdks: - dart: ">=2.12.0-0.0 <3.0.0" - flutter: ">=1.22.0" From 566bad8aa2490e6e84f8769ecd48574d91a318d7 Mon Sep 17 00:00:00 2001 From: Juan Tugores Date: Fri, 22 Jan 2021 11:04:58 -0600 Subject: [PATCH 11/11] Fix the doc comment. --- .../devtools_app/lib/src/app_size/file_import_container.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devtools_app/lib/src/app_size/file_import_container.dart b/packages/devtools_app/lib/src/app_size/file_import_container.dart index 6c0953f6535..cbadb3bc438 100644 --- a/packages/devtools_app/lib/src/app_size/file_import_container.dart +++ b/packages/devtools_app/lib/src/app_size/file_import_container.dart @@ -38,7 +38,7 @@ class FileImportContainer extends StatefulWidget { final void Function(String error) onError; - // The file's extensions where we are going to get the data from. + /// The file's extensions where we are going to get the data from. final List extensions; @override