Merge branch 'master' of github.com:flutter/devtools

Author: kenzieschmoll

packages/devtools_app/lib/src/screens/memory/panes/chart/chart_control_pane.dart

@@ -125,8 +125,9 @@ class _ChartControlPaneState extends State<ChartControlPane>
   void _showLegend(BuildContext context) {
     final box = legendKey.currentContext!.findRenderObject() as RenderBox;
 
-    final colorScheme = Theme.of(context).colorScheme;
-    final legendHeading = colorScheme.hoverTextStyle;
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final legendHeading = theme.hoverTextStyle;
 
     // Global position.
     final position = box.localToGlobal(Offset.zero);

packages/devtools_app/lib/src/screens/memory/panes/chart/chart_pane.dart

@@ -290,8 +290,9 @@ class _MemoryChartPaneState extends State<MemoryChartPane>
     ChartsValues chartsValues,
     Offset position,
   ) {
-    final focusColor = Theme.of(context).focusColor;
-    final colorScheme = Theme.of(context).colorScheme;
+    final theme = Theme.of(context);
+    final focusColor = theme.focusColor;
+    final colorScheme = theme.colorScheme;
 
     final box = MemoryChartPane.hoverKey.currentContext!.findRenderObject()
         as RenderBox;
@@ -321,7 +322,7 @@ class _MemoryChartPaneState extends State<MemoryChartPane>
 
     final displayTimestamp = prettyTimestamp(chartsValues.timestamp);
 
-    final hoverHeading = colorScheme.hoverTitleTextStyle;
+    final hoverHeading = theme.hoverTitleTextStyle;
 
     final OverlayState overlayState = Overlay.of(context)!;
     _hoverOverlayEntry ??= OverlayEntry(
@@ -409,10 +410,10 @@ class _MemoryChartPaneState extends State<MemoryChartPane>
     bool scaleImage = false,
     double leftPadding = 5.0,
   }) {
-    final hoverTitleEntry = Theme.of(context).colorScheme.hoverTextStyle;
-    final hoverValueEntry = Theme.of(context).colorScheme.hoverValueTextStyle;
-    final hoverSmallEntry =
-        Theme.of(context).colorScheme.hoverSmallValueTextStyle;
+    final theme = Theme.of(context);
+    final hoverTitleEntry = theme.hoverTextStyle;
+    final hoverValueEntry = theme.hoverValueTextStyle;
+    final hoverSmallEntry = theme.hoverSmallValueTextStyle;
 
     List<Widget> hoverPartImageLine(
       String name, {
@@ -560,8 +561,9 @@ class _MemoryChartPaneState extends State<MemoryChartPane>
       index++;
     }
 
-    final colorScheme = Theme.of(context).colorScheme;
-    final hoverTextStyle = colorScheme.hoverTextStyle;
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final hoverTextStyle = theme.hoverTextStyle;
     final contrastForeground = colorScheme.contrastForeground;
     final collapsedColor = colorScheme.defaultBackgroundColor;
 
@@ -590,8 +592,9 @@ class _MemoryChartPaneState extends State<MemoryChartPane>
   }
 
   Widget _cardWidget(String value) {
-    final colorScheme = Theme.of(context).colorScheme;
-    final hoverValueEntry = colorScheme.hoverSmallValueTextStyle;
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final hoverValueEntry = theme.hoverSmallValueTextStyle;
     final expandedGradient = colorScheme.verticalGradient;
 
     return Padding(

packages/devtools_app/lib/src/screens/memory/panes/chart/legend.dart

@@ -28,7 +28,8 @@ class LegendRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final legendEntry = Theme.of(context).colorScheme.legendTextStyle;
+    final theme = Theme.of(context);
+    final legendEntry = theme.legendTextStyle;
 
     List<Widget> legendPart(
       String name,

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

@@ -375,55 +375,6 @@ extension DevToolsColorScheme on ColorScheme {
 
   Color get autoCompleteTextColor => isLight ? Colors.black : Colors.white;
 
-  // Title of the hover card.
-  TextStyle get hoverTitleTextStyle => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(15.0),
-        decoration: TextDecoration.none,
-      );
-
-  // Items in the hover card.
-  TextStyle get hoverTextStyle => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(11.5),
-        decoration: TextDecoration.none,
-      );
-
-  // Value of items in hover e.g., capacity, etc.
-  TextStyle get hoverValueTextStyle => TextStyle(
-        color: contrastForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(11.5),
-        decoration: TextDecoration.none,
-      );
-
-  // Used for custom extension event values.
-  TextStyle get hoverSmallValueTextStyle => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(10.0),
-        decoration: TextDecoration.none,
-      );
-
-  // Last allocation timestamp displayed.
-  TextStyle get italicTextStyle => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(14.0),
-        fontStyle: FontStyle.italic,
-        decoration: TextDecoration.none,
-      );
-
-  // Items in a chart's legend.
-  TextStyle get legendTextStyle => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(10.0),
-        decoration: TextDecoration.none,
-      );
-
   Color get expandedColor => isLight ? Colors.grey[200]! : Colors.grey[800]!;
 
   Color get expandedTopContentColor =>
@@ -438,20 +389,6 @@ extension DevToolsColorScheme on ColorScheme {
         colors: [expandedTopContentColor, expandedBottomContentColor],
         tileMode: TileMode.repeated,
       );
-
-  /// TextStyle for callstack.
-  TextStyle get stackTraceCall => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.normal,
-        fontSize: scaleByFontFactor(12.0),
-      );
-
-  /// TextStyle for source file displayed in callstack.
-  TextStyle get stackTraceSource => TextStyle(
-        color: defaultForeground,
-        fontWeight: FontWeight.w100,
-        fontSize: scaleByFontFactor(12.0),
-      );
 }
 
 /// Utility extension methods to the [ThemeData] class.
@@ -514,6 +451,69 @@ extension ThemeDataExtension on ThemeData {
         color: Colors.black,
         backgroundColor: searchMatchColor,
       );
+
+  // Title of the hover card.
+  TextStyle get hoverTitleTextStyle => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(15.0),
+        decoration: TextDecoration.none,
+      );
+
+  // Items in the hover card.
+  TextStyle get hoverTextStyle => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(11.5),
+        decoration: TextDecoration.none,
+      );
+
+  // Value of items in hover e.g., capacity, etc.
+  TextStyle get hoverValueTextStyle => TextStyle(
+        color: colorScheme.contrastForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(11.5),
+        decoration: TextDecoration.none,
+      );
+
+  // Used for custom extension event values.
+  TextStyle get hoverSmallValueTextStyle => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(10.0),
+        decoration: TextDecoration.none,
+      );
+
+  // Last allocation timestamp displayed.
+  TextStyle get italicTextStyle => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(14.0),
+        fontStyle: FontStyle.italic,
+        decoration: TextDecoration.none,
+      );
+
+  // Items in a chart's legend.
+  TextStyle get legendTextStyle => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(10.0),
+        decoration: TextDecoration.none,
+      );
+
+  /// TextStyle for callstack.
+  TextStyle get stackTraceCall => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.normal,
+        fontSize: scaleByFontFactor(12.0),
+      );
+
+  /// TextStyle for source file displayed in callstack.
+  TextStyle get stackTraceSource => TextStyle(
+        color: colorScheme.defaultForeground,
+        fontWeight: FontWeight.w100,
+        fontSize: scaleByFontFactor(12.0),
+      );
 }
 
 const extraWideSearchTextWidth = 600.0;

packages/devtools_app/lib/src/ui/hover.dart

@@ -121,9 +121,10 @@ class HoverCard {
   }) {
     maxCardHeight ??= maxHoverCardHeight;
     final overlayState = Overlay.of(context)!;
-    final colorScheme = Theme.of(context).colorScheme;
-    final focusColor = Theme.of(context).focusColor;
-    final hoverHeading = colorScheme.hoverTitleTextStyle;
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final focusColor = theme.focusColor;
+    final hoverHeading = theme.hoverTitleTextStyle;
 
     _overlayEntry = OverlayEntry(
       builder: (context) {
@@ -161,7 +162,7 @@ class HoverCard {
                         textAlign: TextAlign.center,
                       ),
                     ),
-                    Divider(color: colorScheme.hoverTextStyle.color),
+                    Divider(color: theme.hoverTextStyle.color),
                   ],
                   SingleChildScrollView(
                     child: Container(

packages/devtools_app/pubspec.yaml

@@ -33,7 +33,8 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_markdown: ^0.6.8
-  flutter_riverpod: 1.0.4
+  # TODO: https://github.com/flutter/devtools/issues/4569 - unpin this version
+  flutter_riverpod: 2.0.0-dev.9
   flutter_web_plugins:
     sdk: flutter
   http: ^0.13.4

packages/devtools_app/test/network/network_request_inspector_test.dart

@@ -67,7 +67,7 @@ void main() {
 
       // Select the request in the network request list.
       final networkRequest = requestsNotifier.value.requests.first;
-      controller.selectRequest(networkRequest);
+      controller.selectedRequest.value = networkRequest;
       await tester.pumpAndSettle();
       await tester.tap(find.text('Request'));
       await tester.pumpAndSettle();