Reorganize memory screen code.

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

@@ -22,8 +22,8 @@ import 'memory_protocol.dart';
 import 'panes/allocation_profile/allocation_profile_table_view_controller.dart';
 import 'panes/chart/primitives.dart';
 import 'panes/diff/controller/diff_pane_controller.dart';
-import 'primitives/memory_timeline.dart';
 import 'shared/heap/model.dart';
+import 'shared/primitives/memory_timeline.dart';
 
 // TODO(terry): Consider supporting more than one file since app was launched.
 // Memory Log filename.

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

@@ -12,7 +12,7 @@ import '../../shared/config_specific/logger/logger.dart' as logger;
 import '../../shared/globals.dart';
 import '../../shared/utils.dart';
 import 'memory_controller.dart';
-import 'primitives/memory_timeline.dart';
+import 'shared/primitives/memory_timeline.dart';
 
 class MemoryTracker {
   MemoryTracker(this.memoryController);

packages/devtools_app/lib/src/screens/memory/panes/allocation_profile/allocation_profile_table_view.dart

@@ -15,9 +15,8 @@ import '../../../../shared/table/table_controller.dart';
 import '../../../../shared/table/table_data.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
-import '../../primitives/simple_elements.dart';
-import '../../primitives/ui.dart';
-import '../../shared/primitives.dart';
+import '../../shared/primitives/simple_elements.dart';
+
 import 'allocation_profile_table_view_controller.dart';
 import 'model.dart';
 
@@ -371,7 +370,7 @@ class _ExportAllocationProfileButton extends StatelessWidget {
       valueListenable: allocationProfileController.currentAllocationProfile,
       builder: (context, currentAllocationProfile, _) {
         return ToCsvButton(
-          minScreenWidthForTextBeforeScaling: primaryControlsMinVerboseWidth,
+          minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
           tooltip: 'Download allocation profile data in CSV format',
           onPressed: currentAllocationProfile == null
               ? null

packages/devtools_app/lib/src/screens/memory/panes/allocation_profile/model.dart

@@ -6,7 +6,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../../../../shared/table/table_data.dart';
 import '../../../vm_developer/vm_service_private_extensions.dart';
-import '../../primitives/class_name.dart';
+import '../../shared/primitives/class_name.dart';
 
 class AdaptedAllocationProfile {
   AdaptedAllocationProfile.fromAllocationProfile(AllocationProfile profile) {

packages/devtools_app/lib/src/screens/memory/panes/allocation_tracing/allocation_profile_tracing_view.dart

@@ -12,7 +12,8 @@ import '../../../../shared/common_widgets.dart';
 import '../../../../shared/globals.dart';
 import '../../../../shared/split.dart';
 import '../../../../shared/theme.dart';
-import '../../shared/primitives.dart';
+
+import '../../shared/primitives/simple_elements.dart';
 import 'allocation_profile_class_table.dart';
 import 'allocation_profile_tracing_tree.dart';
 import 'allocation_profile_tracing_view_controller.dart';

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

@@ -11,8 +11,7 @@ import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
-import '../../primitives/ui.dart';
-import '../../shared/primitives.dart';
+import '../../shared/primitives/simple_elements.dart';
 import 'chart_pane_controller.dart';
 import 'interval_dropdown.dart';
 
@@ -87,8 +86,7 @@ class _ChartControlPaneState extends State<ChartControlPane>
               onPressed: controller.memorySource == MemoryController.liveFeed
                   ? _clearTimeline
                   : null,
-              minScreenWidthForTextBeforeScaling:
-                  primaryControlsMinVerboseWidth,
+              minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
               tooltip: 'Clear memory chart.',
             ),
           ],
@@ -129,7 +127,7 @@ class _LegendButton extends StatelessWidget {
         icon: legendVisible ? Icons.close : Icons.storage,
         label: 'Legend',
         tooltip: 'Show chart legend',
-        minScreenWidthForTextBeforeScaling: primaryControlsMinVerboseWidth,
+        minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
       ),
     );
   }

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

@@ -13,7 +13,7 @@ import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
-import '../../primitives/painting.dart';
+import '../../shared/primitives/painting.dart';
 import 'chart_control_pane.dart';
 import 'chart_pane_controller.dart';
 import 'legend.dart';

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

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
-import '../../primitives/painting.dart';
+import '../../shared/primitives/painting.dart';
 import 'chart_pane_controller.dart';
 import 'memory_android_chart.dart';
 import 'memory_charts.dart';

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

@@ -12,7 +12,7 @@ import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
-import '../../primitives/memory_timeline.dart';
+import '../../shared/primitives/memory_timeline.dart';
 
 class AndroidChartController extends ChartController {
   AndroidChartController(this._memoryController, {sharedLabels = const <int>[]})

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

@@ -12,7 +12,7 @@ import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
-import '../../primitives/memory_timeline.dart';
+import '../../shared/primitives/memory_timeline.dart';
 
 // TODO(terry): Consider custom painter?
 const _base = 'assets/img/legend/';

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

@@ -12,7 +12,7 @@ import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
-import '../../primitives/memory_timeline.dart';
+import '../../shared/primitives/memory_timeline.dart';
 
 class VMChartController extends ChartController {
   VMChartController(this._memoryController) : super(name: 'VM Memory');

packages/devtools_app/lib/src/screens/memory/panes/control/primary_controls.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/globals.dart';
-import '../../primitives/ui.dart';
+import '../../shared/primitives/simple_elements.dart';
 
 class PrimaryControls extends StatelessWidget {
   const PrimaryControls({
@@ -18,7 +18,7 @@ class PrimaryControls extends StatelessWidget {
     return ChartVisibilityButton(
       showChart: preferences.memory.showChart,
       onPressed: (show) => preferences.memory.showChart.value = show,
-      minScreenWidthForTextBeforeScaling: primaryControlsMinVerboseWidth,
+      minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
     );
   }
 }

packages/devtools_app/lib/src/screens/memory/panes/control/secondary_controls.dart

@@ -12,8 +12,7 @@ import '../../../../shared/common_widgets.dart';
 import '../../../../shared/globals.dart';
 import '../../../../shared/theme.dart';
 import '../../memory_controller.dart';
-import '../../primitives/ui.dart';
-import '../../shared/primitives.dart';
+import '../../shared/primitives/simple_elements.dart';
 import '../chart/chart_pane_controller.dart';
 import 'primitives.dart';
 import 'settings_dialog.dart';
@@ -33,7 +32,7 @@ class SecondaryControls extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final mediaWidth = MediaQuery.of(context).size.width;
-    controller.memorySourcePrefix = mediaWidth > verboseDropDownMinimumWidth
+    controller.memorySourcePrefix = mediaWidth > memoryControlsMinVerboseWidth
         ? memorySourceMenuItemPrefix
         : '';
 
@@ -47,12 +46,12 @@ class SecondaryControls extends StatelessWidget {
           icon: Icons.delete,
           label: 'GC',
           tooltip: 'Trigger full garbage collection.',
-          minScreenWidthForTextBeforeScaling: primaryControlsMinVerboseWidth,
+          minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
         ),
         const SizedBox(width: denseSpacing),
         ExportButton(
           onPressed: controller.offline.value ? null : _exportToFile,
-          minScreenWidthForTextBeforeScaling: primaryControlsMinVerboseWidth,
+          minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
         ),
         const SizedBox(width: denseSpacing),
         SettingsOutlinedButton(

packages/devtools_app/lib/src/screens/memory/panes/diff/controller/diff_pane_controller.dart

@@ -13,11 +13,11 @@ import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/config_specific/import_export/import_export.dart';
 import '../../../../../shared/primitives/auto_dispose.dart';
 import '../../../../../shared/primitives/utils.dart';
-import '../../../primitives/class_name.dart';
-import '../../../primitives/memory_utils.dart';
 import '../../../shared/heap/class_filter.dart';
 import '../../../shared/heap/heap.dart';
 import '../../../shared/heap/model.dart';
+import '../../../shared/primitives/class_name.dart';
+import '../../../shared/primitives/memory_utils.dart';
 import 'heap_diff.dart';
 import 'item_controller.dart';
 import 'simple_controllers.dart';

packages/devtools_app/lib/src/screens/memory/panes/diff/controller/heap_diff.dart

@@ -8,9 +8,9 @@ import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/analytics/metrics.dart';
 import '../../../../../shared/primitives/utils.dart';
-import '../../../primitives/class_name.dart';
 import '../../../shared/heap/heap.dart';
 import '../../../shared/heap/model.dart';
+import '../../../shared/primitives/class_name.dart';
 
 /// Stores already calculated comparisons for heap couples.
 class HeapDiffStore {

packages/devtools_app/lib/src/screens/memory/panes/diff/diff_pane.dart

@@ -9,7 +9,7 @@ import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/split.dart';
 import '../../../../shared/theme.dart';
-import '../../shared/primitives.dart';
+import '../../shared/primitives/simple_elements.dart';
 import 'controller/diff_pane_controller.dart';
 import 'controller/item_controller.dart';
 import 'widgets/snapshot_control_pane.dart';

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_details/paths.dart

@@ -10,8 +10,8 @@ import '../../../../../../shared/primitives/utils.dart';
 import '../../../../../../shared/table/table.dart';
 import '../../../../../../shared/table/table_data.dart';
 import '../../../../../../shared/utils.dart';
-import '../../../../primitives/simple_elements.dart';
 import '../../../../shared/heap/heap.dart';
+import '../../../../shared/primitives/simple_elements.dart';
 
 class _RetainingPathColumn extends ColumnData<StatsByPathEntry> {
   _RetainingPathColumn(String className)

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_diff.dart

@@ -11,7 +11,7 @@ import '../../../../../shared/table/table.dart';
 import '../../../../../shared/table/table_data.dart';
 import '../../../../../shared/theme.dart';
 import '../../../../../shared/utils.dart';
-import '../../../primitives/simple_elements.dart';
+import '../../../shared/primitives/simple_elements.dart';
 import '../../../shared/shared_memory_widgets.dart';
 import '../controller/heap_diff.dart';
 

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_single.dart

@@ -11,8 +11,8 @@ import '../../../../../shared/table/table.dart';
 import '../../../../../shared/table/table_data.dart';
 import '../../../../../shared/theme.dart';
 import '../../../../../shared/utils.dart';
-import '../../../primitives/simple_elements.dart';
 import '../../../shared/heap/heap.dart';
+import '../../../shared/primitives/simple_elements.dart';
 import '../../../shared/shared_memory_widgets.dart';
 
 class _ClassNameColumn extends ColumnData<SingleClassStats>

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_control_pane.dart

@@ -10,8 +10,8 @@ import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/common_widgets.dart';
 import '../../../../../shared/theme.dart';
-import '../../../primitives/ui.dart';
 import '../../../shared/heap/class_filter.dart';
+import '../../../shared/primitives/simple_elements.dart';
 import '../controller/diff_pane_controller.dart';
 import '../controller/item_controller.dart';
 import 'class_filter_dialog.dart';
@@ -51,7 +51,7 @@ class SnapshotControlPane extends StatelessWidget {
                   const SizedBox(width: defaultSpacing),
                   ToCsvButton(
                     minScreenWidthForTextBeforeScaling:
-                        primaryControlsMinVerboseWidth,
+                        memoryControlsMinVerboseWidth,
                     onPressed: () {
                       ga.select(
                         gac.memory,

packages/devtools_app/lib/src/screens/memory/panes/leaks/controller.dart

@@ -12,7 +12,7 @@ import 'package:vm_service/vm_service.dart';
 import '../../../../shared/config_specific/import_export/import_export.dart';
 import '../../../../shared/globals.dart';
 import '../../../../shared/primitives/utils.dart';
-import '../../primitives/memory_utils.dart';
+import '../../shared/primitives/memory_utils.dart';
 import 'diagnostics/formatter.dart';
 import 'diagnostics/leak_analyzer.dart';
 import 'diagnostics/model.dart';

packages/devtools_app/lib/src/screens/memory/panes/leaks/widgets/simple_widgets.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/common_widgets.dart';
-import '../../../primitives/ui.dart';
+import '../../../shared/primitives/simple_elements.dart';
 import '../controller.dart';
 import '../diagnostics/formatter.dart';
 
@@ -52,7 +52,7 @@ class AnalyzeButton extends StatelessWidget {
       tooltip: 'Analyze the leaks and download the result\n'
           'to ${yamlFilePrefix}_<time>.yaml.',
       onPressed: () async => await leaksController.requestLeaksAndSaveToYaml(),
-      minScreenWidthForTextBeforeScaling: primaryControlsMinVerboseWidth,
+      minScreenWidthForTextBeforeScaling: memoryControlsMinVerboseWidth,
     );
   }
 }

packages/devtools_app/lib/src/screens/memory/shared/README.md

@@ -1,4 +1,4 @@
-This folder contains code shared between panes.
+This folder contains code shared between memory screen panes.
 
-This folder contains higher level libraries, i.e. ones, that depend on other libraries in this package.
-Lower level code, i.e. code that does not depend on other code in this package, should go to the folder 'primitives'.
+For clarity of contracts, it is preferred that code in this folder
+does not depend on any `memory` code outside this folder.

packages/devtools_app/lib/src/screens/memory/shared/heap/class_filter.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter/foundation.dart';
 
-import '../../primitives/class_name.dart';
+import '../primitives/class_name.dart';
 
 enum ClassFilterType {
   showAll,

packages/devtools_app/lib/src/screens/memory/shared/heap/heap.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.
 
-import '../../primitives/class_name.dart';
+import '../primitives/class_name.dart';
 import 'class_filter.dart';
 import 'model.dart';
 import 'spanning_tree.dart';

packages/devtools_app/lib/src/screens/memory/shared/heap/model.dart

@@ -8,8 +8,8 @@ import '../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/analytics/metrics.dart';
 import '../../../../shared/primitives/utils.dart';
-import '../../primitives/class_name.dart';
-import '../../primitives/memory_utils.dart';
+import '../primitives/class_name.dart';
+import '../primitives/memory_utils.dart';
 
 /// Names for json fields.
 class _JsonFields {

packages/devtools_app/lib/src/screens/memory/shared/primitives/README.md

@@ -0,0 +1,2 @@
+This folder contains independent libraries, i.e. libraries that do not depend
+on other libraries in the folder `memory`.

packages/devtools_app/lib/src/screens/memory/primitives/class_name.dart → packages/devtools_app/lib/src/screens/memory/shared/primitives/class_name.dart

@@ -5,7 +5,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../../shared/primitives/simple_items.dart';
+import '../../../../shared/primitives/simple_items.dart';
 
 @immutable
 class HeapClassName {

packages/devtools_app/lib/src/screens/memory/primitives/memory_timeline.dart → packages/devtools_app/lib/src/screens/memory/shared/primitives/memory_timeline.dart

@@ -7,8 +7,8 @@ import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../../shared/config_specific/logger/logger.dart';
-import '../../../shared/primitives/utils.dart';
+import '../../../../shared/config_specific/logger/logger.dart';
+import '../../../../shared/primitives/utils.dart';
 
 enum ContinuesState {
   none,

packages/devtools_app/lib/src/screens/memory/primitives/memory_utils.dart → packages/devtools_app/lib/src/screens/memory/shared/primitives/memory_utils.dart

@@ -4,7 +4,7 @@
 
 import 'package:vm_service/vm_service.dart';
 
-import '../../../shared/globals.dart';
+import '../../../../shared/globals.dart';
 
 Future<HeapSnapshotGraph?> snapshotMemory() async {
   final isolate = serviceManager.isolateManager.selectedIsolate.value;