Skip to content

Commit 5e17f95

Browse files
Use enhanced enum for screen ids and titles (flutter#4940)
1 parent a932b8f commit 5e17f95

33 files changed

+104
-98
lines changed

packages/devtools_app/lib/src/app.dart

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -578,48 +578,51 @@ class CheckboxSetting extends StatelessWidget {
578578
List<DevToolsScreen> get defaultScreens {
579579
return <DevToolsScreen>[
580580
DevToolsScreen<InspectorController>(
581-
const InspectorScreen(),
581+
InspectorScreen(),
582582
createController: (_) => InspectorController(
583583
inspectorTree: InspectorTreeController(),
584584
detailsTree: InspectorTreeController(),
585585
treeType: FlutterTreeType.widget,
586586
),
587587
),
588588
DevToolsScreen<PerformanceController>(
589-
const PerformanceScreen(),
589+
PerformanceScreen(),
590590
createController: (_) => PerformanceController(),
591591
supportsOffline: true,
592592
),
593593
DevToolsScreen<ProfilerScreenController>(
594-
const ProfilerScreen(),
594+
ProfilerScreen(),
595595
createController: (_) => ProfilerScreenController(),
596596
supportsOffline: true,
597597
),
598598
DevToolsScreen<MemoryController>(
599-
const MemoryScreen(),
599+
MemoryScreen(),
600600
createController: (_) => MemoryController(),
601601
),
602602
DevToolsScreen<DebuggerController>(
603-
const DebuggerScreen(),
603+
DebuggerScreen(),
604604
createController: (routerDelegate) => DebuggerController(
605605
routerDelegate: routerDelegate,
606606
),
607607
),
608608
DevToolsScreen<NetworkController>(
609-
const NetworkScreen(),
609+
NetworkScreen(),
610610
createController: (_) => NetworkController(),
611611
),
612612
DevToolsScreen<LoggingController>(
613-
const LoggingScreen(),
613+
LoggingScreen(),
614614
createController: (_) => LoggingController(),
615615
),
616-
DevToolsScreen<void>(const ProviderScreen(), createController: (_) {}),
616+
DevToolsScreen<void>(
617+
ProviderScreen(),
618+
createController: (_) {},
619+
),
617620
DevToolsScreen<AppSizeController>(
618-
const AppSizeScreen(),
621+
AppSizeScreen(),
619622
createController: (_) => AppSizeController(),
620623
),
621624
DevToolsScreen<VMDeveloperToolsController>(
622-
const VMDeveloperToolsScreen(),
625+
VMDeveloperToolsScreen(),
623626
createController: (_) => VMDeveloperToolsController(),
624627
),
625628
// Show the sample DevTools screen.

packages/devtools_app/lib/src/framework/scaffold.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,13 +517,13 @@ class KeyboardShortcutsState extends State<KeyboardShortcuts>
517517
}
518518

519519
class SimpleScreen extends Screen {
520-
const SimpleScreen(this.child)
520+
SimpleScreen(this.child)
521521
: super(
522522
id,
523523
showFloatingDebuggerControls: false,
524524
);
525525

526-
static const id = ScreenIds.simple;
526+
static final id = ScreenMetaData.simple.id;
527527

528528
final Widget child;
529529

packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ const initialFractionForTreemap = 0.67;
3232
const initialFractionForTreeTable = 0.33;
3333

3434
class AppSizeScreen extends Screen {
35-
const AppSizeScreen()
35+
AppSizeScreen()
3636
: super.conditional(
3737
id: id,
3838
requiresDartVm: true,
39-
title: 'App Size',
39+
title: ScreenMetaData.appSize.title,
4040
icon: Octicons.fileZip,
4141
);
4242

@@ -47,7 +47,7 @@ class AppSizeScreen extends Screen {
4747
///
4848
/// This must be different to the top-level appSizePageId which is also used
4949
/// in routing when to ensure they have unique URLs.
50-
static const id = ScreenIds.appSize;
50+
static final id = ScreenMetaData.appSize.id;
5151

5252
@visibleForTesting
5353
static const diffTypeDropdownKey = Key('Diff Tree Type Dropdown');

packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ import 'program_explorer_model.dart';
3636
import 'variables.dart';
3737

3838
class DebuggerScreen extends Screen {
39-
const DebuggerScreen()
39+
DebuggerScreen()
4040
: super.conditional(
4141
id: id,
4242
requiresDebugBuild: true,
43-
title: 'Debugger',
43+
title: ScreenMetaData.debugger.title,
4444
icon: Octicons.bug,
4545
showFloatingDebuggerControls: false,
4646
);
4747

48-
static const id = ScreenIds.debugger;
48+
static final id = ScreenMetaData.debugger.id;
4949

5050
@override
5151
bool showConsole(bool embed) => true;

packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ import 'inspector_tree.dart';
3333
import 'inspector_tree_controller.dart';
3434

3535
class InspectorScreen extends Screen {
36-
const InspectorScreen()
36+
InspectorScreen()
3737
: super.conditional(
3838
id: id,
3939
requiresLibrary: flutterLibraryUri,
4040
requiresDebugBuild: true,
41-
title: 'Flutter Inspector',
41+
title: ScreenMetaData.inspector.title,
4242
icon: Octicons.deviceMobile,
4343
);
4444

45-
static const id = ScreenIds.inspector;
45+
static final id = ScreenMetaData.inspector.id;
4646

4747
// There is not enough room to safely show the console in the embed view of
4848
// the DevTools and IDEs have their own consoles.

packages/devtools_app/lib/src/screens/logging/logging_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ final loggingSearchFieldKey = GlobalKey(debugLabel: 'LoggingSearchFieldKey');
2727

2828
/// Presents logs from the connected app.
2929
class LoggingScreen extends Screen {
30-
const LoggingScreen()
30+
LoggingScreen()
3131
: super(
3232
id,
33-
title: 'Logging',
33+
title: ScreenMetaData.logging.title,
3434
icon: Octicons.clippy,
3535
);
3636

37-
static const id = ScreenIds.logging;
37+
static final id = ScreenMetaData.logging.id;
3838

3939
@override
4040
String get docPageId => screenId;

packages/devtools_app/lib/src/screens/memory/memory_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ import 'panes/chart/memory_vm_chart.dart';
2424
import 'panes/control/control_pane.dart';
2525

2626
class MemoryScreen extends Screen {
27-
const MemoryScreen()
27+
MemoryScreen()
2828
: super.conditional(
2929
id: id,
3030
requiresDartVm: true,
31-
title: 'Memory',
31+
title: ScreenMetaData.memory.title,
3232
icon: Octicons.package,
3333
);
3434

35-
static const id = ScreenIds.memory;
35+
static final id = ScreenMetaData.memory.id;
3636

3737
@override
3838
ValueListenable<bool> get showIsolateSelector =>

packages/devtools_app/lib/src/screens/network/network_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ import 'network_request_inspector.dart';
3232
final networkSearchFieldKey = GlobalKey(debugLabel: 'NetworkSearchFieldKey');
3333

3434
class NetworkScreen extends Screen {
35-
const NetworkScreen()
35+
NetworkScreen()
3636
: super.conditional(
3737
id: id,
3838
requiresDartVm: true,
39-
title: 'Network',
39+
title: ScreenMetaData.network.title,
4040
icon: Icons.network_check,
4141
);
4242

43-
static const id = ScreenIds.network;
43+
static final id = ScreenMetaData.network.id;
4444

4545
@override
4646
String get docPageId => screenId;

packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ class FlutterFrameTooltip extends StatelessWidget {
637637
shaderText,
638638
style: textStyle,
639639
),
640-
const MoreInfoLink(
640+
MoreInfoLink(
641641
url: preCompileShadersDocsUrl,
642642
gaScreenName: gac.performance,
643643
gaSelectedItemDescription:

packages/devtools_app/lib/src/screens/performance/performance_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ import 'tabbed_performance_view.dart';
3333
// where applicable.
3434

3535
class PerformanceScreen extends Screen {
36-
const PerformanceScreen()
36+
PerformanceScreen()
3737
: super.conditional(
3838
id: id,
3939
requiresDartVm: true,
4040
worksOffline: true,
41-
title: 'Performance',
41+
title: ScreenMetaData.performance.title,
4242
icon: Octicons.pulse,
4343
);
4444

45-
static const id = ScreenIds.performance;
45+
static final id = ScreenMetaData.performance.id;
4646

4747
@override
4848
String get docPageId => id;

0 commit comments

Comments
 (0)