Replace DualValueListenableBuilder with `MultiValueListenableBuilde…

…r` (flutter#6129)
kenzieschmoll · Aug 1, 2023 · d20816e · d20816e
1 parent 13839ef
commit d20816e
Show file tree

Hide file tree

Showing 21 changed files with 201 additions and 128 deletions.
diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart
@@ -4,7 +4,6 @@
 
 import 'dart:async';
 
-import 'package:devtools_shared/devtools_extensions.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -250,10 +249,12 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
     Widget scaffoldBuilder() {
       // Force regeneration of visible screens when VM developer mode is
       // enabled and when the list of available extensions change.
-      return DualValueListenableBuilder<bool, List<DevToolsExtensionConfig>>(
-        firstListenable: preferences.vmDeveloperModeEnabled,
-        secondListenable: extensionService.availableExtensions,
-        builder: (_, __, ___, child) {
+      return MultiValueListenableBuilder(
+        listenables: [
+          preferences.vmDeveloperModeEnabled,
+          extensionService.availableExtensions,
+        ],
+        builder: (_, __, child) {
           final screens = _visibleScreens()
               .where((p) => embed && page != null ? p.screenId == page : true)
               .where((p) => !hide.contains(p.screenId))

diff --git a/packages/devtools_app/lib/src/framework/status_line.dart b/packages/devtools_app/lib/src/framework/status_line.dart
@@ -11,6 +11,7 @@ import '../service/service_manager.dart';
 import '../shared/analytics/constants.dart' as gac;
 import '../shared/common_widgets.dart';
 import '../shared/globals.dart';
+import '../shared/primitives/utils.dart';
 import '../shared/screen.dart';
 import '../shared/theme.dart';
 import '../shared/ui/utils.dart';
@@ -219,20 +220,23 @@ class IsolateSelector extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final IsolateManager isolateManager = serviceManager.isolateManager;
-    return DualValueListenableBuilder<List<IsolateRef?>, IsolateRef?>(
-      firstListenable: isolateManager.isolates,
-      secondListenable: isolateManager.selectedIsolate,
-      builder: (context, isolates, selectedIsolateRef, _) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        isolateManager.isolates,
+        isolateManager.selectedIsolate,
+      ],
+      builder: (context, values, _) {
+        final isolates = values.first as List<IsolateRef>;
+        final selectedIsolateRef = values.second as IsolateRef?;
         return PopupMenuButton<IsolateRef?>(
           tooltip: 'Selected Isolate',
           initialValue: selectedIsolateRef,
           onSelected: isolateManager.selectIsolate,
-          itemBuilder: (BuildContext context) =>
-              isolates.where((ref) => ref != null).map(
+          itemBuilder: (BuildContext context) => isolates.map(
             (ref) {
               return PopupMenuItem<IsolateRef>(
                 value: ref,
-                child: IsolateOption(ref!),
+                child: IsolateOption(ref),
               );
             },
           ).toList(),

diff --git a/packages/devtools_app/lib/src/screens/debugger/breakpoints.dart b/packages/devtools_app/lib/src/screens/debugger/breakpoints.dart
@@ -33,11 +33,15 @@ class _BreakpointsState extends State<Breakpoints>
 
   @override
   Widget build(BuildContext context) {
-    return DualValueListenableBuilder<List<BreakpointAndSourcePosition>,
-        BreakpointAndSourcePosition?>(
-      firstListenable: breakpointManager.breakpointsWithLocation,
-      secondListenable: controller.selectedBreakpoint,
-      builder: (context, breakpoints, selectedBreakpoint, _) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        breakpointManager.breakpointsWithLocation,
+        controller.selectedBreakpoint,
+      ],
+      builder: (context, values, _) {
+        final breakpoints = values.first as List<BreakpointAndSourcePosition>;
+        final selectedBreakpoint =
+            values.second as BreakpointAndSourcePosition?;
         return ListView.builder(
           itemCount: breakpoints.length,
           itemExtent: defaultListItemHeight,

diff --git a/packages/devtools_app/lib/src/screens/debugger/call_stack.dart b/packages/devtools_app/lib/src/screens/debugger/call_stack.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart' hide Stack;
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/common_widgets.dart';
+import '../../shared/primitives/utils.dart';
 import '../../shared/theme.dart';
 import '../../shared/utils.dart';
 import 'debugger_controller.dart';
@@ -32,11 +33,14 @@ class _CallStackState extends State<CallStack>
 
   @override
   Widget build(BuildContext context) {
-    return DualValueListenableBuilder<List<StackFrameAndSourcePosition>,
-        StackFrameAndSourcePosition?>(
-      firstListenable: controller.stackFramesWithLocation,
-      secondListenable: controller.selectedStackFrame,
-      builder: (context, stackFrames, selectedFrame, _) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        controller.stackFramesWithLocation,
+        controller.selectedStackFrame,
+      ],
+      builder: (context, values, _) {
+        final stackFrames = values.first as List<StackFrameAndSourcePosition>;
+        final selectedFrame = values.second as StackFrameAndSourcePosition?;
         return ListView.builder(
           itemCount: stackFrames.length,
           itemExtent: defaultListItemHeight,

diff --git a/packages/devtools_app/lib/src/screens/debugger/codeview.dart b/packages/devtools_app/lib/src/screens/debugger/codeview.dart
@@ -788,10 +788,15 @@ class Gutters extends StatelessWidget {
 
     return Row(
       children: [
-        DualValueListenableBuilder<List<BreakpointAndSourcePosition>, bool>(
-          firstListenable: breakpointManager.breakpointsWithLocation,
-          secondListenable: codeViewController.showCodeCoverage,
-          builder: (context, breakpoints, showCodeCoverage, _) {
+        MultiValueListenableBuilder(
+          listenables: [
+            breakpointManager.breakpointsWithLocation,
+            codeViewController.showCodeCoverage,
+          ],
+          builder: (context, values, _) {
+            final breakpoints =
+                values.first as List<BreakpointAndSourcePosition>;
+            final showCodeCoverage = values.second as bool;
             return Gutter(
               gutterWidth: gutterWidth,
               scrollController: gutterController,

diff --git a/packages/devtools_app/lib/src/screens/debugger/controls.dart b/packages/devtools_app/lib/src/screens/debugger/controls.dart
@@ -12,6 +12,7 @@ import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/common_widgets.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/auto_dispose.dart';
+import '../../shared/primitives/utils.dart';
 import '../../shared/theme.dart';
 import '../../shared/ui/label.dart';
 import '../../shared/utils.dart';
@@ -167,10 +168,14 @@ class CodeStatisticsControls extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DualValueListenableBuilder<bool, bool>(
-      firstListenable: controller.codeViewController.showCodeCoverage,
-      secondListenable: controller.codeViewController.showProfileInformation,
-      builder: (context, showCodeCoverage, showProfileInformation, _) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        controller.codeViewController.showCodeCoverage,
+        controller.codeViewController.showProfileInformation,
+      ],
+      builder: (context, values, _) {
+        final showCodeCoverage = values.first as bool;
+        final showProfileInformation = values.second as bool;
         return Row(
           children: [
             // TODO(kenz): clean up this button group when records are

diff --git a/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart b/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart
@@ -20,6 +20,7 @@ import '../../shared/flex_split_column.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/listenable.dart';
+import '../../shared/primitives/utils.dart';
 import '../../shared/routing.dart';
 import '../../shared/screen.dart';
 import '../../shared/split.dart';
@@ -179,10 +180,14 @@ class DebuggerScreenBodyState extends State<DebuggerScreenBody>
                     return child!;
                   }
                 },
-                child: DualValueListenableBuilder<ScriptRef?, ParsedScript?>(
-                  firstListenable: codeViewController.currentScriptRef,
-                  secondListenable: codeViewController.currentParsedScript,
-                  builder: (context, scriptRef, parsedScript, _) {
+                child: MultiValueListenableBuilder(
+                  listenables: [
+                    codeViewController.currentScriptRef,
+                    codeViewController.currentParsedScript,
+                  ],
+                  builder: (context, values, _) {
+                    final scriptRef = values.first as ScriptRef?;
+                    final parsedScript = values.second as ParsedScript?;
                     if (scriptRef != null &&
                         parsedScript != null &&
                         !_shownFirstScript) {

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/chart_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/chart_pane.dart
@@ -202,10 +202,14 @@ class _MemoryChartPaneState extends State<MemoryChartPane>
                 ),
               ),
               // The legend.
-              DualValueListenableBuilder<bool, bool>(
-                firstListenable: widget.chartController.legendVisibleNotifier,
-                secondListenable: controller.isAndroidChartVisibleNotifier,
-                builder: (_, isLegendVisible, isAndroidChartVisible, __) {
+              MultiValueListenableBuilder(
+                listenables: [
+                  widget.chartController.legendVisibleNotifier,
+                  controller.isAndroidChartVisibleNotifier,
+                ],
+                builder: (_, values, __) {
+                  final isLegendVisible = values.first as bool;
+                  final isAndroidChartVisible = values.second as bool;
                   if (!isLegendVisible) return const SizedBox.shrink();
                   return Padding(
                     padding: const EdgeInsets.only(

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/path.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/path.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import '../../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../../shared/common_widgets.dart';
+import '../../../../../../shared/primitives/utils.dart';
 import '../../../../../../shared/theme.dart';
 import '../../../../shared/heap/model.dart';
 import '../../controller/class_data.dart';
@@ -123,18 +124,24 @@ class _PathView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DualValueListenableBuilder<bool, bool>(
-      firstListenable: controller.hideStandard,
-      secondListenable: controller.invert,
-      builder: (_, hideStandard, invert, __) => SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: SingleChildScrollView(
-          child: Text(
-            path.toLongString(inverted: invert, hideStandard: hideStandard),
-            overflow: TextOverflow.visible,
+    return MultiValueListenableBuilder(
+      listenables: [
+        controller.hideStandard,
+        controller.invert,
+      ],
+      builder: (_, values, __) {
+        final hideStandard = values.first as bool;
+        final invert = values.second as bool;
+        return SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: SingleChildScrollView(
+            child: Text(
+              path.toLongString(inverted: invert, hideStandard: hideStandard),
+              overflow: TextOverflow.visible,
+            ),
           ),
-        ),
-      ),
+        );
+      },
     );
   }
 }
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart
@@ -360,10 +360,14 @@ class _SnapshotListItemsState extends State<_SnapshotListItems>
   Widget build(BuildContext context) {
     final core = widget.controller.core;
 
-    return DualValueListenableBuilder<List<SnapshotItem>, int>(
-      firstListenable: core.snapshots,
-      secondListenable: core.selectedSnapshotIndex,
-      builder: (_, snapshots, selectedIndex, __) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        core.snapshots,
+        core.selectedSnapshotIndex,
+      ],
+      builder: (_, values, __) {
+        final snapshots = values.first as List<SnapshotItem>;
+        final selectedIndex = values.second as int;
         return ListView.builder(
           controller: _scrollController,
           itemCount: snapshots.length,

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_view.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_view.dart
@@ -5,6 +5,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../../../shared/common_widgets.dart';
+import '../../../../../shared/primitives/utils.dart';
 import '../../../../../shared/split.dart';
 import '../../../shared/heap/heap.dart';
 import '../controller/diff_pane_controller.dart';
@@ -20,11 +21,14 @@ class SnapshotView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DualValueListenableBuilder<List<SingleClassStats>?,
-        List<DiffClassStats>?>(
-      firstListenable: controller.derived.singleClassesToShow,
-      secondListenable: controller.derived.diffClassesToShow,
-      builder: (_, singleClasses, diffClasses, __) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        controller.derived.singleClassesToShow,
+        controller.derived.diffClassesToShow,
+      ],
+      builder: (_, values, __) {
+        final singleClasses = values.first as List<SingleClassStats>?;
+        final diffClasses = values.second as List<DiffClassStats>?;
         if (controller.derived.updatingValues) {
           return const Center(child: Text('Calculating...'));
         }

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/leaks/primitives/analysis_status.dart b/packages/devtools_app/lib/src/screens/memory/panes/leaks/primitives/analysis_status.dart
@@ -5,6 +5,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../../../shared/common_widgets.dart';
+import '../../../../../shared/primitives/utils.dart';
 import '../../../../../shared/theme.dart';
 
 enum AnalysisStatus {
@@ -67,10 +68,14 @@ class AnalysisStatusView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DualValueListenableBuilder<AnalysisStatus, String>(
-      firstListenable: controller.status,
-      secondListenable: controller.message,
-      builder: (_, status, message, __) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        controller.status,
+        controller.message,
+      ],
+      builder: (_, values, __) {
+        final status = values.first as AnalysisStatus;
+        final message = values.second as String;
         if (status == AnalysisStatus.notStarted) {
           return analysisStarter;
         }

diff --git a/packages/devtools_app/lib/src/screens/memory/panes/tracing/class_table.dart b/packages/devtools_app/lib/src/screens/memory/panes/tracing/class_table.dart
@@ -172,10 +172,13 @@ class _AllocationTracingTableState extends State<AllocationTracingTable> {
           ),
         ),
         Expanded(
-          child: DualValueListenableBuilder<bool, TracingIsolateState>(
-            firstListenable: widget.controller.refreshing,
-            secondListenable: widget.controller.stateForIsolate,
-            builder: (context, _, state, __) {
+          child: MultiValueListenableBuilder(
+            listenables: [
+              widget.controller.refreshing,
+              widget.controller.stateForIsolate,
+            ],
+            builder: (context, values, __) {
+              final state = values.second as TracingIsolateState;
               return ValueListenableBuilder<List<TracedClass>>(
                 valueListenable: state.filteredClassList,
                 builder: (context, filteredClassList, _) {

diff --git a/packages/devtools_app/lib/src/screens/network/network_screen.dart b/packages/devtools_app/lib/src/screens/network/network_screen.dart
@@ -50,10 +50,14 @@ class NetworkScreen extends Screen {
     final networkController = Provider.of<NetworkController>(context);
     final color = Theme.of(context).textTheme.bodyMedium!.color!;
 
-    return DualValueListenableBuilder<NetworkRequests, List<NetworkRequest>>(
-      firstListenable: networkController.requests,
-      secondListenable: networkController.filteredData,
-      builder: (context, networkRequests, filteredRequests, child) {
+    return MultiValueListenableBuilder(
+      listenables: [
+        networkController.requests,
+        networkController.filteredData,
+      ],
+      builder: (context, values, child) {
+        final networkRequests = values.first as NetworkRequests;
+        final filteredRequests = values.second as List<NetworkRequest>;
         final filteredCount = filteredRequests.length;
         final totalCount = networkRequests.requests.length;
         return Row(

diff --git a/...tools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart b/...tools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart
@@ -12,6 +12,7 @@ import '../../../../../service/service_extensions.dart' as extensions;
 import '../../../../../shared/common_widgets.dart';
 import '../../../../../shared/globals.dart';
 import '../../../../../shared/primitives/auto_dispose.dart';
+import '../../../../../shared/primitives/utils.dart';
 import '../../../../../shared/theme.dart';
 import '../performance_controls.dart';
 import 'enhance_tracing_controller.dart';
@@ -230,10 +231,14 @@ class _TrackWidgetBuildsSettingState extends State<TrackWidgetBuildsSetting>
             );
           },
         ),
-        DualValueListenableBuilder<bool, TrackWidgetBuildsScope?>(
-          firstListenable: _tracked,
-          secondListenable: _selectedScope,
-          builder: (context, tracked, selectedScope, _) {
+        MultiValueListenableBuilder(
+          listenables: [
+            _tracked,
+            _selectedScope,
+          ],
+          builder: (context, values, _) {
+            final tracked = values.first as bool;
+            final selectedScope = values.second as TrackWidgetBuildsScope?;
             return Padding(
               padding: const EdgeInsets.only(left: _scopeSelectorPadding),
               child: TrackWidgetBuildsScopeSelector(