Skip to content

Commit a6ee027

Browse files
polina-cpolina-c
authored
Reorganize code. (#4907)
1 parent f9c1eeb commit a6ee027

File tree

421 files changed

+1073
-1082
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

421 files changed

+1073
-1082
lines changed

‎packages/devtools_app/lib/devtools_app.dart‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
export 'src/analytics/analytics.dart';
6-
export 'src/analytics/analytics_controller.dart';
7-
export 'src/charts/treemap.dart';
8-
export 'src/config_specific/ide_theme/ide_theme.dart';
95
export 'src/extension_points/extensions_base.dart';
106
export 'src/extension_points/extensions_external.dart';
117
export 'src/framework/notifications_view.dart';
12-
export 'src/http/http_request_data.dart';
13-
export 'src/primitives/auto_dispose.dart';
14-
export 'src/primitives/auto_dispose_mixin.dart';
15-
export 'src/primitives/listenable.dart';
16-
export 'src/primitives/storage.dart';
17-
export 'src/primitives/trace_event.dart';
18-
export 'src/primitives/trees.dart';
19-
export 'src/primitives/utils.dart';
208
export 'src/screens/app_size/app_size_controller.dart';
219
export 'src/screens/app_size/app_size_screen.dart';
2210
export 'src/screens/debugger/breakpoint_manager.dart';
@@ -61,7 +49,6 @@ export 'src/screens/vm_developer/object_inspector/vm_object_model.dart';
6149
export 'src/screens/vm_developer/vm_developer_tools_controller.dart';
6250
export 'src/screens/vm_developer/vm_developer_tools_screen.dart';
6351
export 'src/screens/vm_developer/vm_service_private_extensions.dart';
64-
export 'src/scripts/script_manager.dart';
6552
export 'src/service/isolate_manager.dart';
6653
export 'src/service/isolate_state.dart';
6754
export 'src/service/json_to_service_cache.dart';
@@ -71,21 +58,34 @@ export 'src/service/service_extensions.dart';
7158
export 'src/service/service_manager.dart';
7259
export 'src/service/vm_flags.dart';
7360
export 'src/service/vm_service_wrapper.dart';
61+
export 'src/shared/analytics/analytics.dart';
62+
export 'src/shared/analytics/analytics_controller.dart';
7463
export 'src/shared/banner_messages.dart';
64+
export 'src/shared/charts/treemap.dart';
7565
export 'src/shared/common_widgets.dart';
66+
export 'src/shared/config_specific/ide_theme/ide_theme.dart';
7667
export 'src/shared/connected_app.dart';
7768
export 'src/shared/console_service.dart';
7869
export 'src/shared/error_badge_manager.dart';
7970
export 'src/shared/globals.dart';
71+
export 'src/shared/http/http_request_data.dart';
8072
export 'src/shared/notifications.dart';
8173
export 'src/shared/preferences.dart';
74+
export 'src/shared/primitives/auto_dispose.dart';
75+
export 'src/shared/primitives/auto_dispose_mixin.dart';
76+
export 'src/shared/primitives/listenable.dart';
77+
export 'src/shared/primitives/storage.dart';
78+
export 'src/shared/primitives/trace_event.dart';
79+
export 'src/shared/primitives/trees.dart';
80+
export 'src/shared/primitives/utils.dart';
8281
export 'src/shared/routing.dart';
8382
export 'src/shared/screen.dart';
83+
export 'src/shared/scripts/script_manager.dart';
8484
export 'src/shared/split.dart';
8585
export 'src/shared/theme.dart';
86+
export 'src/shared/ui/filter.dart';
87+
export 'src/shared/ui/hover.dart';
88+
export 'src/shared/ui/icons.dart';
89+
export 'src/shared/ui/search.dart';
8690
export 'src/shared/utils.dart';
8791
export 'src/shared/version.dart';
88-
export 'src/ui/filter.dart';
89-
export 'src/ui/hover.dart';
90-
export 'src/ui/icons.dart';
91-
export 'src/ui/search.dart';

‎packages/devtools_app/lib/main.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
import 'package:flutter/material.dart';
66
import 'package:flutter_riverpod/flutter_riverpod.dart';
77

8-
import 'src/analytics/analytics_controller.dart';
98
import 'src/app.dart';
10-
import 'src/config_specific/framework_initialize/framework_initialize.dart';
11-
import 'src/config_specific/ide_theme/ide_theme.dart';
12-
import 'src/config_specific/url/url.dart';
13-
import 'src/config_specific/url_strategy/url_strategy.dart';
149
import 'src/extension_points/extensions_base.dart';
1510
import 'src/extension_points/extensions_external.dart';
1611
import 'src/framework/app_error_handling.dart';
17-
import 'src/primitives/url_utils.dart';
1812
import 'src/screens/debugger/syntax_highlighter.dart';
1913
import 'src/screens/provider/riverpod_error_logger_observer.dart';
14+
import 'src/shared/analytics/analytics_controller.dart';
15+
import 'src/shared/config_specific/framework_initialize/framework_initialize.dart';
16+
import 'src/shared/config_specific/ide_theme/ide_theme.dart';
17+
import 'src/shared/config_specific/url/url.dart';
18+
import 'src/shared/config_specific/url_strategy/url_strategy.dart';
2019
import 'src/shared/globals.dart';
2120
import 'src/shared/preferences.dart';
21+
import 'src/shared/primitives/url_utils.dart';
2222

2323
void main() async {
2424
// Before switching to URL path strategy, check if this URL is in the legacy

‎packages/devtools_app/lib/src/app.dart‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ import 'package:flutter/foundation.dart';
88
import 'package:flutter/material.dart';
99
import 'package:provider/provider.dart';
1010

11-
import 'analytics/analytics.dart' as ga;
12-
import 'analytics/analytics_controller.dart';
13-
import 'analytics/constants.dart' as analytics_constants;
14-
import 'config_specific/server/server.dart';
1511
import 'example/conditional_screen.dart';
1612
import 'framework/about_dialog.dart';
1713
import 'framework/framework_core.dart';
@@ -21,7 +17,6 @@ import 'framework/notifications_view.dart';
2117
import 'framework/release_notes/release_notes.dart';
2218
import 'framework/report_feedback_button.dart';
2319
import 'framework/scaffold.dart';
24-
import 'primitives/auto_dispose_mixin.dart';
2520
import 'screens/app_size/app_size_controller.dart';
2621
import 'screens/app_size/app_size_screen.dart';
2722
import 'screens/debugger/debugger_controller.dart';
@@ -44,14 +39,19 @@ import 'screens/provider/provider_screen.dart';
4439
import 'screens/vm_developer/vm_developer_tools_controller.dart';
4540
import 'screens/vm_developer/vm_developer_tools_screen.dart';
4641
import 'service/service_extension_widgets.dart';
42+
import 'shared/analytics/analytics.dart' as ga;
43+
import 'shared/analytics/analytics_controller.dart';
44+
import 'shared/analytics/constants.dart' as gac;
4745
import 'shared/common_widgets.dart';
46+
import 'shared/config_specific/server/server.dart';
4847
import 'shared/dialogs.dart';
4948
import 'shared/globals.dart';
49+
import 'shared/primitives/auto_dispose_mixin.dart';
5050
import 'shared/routing.dart';
5151
import 'shared/screen.dart';
5252
import 'shared/snapshot_screen.dart';
5353
import 'shared/theme.dart';
54-
import 'ui/hover.dart';
54+
import 'shared/ui/hover.dart';
5555

5656
// Assign to true to use a sample implementation of a conditional screen.
5757
// WARNING: Do not check in this file if debugEnableSampleScreen is true.
@@ -493,26 +493,26 @@ class SettingsDialog extends StatelessWidget {
493493
label: const Text('Use a dark theme'),
494494
listenable: preferences.darkModeTheme,
495495
toggle: preferences.toggleDarkModeTheme,
496-
gaItem: analytics_constants.darkTheme,
496+
gaItem: gac.darkTheme,
497497
),
498498
CheckboxSetting(
499499
label: const Text('Use dense mode'),
500500
listenable: preferences.denseModeEnabled,
501501
toggle: preferences.toggleDenseMode,
502-
gaItem: analytics_constants.denseMode,
502+
gaItem: gac.denseMode,
503503
),
504504
if (isExternalBuild && isDevToolsServerAvailable)
505505
CheckboxSetting(
506506
label: const Text('Enable analytics'),
507507
listenable: analyticsController.analyticsEnabled,
508508
toggle: analyticsController.toggleAnalyticsEnabled,
509-
gaItem: analytics_constants.analytics,
509+
gaItem: gac.analytics,
510510
),
511511
CheckboxSetting(
512512
label: const Text('Enable VM developer mode'),
513513
listenable: preferences.vmDeveloperModeEnabled,
514514
toggle: preferences.toggleVmDeveloperMode,
515-
gaItem: analytics_constants.vmDeveloperMode,
515+
gaItem: gac.vmDeveloperMode,
516516
),
517517
],
518518
),
@@ -561,7 +561,7 @@ class CheckboxSetting extends StatelessWidget {
561561

562562
void toggleSetting(bool? newValue) {
563563
ga.select(
564-
analytics_constants.settingsDialog,
564+
gac.settingsDialog,
565565
'$gaItem-${newValue == true ? 'enabled' : 'disabled'}',
566566
);
567567
toggle(newValue == true);

‎packages/devtools_app/lib/src/extension_points/extensions_external.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import '../analytics/constants.dart' as analytics_constants;
65
import '../screens/debugger/codeview.dart';
76
import '../screens/inspector/inspector_service.dart';
7+
import '../shared/analytics/constants.dart' as gac;
88
import '../shared/common_widgets.dart';
99
import '../shared/globals.dart';
1010
import '../shared/utils.dart';
@@ -28,8 +28,8 @@ class ExternalDevToolsExtensionPoints implements DevToolsExtensionPoints {
2828
return Link(
2929
display: githubLinkDisplay,
3030
url: githubUri.toString(),
31-
gaScreenName: analytics_constants.devToolsMain,
32-
gaSelectedItemDescription: analytics_constants.feedbackLink,
31+
gaScreenName: gac.devToolsMain,
32+
gaSelectedItemDescription: gac.feedbackLink,
3333
);
3434
}
3535

‎packages/devtools_app/lib/src/framework/about_dialog.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
88
import 'package:provider/provider.dart';
99

1010
import '../../devtools.dart' as devtools;
11-
import '../analytics/constants.dart' as analytics_constants;
11+
import '../shared/analytics/constants.dart' as gac;
1212
import '../shared/common_widgets.dart';
1313
import '../shared/dialogs.dart';
1414
import '../shared/globals.dart';
@@ -95,8 +95,8 @@ class _DiscordLink extends StatelessWidget {
9595
link: const Link(
9696
display: 'Discord',
9797
url: _channelLink,
98-
gaScreenName: analytics_constants.devToolsMain,
99-
gaSelectedItemDescription: analytics_constants.discordLink,
98+
gaScreenName: gac.devToolsMain,
99+
gaSelectedItemDescription: gac.discordLink,
100100
),
101101
context: context,
102102
),

‎packages/devtools_app/lib/src/framework/app_error_handling.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'package:flutter/foundation.dart';
88
import 'package:flutter/widgets.dart';
99
import 'package:stack_trace/stack_trace.dart' as stack_trace;
1010

11-
import '../analytics/analytics.dart' as ga;
12-
import '../config_specific/logger/logger.dart';
11+
import '../shared/analytics/analytics.dart' as ga;
12+
import '../shared/config_specific/logger/logger.dart';
1313

1414
/// Set up error handling for the app.
1515
///

‎packages/devtools_app/lib/src/framework/framework_core.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
import 'dart:async';
66

77
import '../../devtools.dart' as devtools show version;
8-
import '../config_specific/import_export/import_export.dart';
9-
import '../config_specific/logger/logger.dart';
10-
import '../primitives/message_bus.dart';
11-
import '../primitives/utils.dart';
128
import '../screens/debugger/breakpoint_manager.dart';
13-
import '../scripts/script_manager.dart';
149
import '../service/service.dart';
1510
import '../service/service_manager.dart';
1611
import '../service/vm_service_wrapper.dart';
12+
import '../shared/config_specific/import_export/import_export.dart';
13+
import '../shared/config_specific/logger/logger.dart';
1714
import '../shared/framework_controller.dart';
1815
import '../shared/globals.dart';
1916
import '../shared/notifications.dart';
17+
import '../shared/primitives/message_bus.dart';
18+
import '../shared/primitives/utils.dart';
19+
import '../shared/scripts/script_manager.dart';
2020
import '../shared/survey.dart';
2121

2222
typedef ErrorReporter = void Function(String title, dynamic error);

‎packages/devtools_app/lib/src/framework/initializer.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import 'dart:async';
77
import 'package:devtools_shared/devtools_shared.dart';
88
import 'package:flutter/material.dart';
99

10-
import '../analytics/analytics.dart' as ga;
11-
import '../analytics/constants.dart' as analytics_constants;
12-
import '../primitives/auto_dispose_mixin.dart';
13-
import '../primitives/utils.dart';
10+
import '../shared/analytics/analytics.dart' as ga;
11+
import '../shared/analytics/constants.dart' as gac;
1412
import '../shared/common_widgets.dart';
1513
import '../shared/globals.dart';
14+
import '../shared/primitives/auto_dispose_mixin.dart';
15+
import '../shared/primitives/utils.dart';
1616
import '../shared/routing.dart';
1717
import '../shared/theme.dart';
1818
import 'framework_core.dart';
@@ -137,8 +137,8 @@ class _InitializerState extends State<Initializer>
137137
ModalRoute.of(context)!.isCurrent &&
138138
currentDisconnectedOverlay == null) {
139139
ga.select(
140-
analytics_constants.devToolsMain,
141-
analytics_constants.appDisconnected,
140+
gac.devToolsMain,
141+
gac.appDisconnected,
142142
);
143143
Overlay.of(context).insert(_createDisconnectedOverlay());
144144

‎packages/devtools_app/lib/src/framework/landing_screen.dart‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import 'package:flutter/material.dart';
99
import 'package:provider/provider.dart';
1010
import 'package:shared_preferences/shared_preferences.dart';
1111

12-
import '../analytics/analytics.dart' as ga;
13-
import '../analytics/constants.dart' as analytics_constants;
14-
import '../config_specific/import_export/import_export.dart';
15-
import '../primitives/blocking_action_mixin.dart';
16-
import '../primitives/utils.dart';
12+
import '../shared/analytics/analytics.dart' as ga;
13+
import '../shared/analytics/constants.dart' as gac;
1714
import '../shared/common_widgets.dart';
15+
import '../shared/config_specific/import_export/import_export.dart';
1816
import '../shared/file_import.dart';
1917
import '../shared/globals.dart';
18+
import '../shared/primitives/blocking_action_mixin.dart';
19+
import '../shared/primitives/utils.dart';
2020
import '../shared/routing.dart';
2121
import '../shared/theme.dart';
22+
import '../shared/ui/label.dart';
2223
import '../shared/utils.dart';
23-
import '../ui/label.dart';
2424
import 'framework_core.dart';
2525

2626
/// The landing screen when starting Dart DevTools without being connected to an
@@ -38,7 +38,7 @@ class _LandingScreenBodyState extends State<LandingScreenBody> {
3838
@override
3939
void initState() {
4040
super.initState();
41-
ga.screen(analytics_constants.landingScreen);
41+
ga.screen(gac.landingScreen);
4242
}
4343

4444
@override
@@ -201,8 +201,8 @@ class _ConnectDialogState extends State<ConnectDialog>
201201

202202
Future<void> _connectHelper() async {
203203
ga.select(
204-
analytics_constants.landingScreen,
205-
analytics_constants.connectToApp,
204+
gac.landingScreen,
205+
gac.connectToApp,
206206
);
207207
if (connectDialogController.text.isEmpty) {
208208
notificationService.push('Please enter a VM Service URL.');
@@ -281,8 +281,8 @@ class ImportFileInstructions extends StatelessWidget {
281281

282282
Future<void> _importFile(BuildContext context) async {
283283
ga.select(
284-
analytics_constants.landingScreen,
285-
analytics_constants.importFile,
284+
gac.landingScreen,
285+
gac.importFile,
286286
);
287287
final DevToolsJsonFile? importedFile = await importFileFromPicker(
288288
acceptedTypes: ['json'],
@@ -327,8 +327,8 @@ class AppSizeToolingInstructions extends StatelessWidget {
327327

328328
void _onOpenAppSizeToolSelected(BuildContext context) {
329329
ga.select(
330-
analytics_constants.landingScreen,
331-
analytics_constants.openAppSizeTool,
330+
gac.landingScreen,
331+
gac.openAppSizeTool,
332332
);
333333
DevToolsRouterDelegate.of(context).navigate(appSizePageId);
334334
}

‎packages/devtools_app/lib/src/framework/notifications_view.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import 'dart:async';
77
import 'package:flutter/material.dart';
88
import 'package:flutter/scheduler.dart';
99

10-
import '../primitives/auto_dispose_mixin.dart';
11-
import '../primitives/utils.dart';
1210
import '../shared/common_widgets.dart';
1311
import '../shared/globals.dart';
1412
import '../shared/notifications.dart';
13+
import '../shared/primitives/auto_dispose_mixin.dart';
14+
import '../shared/primitives/utils.dart';
1515
import '../shared/theme.dart';
1616
import '../shared/utils.dart';
1717

0 commit comments

Comments
 (0)