Skip to content

Commit

Permalink
Move code out of connected. (flutter#7534)
Browse files Browse the repository at this point in the history
Move code, that handles all screen modes, out of `connected`.
  • Loading branch information
polina-c committed Apr 5, 2024
1 parent a218748 commit 14b4b17
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 45 deletions.
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/devtools_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export 'src/screens/inspector/inspector_screen.dart';
export 'src/screens/inspector/inspector_tree_controller.dart';
export 'src/screens/logging/logging_controller.dart';
export 'src/screens/logging/logging_screen.dart';
export 'src/screens/memory/framework/connected/memory_controller.dart';
export 'src/screens/memory/framework/memory_controller.dart';
export 'src/screens/memory/framework/memory_screen.dart';
export 'src/screens/network/network_controller.dart';
export 'src/screens/network/network_model.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import 'screens/inspector/inspector_screen.dart';
import 'screens/inspector/inspector_tree_controller.dart';
import 'screens/logging/logging_controller.dart';
import 'screens/logging/logging_screen.dart';
import 'screens/memory/framework/connected/memory_controller.dart';
import 'screens/memory/framework/memory_controller.dart';
import 'screens/memory/framework/memory_screen.dart';
import 'screens/network/network_controller.dart';
import 'screens/network/network_screen.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Dependencies that create loops (inversions) are marked with `!`.

```mermaid
flowchart TD;
memory_screen.dart-->connected;
memory_screen.dart-->screen_body.dart;
memory_tabs.dart-->memory_controller.dart;
screen_body.dart-->memory_controller.dart;
screen_body.dart-->memory_tabs.dart;
```

### Inversions
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
import 'package:devtools_app_shared/utils.dart';
import 'package:flutter/foundation.dart';

import '../../../../shared/memory/class_name.dart';
import '../../../../shared/memory/heap_graph_loader.dart';
import '../../panes/chart/controller/chart_pane_controller.dart';
import '../../panes/control/controller/control_pane_controller.dart';
import '../../panes/diff/controller/diff_pane_controller.dart';
import '../../panes/profile/profile_pane_controller.dart';
import '../../panes/tracing/tracing_pane_controller.dart';
import '../../../shared/memory/class_name.dart';
import '../../../shared/memory/heap_graph_loader.dart';
import '../panes/chart/controller/chart_pane_controller.dart';
import '../panes/control/controller/control_pane_controller.dart';
import '../panes/diff/controller/diff_pane_controller.dart';
import '../panes/profile/profile_pane_controller.dart';
import '../panes/tracing/tracing_pane_controller.dart';

/// This class contains the business logic for memory screen, for a connected
/// application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
import '../../../shared/analytics/analytics.dart' as ga;
import '../../../shared/primitives/listenable.dart';
import '../../../shared/screen.dart';
import 'connected/connected_screen_body.dart';
import 'screen_body.dart';

class MemoryScreen extends Screen {
MemoryScreen() : super.fromMetaData(ScreenMetaData.memory);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

import 'package:flutter/material.dart';

import '../../../../shared/analytics/constants.dart' as gac;
import '../../../../shared/common_widgets.dart';
import '../../../../shared/ui/tab.dart';
import '../../panes/diff/diff_pane.dart';
import '../../panes/profile/profile_view.dart';
import '../../panes/tracing/tracing_view.dart';
import '../../../shared/analytics/constants.dart' as gac;
import '../../../shared/common_widgets.dart';
import '../../../shared/ui/tab.dart';
import '../panes/diff/diff_pane.dart';
import '../panes/profile/profile_view.dart';
import '../panes/tracing/tracing_view.dart';
import 'memory_controller.dart';

@visibleForTesting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import 'package:devtools_app_shared/ui.dart';
import 'package:devtools_app_shared/utils.dart';
import 'package:flutter/material.dart';

import '../../../../shared/banner_messages.dart';
import '../../../../shared/http/http_service.dart' as http_service;
import '../../../../shared/screen.dart';
import '../../../../shared/utils.dart';
import '../../panes/chart/widgets/chart_pane.dart';
import '../../panes/control/widgets/control_pane.dart';
import '../../../shared/banner_messages.dart';
import '../../../shared/http/http_service.dart' as http_service;
import '../../../shared/screen.dart';
import '../../../shared/utils.dart';
import '../panes/chart/widgets/chart_pane.dart';
import '../panes/control/widgets/control_pane.dart';
import 'memory_controller.dart';
import 'memory_tabs.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// found in the LICENSE file.

import 'package:devtools_app/devtools_app.dart';
import 'package:devtools_app/src/screens/memory/framework/connected/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/panes/diff/diff_pane.dart';
import 'package:devtools_app/src/screens/memory/panes/diff/widgets/snapshot_list.dart';
import 'package:devtools_test/helpers.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// found in the LICENSE file.

import 'package:devtools_app/devtools_app.dart';
import 'package:devtools_app/src/screens/memory/framework/connected/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/shared/heap/class_filter.dart';
import 'package:devtools_test/helpers.dart';
import 'package:flutter/material.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@TestOn('vm')
import 'dart:async';

import 'package:devtools_app/src/screens/memory/framework/connected/memory_controller.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_controller.dart';
import 'package:devtools_app/src/screens/memory/panes/chart/controller/memory_tracker.dart';
import 'package:devtools_app/src/screens/memory/shared/primitives/memory_timeline.dart';
import 'package:devtools_app/src/shared/globals.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'package:devtools_app/src/screens/memory/framework/connected/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_screen.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/panes/profile/model.dart';
import 'package:devtools_app/src/screens/memory/panes/profile/profile_pane_controller.dart';
import 'package:devtools_app/src/screens/vm_developer/vm_service_private_extensions.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:convert';
import 'dart:io';

import 'package:devtools_app/devtools_app.dart';
import 'package:devtools_app/src/screens/memory/framework/connected/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
import 'package:devtools_app/src/screens/memory/panes/tracing/tracing_pane_controller.dart';
import 'package:devtools_app/src/screens/memory/panes/tracing/tracing_tree.dart';
import 'package:devtools_app_shared/utils.dart';
Expand Down

0 comments on commit 14b4b17

Please sign in to comment.