Migrate theme.dart to be null safe.

packages/devtools_app/lib/src/performance/rebuild_counts.dart

@@ -100,6 +100,7 @@ class RebuildCountModel {
     }
 
     // We've updated the build counts and possibly the locations.
+    // ignore: invalid_use_of_visible_for_testing_member, invalid_use_of_protected_member
     _locations.notifyListeners();
   }
 
@@ -116,6 +117,7 @@ class RebuildCountModel {
     }
 
     // We've updated the build counts.
+    // ignore: invalid_use_of_visible_for_testing_member, invalid_use_of_protected_member
     _locations.notifyListeners();
   }
 }

packages/devtools_app/lib/src/shared/theme.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart=2.9
+// ignore_for_file: import_of_legacy_library_into_null_safe
 
 import 'package:flutter/material.dart';
 
@@ -18,9 +18,9 @@ const contrastForegroundWhite = _contrastForegroundWhite;
 /// Constructs the light or dark theme for the app taking into account
 /// IDE-supplied theming.
 ThemeData themeFor({
-  @required bool isDarkTheme,
-  @required IdeTheme ideTheme,
-  ThemeData theme,
+  required bool isDarkTheme,
+  required IdeTheme? ideTheme,
+  ThemeData? theme,
 }) {
   ThemeData colorTheme;
   // If the theme specifies a background color, use it to infer a theme.
@@ -44,43 +44,43 @@ ThemeData themeFor({
   );
 }
 
-ThemeData _darkTheme(IdeTheme ideTheme) {
+ThemeData _darkTheme(IdeTheme? ideTheme) {
   final theme = ThemeData.dark();
   final background = isValidDarkColor(ideTheme?.backgroundColor)
-      ? ideTheme?.backgroundColor
+      ? ideTheme!.backgroundColor!
       : theme.canvasColor;
   return _baseTheme(
     theme: theme,
     ideTheme: ideTheme,
-    primaryColor: devtoolsGrey[900],
+    primaryColor: devtoolsGrey[900]!,
     backgroundColor: background,
-    indicatorColor: devtoolsBlue[400],
-    selectedRowColor: devtoolsGrey[600],
+    indicatorColor: devtoolsBlue[400]!,
+    selectedRowColor: devtoolsGrey[600]!,
   );
 }
 
-ThemeData _lightTheme(IdeTheme ideTheme) {
+ThemeData _lightTheme(IdeTheme? ideTheme) {
   final theme = ThemeData.light();
   final background = isValidLightColor(ideTheme?.backgroundColor)
-      ? ideTheme?.backgroundColor
+      ? ideTheme!.backgroundColor!
       : theme.canvasColor;
   return _baseTheme(
     theme: theme,
     ideTheme: ideTheme,
-    primaryColor: devtoolsBlue[600],
+    primaryColor: devtoolsBlue[600]!,
     backgroundColor: background,
-    indicatorColor: Colors.yellowAccent[400],
-    selectedRowColor: devtoolsBlue[600],
+    indicatorColor: Colors.yellowAccent[400]!,
+    selectedRowColor: devtoolsBlue[600]!,
   );
 }
 
 ThemeData _baseTheme({
-  @required ThemeData theme,
-  @required IdeTheme ideTheme,
-  @required Color primaryColor,
-  @required Color backgroundColor,
-  @required Color indicatorColor,
-  @required Color selectedRowColor,
+  required ThemeData theme,
+  required IdeTheme? ideTheme,
+  required Color primaryColor,
+  required Color backgroundColor,
+  required Color indicatorColor,
+  required Color selectedRowColor,
 }) {
   return theme.copyWith(
     primaryColor: primaryColor,
@@ -127,14 +127,14 @@ ThemeData _baseTheme({
 /// Flutter's luminance calculation.
 const _lightDarkLuminanceThreshold = 0.1;
 
-bool isValidDarkColor(Color color) {
+bool isValidDarkColor(Color? color) {
   if (color == null) {
     return false;
   }
   return color.computeLuminance() <= _lightDarkLuminanceThreshold;
 }
 
-bool isValidLightColor(Color color) {
+bool isValidLightColor(Color? color) {
   if (color == null) {
     return false;
   }
@@ -256,7 +256,7 @@ extension DevToolsColorScheme on ColorScheme {
   Color get toggleButtonsTitleSelected =>
       isLight ? Colors.white : const Color(0xFF464646);
 
-  Color get toggleButtonsFillSelected => devtoolsBlue[400];
+  Color get toggleButtonsFillSelected => devtoolsBlue[400]!;
 
   Color get grey => isLight
       ? const Color.fromARGB(255, 128, 128, 128)
@@ -276,7 +276,7 @@ extension DevToolsColorScheme on ColorScheme {
   // TODO(jacobr): replace this with Theme.of(context).scaffoldBackgroundColor, but we use
   // this in places where we do not have access to the context.
   Color get defaultBackgroundColor =>
-      isLight ? Colors.grey[50] : Colors.grey[850];
+      isLight ? Colors.grey[50]! : Colors.grey[850]!;
 
   Color get alternatingBackgroundColor => isLight
       ? defaultBackgroundColor.darken()
@@ -324,11 +324,11 @@ extension DevToolsColorScheme on ColorScheme {
 
   // Bar color for current selection (hover).
   Color get hoverSelectionBarColor =>
-      isLight ? Colors.lime[600] : Colors.yellowAccent;
+      isLight ? Colors.lime[600]! : Colors.yellowAccent;
 
   // Highlight color for an selected item in the autocomplete dropdown list.
   Color get autoCompleteHighlightColor =>
-      isLight ? Colors.grey[300] : Colors.grey[700];
+      isLight ? Colors.grey[300]! : Colors.grey[700]!;
 
   Color get autoCompleteTextColor => isLight ? Colors.black : Colors.white;
 
@@ -381,13 +381,13 @@ extension DevToolsColorScheme on ColorScheme {
         decoration: TextDecoration.none,
       );
 
-  Color get expandedColor => isLight ? Colors.grey[200] : Colors.grey[800];
+  Color get expandedColor => isLight ? Colors.grey[200]! : Colors.grey[800]!;
 
   Color get expandedTopContentColor =>
-      isLight ? Colors.grey[50] : Colors.grey[850];
+      isLight ? Colors.grey[50]! : Colors.grey[850]!;
 
   Color get expandedBottomContentColor =>
-      isLight ? Colors.grey[200] : Colors.grey[800];
+      isLight ? Colors.grey[200]! : Colors.grey[800]!;
 
   Gradient get verticalGradient => LinearGradient(
         begin: Alignment.topCenter,
@@ -417,7 +417,7 @@ extension ThemeDataExtension on ThemeData {
   bool get isDarkTheme => brightness == Brightness.dark;
 
   TextStyle get regularTextStyle => TextStyle(
-        color: textTheme.bodyText2.color,
+        color: textTheme.bodyText2!.color,
         fontSize: defaultFontSize,
       );
 
@@ -432,7 +432,7 @@ extension ThemeDataExtension on ThemeData {
       );
 
   TextStyle get fixedFontStyle =>
-      textTheme.bodyText2.copyWith(fontFamily: 'RobotoMono');
+      textTheme.bodyText2!.copyWith(fontFamily: 'RobotoMono');
 
   TextStyle get subtleFixedFontStyle =>
       fixedFontStyle.copyWith(color: unselectedWidgetColor);
@@ -442,7 +442,7 @@ extension ThemeDataExtension on ThemeData {
       );
 
   TextStyle get devToolsTitleStyle =>
-      textTheme.headline6.copyWith(color: Colors.white);
+      textTheme.headline6!.copyWith(color: Colors.white);
 
   Color get titleSolidBackgroundColor => colorScheme.isLight
       ? colorScheme.alternatingBackgroundColor
@@ -514,7 +514,7 @@ const longDuration = Duration(milliseconds: 400);
 /// This is the standard duration to use for animations.
 AnimationController defaultAnimationController(
   TickerProvider vsync, {
-  double value,
+  double? value,
 }) {
   return AnimationController(
     duration: defaultDuration,
@@ -528,7 +528,7 @@ AnimationController defaultAnimationController(
 /// This is the standard duration to use for slow animations.
 AnimationController longAnimationController(
   TickerProvider vsync, {
-  double value,
+  double? value,
 }) {
   return AnimationController(
     duration: longDuration,
@@ -554,7 +554,9 @@ double get chartFontSizeSmall => scaleByFontFactor(12.0);
 const lightSelection = Color(0xFFD4D7DA);
 
 bool includeText(
-    BuildContext context, double minScreenWidthForTextBeforeScaling) {
+  BuildContext context,
+  double? minScreenWidthForTextBeforeScaling,
+) {
   return minScreenWidthForTextBeforeScaling == null ||
       MediaQuery.of(context).size.width >
           scaleByFontFactor(minScreenWidthForTextBeforeScaling);
@@ -564,7 +566,8 @@ ButtonStyle denseAwareOutlinedButtonStyle(
   BuildContext context,
   double minScreenWidthForTextBeforeScaling,
 ) {
-  var buttonStyle = Theme.of(context).outlinedButtonTheme.style;
+  ButtonStyle buttonStyle =
+      Theme.of(context).outlinedButtonTheme.style ?? const ButtonStyle();
   if (!includeText(context, minScreenWidthForTextBeforeScaling)) {
     buttonStyle = buttonStyle.copyWith(
       padding: MaterialStateProperty.resolveWith<EdgeInsets>((_) {

packages/devtools_app/test/about_dialog_test.dart

@@ -6,6 +6,7 @@
 
 import 'package:devtools_app/devtools.dart' as devtools;
 import 'package:devtools_app/src/app.dart';
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/extension_points/extensions_base.dart';
 import 'package:devtools_app/src/extension_points/extensions_external.dart';
 import 'package:devtools_app/src/shared/globals.dart';
@@ -21,6 +22,7 @@ void main() {
       aboutDialog = DevToolsAboutDialog();
       setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
       setGlobal(ServiceConnectionManager, FakeServiceManager());
+      setGlobal(IdeTheme, IdeTheme());
     });
 
     testWidgets('builds dialog', (WidgetTester tester) async {

packages/devtools_app/test/analytics_prompt_test.dart

@@ -6,6 +6,7 @@
 
 import 'package:devtools_app/src/analytics/analytics_controller.dart';
 import 'package:devtools_app/src/analytics/prompt.dart';
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/shared/common_widgets.dart';
 import 'package:devtools_app/src/shared/globals.dart';
 import 'package:devtools_app/src/shared/service_manager.dart';
@@ -32,6 +33,7 @@ void main() {
     setUp(() {
       didCallEnableAnalytics = false;
       setGlobal(ServiceConnectionManager, FakeServiceManager());
+      setGlobal(IdeTheme, IdeTheme());
     });
     group('with analytics enabled', () {
       group('on first run', () {

packages/devtools_app/test/app_size_screen_test.dart

@@ -9,6 +9,7 @@ import 'dart:convert';
 import 'package:devtools_app/src/app_size/app_size_controller.dart';
 import 'package:devtools_app/src/app_size/app_size_screen.dart';
 import 'package:devtools_app/src/app_size/app_size_table.dart';
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/shared/common_widgets.dart';
 import 'package:devtools_app/src/shared/file_import.dart';
 import 'package:devtools_app/src/shared/globals.dart';
@@ -29,6 +30,7 @@ import 'test_data/app_size_test_data/unsupported_file.dart';
 void main() {
   setUp(() {
     setGlobal(ServiceConnectionManager, FakeServiceManager());
+    setGlobal(IdeTheme, IdeTheme());
   });
 
   final lastModifiedTime = DateTime.parse('2020-07-28 13:29:00');

packages/devtools_app/test/banner_messages_test.dart

@@ -4,6 +4,7 @@
 
 // @dart=2.9
 
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/profiler/profiler_screen.dart';
 import 'package:devtools_app/src/shared/banner_messages.dart';
 import 'package:devtools_app/src/shared/common_widgets.dart';
@@ -23,6 +24,7 @@ void main() {
     controller = BannerMessagesController();
     fakeServiceManager = FakeServiceManager();
     setGlobal(ServiceConnectionManager, fakeServiceManager);
+    setGlobal(IdeTheme, IdeTheme());
   });
 
   group('BannerMessages', () {

packages/devtools_app/test/code_size_attribution_test.dart

@@ -5,6 +5,7 @@
 // @dart=2.9
 
 import 'package:devtools_app/src/app_size/code_size_attribution.dart';
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/shared/globals.dart';
 import 'package:devtools_app/src/shared/service_manager.dart';
 import 'package:devtools_app/src/shared/table.dart';
@@ -21,6 +22,7 @@ void main() {
 
   setUp(() {
     setGlobal(ServiceConnectionManager, FakeServiceManager());
+    setGlobal(IdeTheme, IdeTheme());
     callGraph = generateCallGraphWithDominators(
       precompilerTrace,
       NodeType.packageNode,

packages/devtools_app/test/common_widgets_test.dart

@@ -4,6 +4,7 @@
 
 // @dart=2.9
 
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/shared/common_widgets.dart';
 import 'package:devtools_app/src/shared/globals.dart';
 import 'package:devtools_app/src/shared/service_manager.dart';
@@ -22,6 +23,7 @@ void main() {
   group('Common widgets', () {
     setUp(() {
       setGlobal(ServiceConnectionManager, FakeServiceManager());
+      setGlobal(IdeTheme, IdeTheme());
     });
 
     testWidgetsWithWindowSize('recordingInfo builds info for pause', windowSize,

packages/devtools_app/test/cpu_profiler_test.dart

@@ -5,6 +5,7 @@
 // @dart=2.9
 
 import 'package:devtools_app/src/charts/flame_chart.dart';
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/config_specific/import_export/import_export.dart';
 import 'package:devtools_app/src/profiler/cpu_profile_bottom_up.dart';
 import 'package:devtools_app/src/profiler/cpu_profile_call_tree.dart';
@@ -42,6 +43,7 @@ void main() {
         .thenReturn(false);
     setGlobal(ServiceConnectionManager, fakeServiceManager);
     setGlobal(OfflineModeController, OfflineModeController());
+    setGlobal(IdeTheme, IdeTheme());
   });
 
   group('CpuProfiler', () {

packages/devtools_app/test/debugger_screen_test.dart

@@ -7,14 +7,13 @@
 import 'dart:io';
 
 import 'package:ansicolor/ansicolor.dart';
+import 'package:devtools_app/devtools_app.dart';
+import 'package:devtools_app/src/config_specific/ide_theme/ide_theme.dart';
 import 'package:devtools_app/src/debugger/console.dart';
 import 'package:devtools_app/src/debugger/controls.dart';
-import 'package:devtools_app/src/debugger/debugger_controller.dart';
 import 'package:devtools_app/src/debugger/debugger_model.dart';
 import 'package:devtools_app/src/debugger/debugger_screen.dart';
 import 'package:devtools_app/src/debugger/program_explorer_model.dart';
-import 'package:devtools_app/src/shared/globals.dart';
-import 'package:devtools_app/src/shared/service_manager.dart';
 import 'package:devtools_test/devtools_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -35,6 +34,7 @@ void main() {
     when(fakeServiceManager.connectedApp.isProfileBuildNow).thenReturn(false);
     when(fakeServiceManager.connectedApp.isDartWebAppNow).thenReturn(false);
     setGlobal(ServiceConnectionManager, fakeServiceManager);
+    setGlobal(IdeTheme, IdeTheme());
     fakeServiceManager.consoleService.ensureServiceInitialized();
   });