[child_view] Remove stray fromViewHolderToken
This constructor is deprecated, and we are transitioning away from it.
SCN-898 #comment
Change-Id: I6e48cad0a9873345ab5f4b2ef2a29b457ee6bac5
diff --git a/bin/userpicker_base_shell/BUILD.gn b/bin/userpicker_base_shell/BUILD.gn
index 61f0e1d..8fb13f1 100644
--- a/bin/userpicker_base_shell/BUILD.gn
+++ b/bin/userpicker_base_shell/BUILD.gn
@@ -52,7 +52,7 @@
"//sdk/fidl/fuchsia.modular.auth",
"//sdk/fidl/fuchsia.timezone",
"//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.viewsv1",
+ "//sdk/fidl/fuchsia.ui.views",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//third_party/dart-pkg/pub/http",
"//topaz/lib/base_shell:lib.base_shell",
@@ -60,7 +60,7 @@
"//topaz/public/dart/fidl",
"//topaz/public/dart/fuchsia_scenic_flutter",
"//topaz/public/dart/widgets:lib.widgets",
- "//topaz/public/lib/device/dart",
"//topaz/public/lib/app/dart",
+ "//topaz/public/lib/device/dart",
]
}
diff --git a/bin/userpicker_base_shell/lib/authentication_overlay_model.dart b/bin/userpicker_base_shell/lib/authentication_overlay_model.dart
index 99a9884..c7b920c 100644
--- a/bin/userpicker_base_shell/lib/authentication_overlay_model.dart
+++ b/bin/userpicker_base_shell/lib/authentication_overlay_model.dart
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/material.dart';
import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
show ChildViewConnection;
import 'package:lib.app.dart/logging.dart';
import 'package:lib.widgets/model.dart';
-import 'package:zircon/zircon.dart';
/// Manages the connection and animation of the authentication window.
class AuthenticationOverlayModel extends Model implements TickerProvider {
@@ -38,8 +38,8 @@
CurvedAnimation get animation => _curvedTransitionAnimation;
/// Starts showing an overlay over all other content.
- void onStartOverlay(EventPair overlayViewHolderToken) {
- _childViewConnection = new ChildViewConnection.fromViewHolderToken(
+ void onStartOverlay(ViewHolderToken overlayViewHolderToken) {
+ _childViewConnection = ChildViewConnection(
overlayViewHolderToken,
onAvailable: (ChildViewConnection connection) {
log.fine(
diff --git a/bin/userpicker_base_shell/lib/authentication_ui_context_impl.dart b/bin/userpicker_base_shell/lib/authentication_ui_context_impl.dart
index 61d634f..7efa204 100644
--- a/bin/userpicker_base_shell/lib/authentication_ui_context_impl.dart
+++ b/bin/userpicker_base_shell/lib/authentication_ui_context_impl.dart
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'package:fidl/fidl.dart';
import 'package:fidl_fuchsia_auth/fidl.dart';
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:fidl_fuchsia_ui_viewsv1token/fidl.dart';
import 'package:flutter/widgets.dart';
-import 'package:fidl/fidl.dart';
import 'package:zircon/zircon.dart';
/// Called when an authentication overlay needs to be started.
-typedef OnStartOverlay = void Function(EventPair viewHolderToken);
+typedef OnStartOverlay = void Function(ViewHolderToken viewHolderToken);
/// An [AuthenticationUiContext] which calls its callbacks to show an overlay.
class AuthenticationUiContextImpl extends AuthenticationUiContext {
@@ -33,7 +34,7 @@
@override
// ignore: override_on_non_overriding_method
void startOverlay2(EventPair viewHolderToken) =>
- _onStartOverlay?.call(viewHolderToken);
+ _onStartOverlay?.call(ViewHolderToken(value: viewHolderToken));
@override
void stopOverlay() => _onStopOverlay?.call();
diff --git a/lib/base_shell/BUILD.gn b/lib/base_shell/BUILD.gn
index ad324f9..c4bdbf0 100644
--- a/lib/base_shell/BUILD.gn
+++ b/lib/base_shell/BUILD.gn
@@ -19,7 +19,7 @@
"//sdk/fidl/fuchsia.netstack",
"//sdk/fidl/fuchsia.timezone",
"//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.viewsv1",
+ "//sdk/fidl/fuchsia.ui.views",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//topaz/public/dart/fidl",
"//topaz/public/dart/fuchsia_scenic_flutter",
diff --git a/lib/base_shell/lib/base_model.dart b/lib/base_shell/lib/base_model.dart
index 35863d3..02679c3 100644
--- a/lib/base_shell/lib/base_model.dart
+++ b/lib/base_shell/lib/base_model.dart
@@ -14,6 +14,7 @@
import 'package:fidl_fuchsia_ui_gfx/fidl.dart';
import 'package:fidl_fuchsia_ui_input/fidl.dart' as input;
import 'package:fidl_fuchsia_ui_policy/fidl.dart';
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
show ChildViewConnection;
import 'package:lib.app.dart/app.dart' as app;
@@ -103,9 +104,7 @@
// |ServiceProvider|.
@override
void connectToService(String serviceName, Channel channel) {
- // TODO(SCN-595) mozart.Presentation is being renamed to ui.Presentation.
- if (serviceName == 'mozart.Presentation' ||
- serviceName == 'ui.Presentation') {
+ if (serviceName == 'ui.Presentation') {
_presentationBindings.add(PresentationBinding()
..bind(this, InterfaceRequest<Presentation>(channel)));
} else {
@@ -204,8 +203,9 @@
final viewOwnerHandle =
_userManager.login(accountId, serviceProvider.passHandle());
- _childViewConnection = ChildViewConnection.fromViewHolderToken(
- EventPair(viewOwnerHandle.passChannel().passHandle()),
+ _childViewConnection = ChildViewConnection(
+ ViewHolderToken(
+ value: EventPair(viewOwnerHandle.passChannel().passHandle())),
onAvailable: (ChildViewConnection connection) {
trace('session shell available');
log.info('BaseShell: Child view connection available!');
diff --git a/lib/base_shell_async/BUILD.gn b/lib/base_shell_async/BUILD.gn
index 3da6778..33cd3ae 100644
--- a/lib/base_shell_async/BUILD.gn
+++ b/lib/base_shell_async/BUILD.gn
@@ -19,7 +19,7 @@
"//sdk/fidl/fuchsia.netstack",
"//sdk/fidl/fuchsia.timezone",
"//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.viewsv1",
+ "//sdk/fidl/fuchsia.ui.views",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//topaz/public/dart/fidl",
"//topaz/public/dart/fuchsia_scenic_flutter",
diff --git a/lib/base_shell_async/lib/base_model.dart b/lib/base_shell_async/lib/base_model.dart
index 1b02199..1825743 100644
--- a/lib/base_shell_async/lib/base_model.dart
+++ b/lib/base_shell_async/lib/base_model.dart
@@ -14,6 +14,7 @@
import 'package:fidl_fuchsia_ui_gfx/fidl_async.dart';
import 'package:fidl_fuchsia_ui_input/fidl_async.dart' as input;
import 'package:fidl_fuchsia_ui_policy/fidl_async.dart';
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:fuchsia_logger/logger.dart';
import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
show ChildViewConnection;
@@ -204,8 +205,9 @@
final viewOwnerHandle =
_userManager.login(accountId, serviceProvider.passHandle());
- _childViewConnection = ChildViewConnection.fromViewHolderToken(
- EventPair(viewOwnerHandle.passChannel().passHandle()),
+ _childViewConnection = ChildViewConnection(
+ ViewHolderToken(
+ value: EventPair(viewOwnerHandle.passChannel().passHandle())),
onAvailable: (ChildViewConnection connection) {
log.info('BaseShell: Child view connection available!');
connection.requestFocus();
diff --git a/public/lib/mediaplayer/flutter/BUILD.gn b/public/lib/mediaplayer/flutter/BUILD.gn
index eda016c..2b6b391 100644
--- a/public/lib/mediaplayer/flutter/BUILD.gn
+++ b/public/lib/mediaplayer/flutter/BUILD.gn
@@ -17,7 +17,7 @@
deps = [
"//sdk/fidl/fuchsia.media",
- "//sdk/fidl/fuchsia.ui.viewsv1",
+ "//sdk/fidl/fuchsia.ui.views",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//topaz/public/dart/fuchsia_scenic_flutter",
"//topaz/public/lib/app/dart",
diff --git a/public/lib/mediaplayer/flutter/media_player_controller.dart b/public/lib/mediaplayer/flutter/media_player_controller.dart
index e8f37f9..52610b7 100644
--- a/public/lib/mediaplayer/flutter/media_player_controller.dart
+++ b/public/lib/mediaplayer/flutter/media_player_controller.dart
@@ -8,6 +8,7 @@
import 'package:fidl_fuchsia_math/fidl.dart' as geom;
import 'package:fidl_fuchsia_mediaplayer/fidl.dart';
import 'package:fidl_fuchsia_sys/fidl.dart';
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
@@ -52,7 +53,7 @@
player.createView2(viewTokens.first);
_videoViewConnection =
- ChildViewConnection.fromViewHolderToken(viewTokens.second);
+ ChildViewConnection(ViewHolderToken(value: viewTokens.second));
}
}
diff --git a/shell/mondrian_story_shell/BUILD.gn b/shell/mondrian_story_shell/BUILD.gn
index eaba375..98dc7e8 100644
--- a/shell/mondrian_story_shell/BUILD.gn
+++ b/shell/mondrian_story_shell/BUILD.gn
@@ -48,7 +48,7 @@
"//sdk/fidl/fuchsia.ui.gfx",
"//sdk/fidl/fuchsia.ui.input",
"//sdk/fidl/fuchsia.ui.policy",
- "//sdk/fidl/fuchsia.ui.viewsv1",
+ "//sdk/fidl/fuchsia.ui.views",
"//sdk/fidl/fuchsia.ui.viewsv1token",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//third_party/dart-pkg/pub/meta",
diff --git a/shell/mondrian_story_shell/lib/models/surface/surface_graph.dart b/shell/mondrian_story_shell/lib/models/surface/surface_graph.dart
index 1cecbe2..aae42b3 100644
--- a/shell/mondrian_story_shell/lib/models/surface/surface_graph.dart
+++ b/shell/mondrian_story_shell/lib/models/surface/surface_graph.dart
@@ -6,7 +6,7 @@
import 'package:fidl/fidl.dart';
import 'package:fidl_fuchsia_modular/fidl.dart';
-import 'package:fidl_fuchsia_ui_gfx/fidl.dart' show ImportToken;
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:fidl_fuchsia_ui_viewsv1token/fidl.dart';
import 'package:fuchsia_scenic_flutter/child_view_connection.dart'
show ChildViewConnection;
@@ -217,12 +217,15 @@
bool isDismissed(String id) => _dismissedSurfaces.contains(id);
void connectView(String id, InterfaceHandle<ViewOwner> viewOwner) {
- connectViewFromImportToken(id,
- ImportToken(value: EventPair(viewOwner.passChannel().passHandle())));
+ connectViewFromViewHolderToken(
+ id,
+ ViewHolderToken(
+ value: EventPair(viewOwner.passChannel().passHandle())));
}
/// Used to update a [Surface] with a live ChildViewConnection
- void connectViewFromImportToken(String id, ImportToken viewHolderToken) {
+ void connectViewFromViewHolderToken(
+ String id, ViewHolderToken viewHolderToken) {
final Surface surface = _surfaces[id];
if (surface != null) {
if (surface.connection != null) {
@@ -232,8 +235,8 @@
}
log.fine('connectView $surface');
surface
- ..connection = ChildViewConnection.fromViewHolderToken(
- viewHolderToken.value,
+ ..connection = ChildViewConnection(
+ viewHolderToken,
onAvailable: (ChildViewConnection connection) {
Timeline.instantSync('surface available', arguments: {'id': '$id'});
diff --git a/shell/mondrian_story_shell/lib/story_shell_impl.dart b/shell/mondrian_story_shell/lib/story_shell_impl.dart
index 5104659..98d017f 100644
--- a/shell/mondrian_story_shell/lib/story_shell_impl.dart
+++ b/shell/mondrian_story_shell/lib/story_shell_impl.dart
@@ -12,6 +12,7 @@
import 'package:fidl_fuchsia_modular/fidl.dart';
import 'package:fidl_fuchsia_ui_gfx/fidl.dart' show ImportToken;
import 'package:fidl_fuchsia_ui_policy/fidl.dart';
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:fuchsia/fuchsia.dart' show exit;
import 'package:lib.app.dart/logging.dart';
import 'package:lib.story_shell/common.dart';
@@ -67,30 +68,13 @@
_lifecycleBinding.bind(this, request);
}
- /// DEPRECATED. For transition purposes only, please use addSurface2 until
- /// Views 2 transition is complete.
- @override
- void addSurface(
- ViewConnection viewConnection,
- SurfaceInfo surfaceInfo,
- ) {
- addSurface2(
- ViewConnection2(
- surfaceId: viewConnection.surfaceId,
- viewHolderToken: ImportToken(
- value: EventPair(
- viewConnection.owner.passChannel().passHandle()))),
- surfaceInfo);
- }
-
/// Introduce a new Surface and corresponding [ImportToken] to the current
/// Story.
///
/// The Surface may have a relationship with its parent surface.
@override
- // ignore: override_on_non_overriding_method
- void addSurface2(
- ViewConnection2 viewConnection,
+ void addSurface(
+ ViewConnection viewConnection,
SurfaceInfo surfaceInfo,
) {
trace(
@@ -113,8 +97,11 @@
? surfaceInfo.moduleManifest.placeholderColor
: '',
)
- ..connectViewFromImportToken(
- viewConnection.surfaceId, viewConnection.viewHolderToken);
+ ..connectViewFromViewHolderToken(
+ viewConnection.surfaceId,
+ ViewHolderToken(
+ value:
+ EventPair(viewConnection.owner.passChannel().passHandle())));
}
/// Focus the surface with this id
@@ -138,7 +125,8 @@
persistStoryState();
}
- /// DEPRECATED in favor of addContainer2.
+ /// Add a container node to the graph, with associated layout as a property,
+ /// and optionally specify a parent and a relationship to the parent
@override
void addContainer(
String containerName,
@@ -146,19 +134,7 @@
SurfaceRelation relation,
List<ContainerLayout> layouts,
List<ContainerRelationEntry> relationships,
- List<ContainerView> views) {}
-
- /// Add a container node to the graph, with associated layout as a property,
- /// and optionally specify a parent and a relationship to the parent
- @override
- // ignore: override_on_non_overriding_method
- void addContainer2(
- String containerName,
- String parentId,
- SurfaceRelation relation,
- List<ContainerLayout> layouts,
- List<ContainerRelationEntry> relationships,
- List<ContainerView2> views) {
+ List<ContainerView> views) {
// Add a root node for the container
Timeline.instantSync('adding container', arguments: {
'containerName': '$containerName',
@@ -175,9 +151,10 @@
Map<String, ContainerRelationEntry> nodeMap =
<String, ContainerRelationEntry>{};
Map<String, List<String>> parentChildrenMap = <String, List<String>>{};
- Map<String, ImportToken> viewMap = <String, ImportToken>{};
- for (ContainerView2 view in views) {
- viewMap[view.nodeName] = view.viewHolderToken;
+ Map<String, ViewHolderToken> viewMap = <String, ViewHolderToken>{};
+ for (ContainerView view in views) {
+ viewMap[view.nodeName] = ViewHolderToken(
+ value: EventPair(view.owner.passChannel().passHandle()));
}
for (ContainerRelationEntry relatedNode in relationships) {
nodeMap[relatedNode.nodeName] = relatedNode;
@@ -186,7 +163,7 @@
.add(relatedNode.nodeName);
}
List<String> nodeQueue =
- views.map((ContainerView2 v) => v.nodeName).toList();
+ views.map((ContainerView v) => v.nodeName).toList();
List<String> addedParents = <String>[containerName];
int i = 0;
while (nodeQueue.isNotEmpty) {
@@ -200,7 +177,7 @@
surfaceGraph.addSurface(
nodeId, prop, parentId, nodeMap[nodeId].relationship, null, '');
addedParents.add(nodeId);
- surfaceGraph.connectViewFromImportToken(nodeId, viewMap[nodeId]);
+ surfaceGraph.connectViewFromViewHolderToken(nodeId, viewMap[nodeId]);
nodeQueue.remove(nodeId);
surfaceGraph.focusSurface(nodeId);
}
@@ -224,16 +201,6 @@
@override
void reconnectView(ViewConnection viewConnection) {
- reconnectView2(ViewConnection2(
- surfaceId: viewConnection.surfaceId,
- viewHolderToken: ImportToken(
- value:
- EventPair(viewConnection.owner.passChannel().passHandle()))));
- }
-
- @override
- // ignore: override_on_non_overriding_method
- void reconnectView2(ViewConnection2 viewConnection) {
// TODO (jphsiao): implement
}
@@ -242,21 +209,6 @@
ViewConnection viewConnection,
SurfaceInfo surfaceInfo,
) {
- updateSurface2(
- ViewConnection2(
- surfaceId: viewConnection.surfaceId,
- viewHolderToken: ImportToken(
- value: EventPair(
- viewConnection.owner.passChannel().passHandle()))),
- surfaceInfo);
- }
-
- @override
- // ignore: override_on_non_overriding_method
- void updateSurface2(
- ViewConnection2 viewConnection,
- SurfaceInfo surfaceInfo,
- ) {
// TODO (jphsiao): implement
}
diff --git a/shell/mondrian_story_shell/test/layout/surface_relationship_test.dart b/shell/mondrian_story_shell/test/layout/surface_relationship_test.dart
index 2ea1295..077eb14 100644
--- a/shell/mondrian_story_shell/test/layout/surface_relationship_test.dart
+++ b/shell/mondrian_story_shell/test/layout/surface_relationship_test.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:fidl_fuchsia_modular/fidl.dart';
-import 'package:fidl_fuchsia_ui_gfx/fidl.dart' show ImportToken;
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mondrian/models/layout_model.dart';
@@ -30,8 +30,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
@@ -57,8 +57,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
// properties for the copresent surface
properties = new SurfaceProperties();
@@ -69,8 +69,8 @@
);
Surface copresentSurface = graph.addSurface('copresentSurface', properties,
'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'copresentSurface', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'copresentSurface', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
@@ -101,8 +101,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
// properties for the sequential surface
properties = new SurfaceProperties();
@@ -113,8 +113,8 @@
);
Surface sequentialSurface = graph.addSurface('copresentSurface', properties,
'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'copresentSurface', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'copresentSurface', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
@@ -141,8 +141,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
// properties for the ontop surface
properties = new SurfaceProperties();
@@ -153,8 +153,8 @@
);
Surface ontopSurface = graph.addSurface(
'ontop', properties, 'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'ontop', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'ontop', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
@@ -186,8 +186,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
// properties for root surface
properties = new SurfaceProperties();
@@ -198,8 +198,8 @@
);
Surface copresentSurface = graph.addSurface(
'copresent', properties, 'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'copresent', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'copresent', ViewHolderToken(value: EventPair(null)));
// properties for the ontop surface
properties = new SurfaceProperties();
@@ -210,8 +210,8 @@
);
Surface ontopSurface = graph.addSurface(
'ontop', properties, 'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'ontop', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'ontop', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
@@ -249,8 +249,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
// properties for root surface
properties = new SurfaceProperties();
@@ -261,8 +261,8 @@
);
Surface copresentSurface = graph.addSurface(
'copresent', properties, 'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'copresent', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'copresent', ViewHolderToken(value: EventPair(null)));
// properties for the ontop surface
properties = new SurfaceProperties();
@@ -273,8 +273,8 @@
);
Surface ontopSurface = graph.addSurface(
'ontop', properties, 'copresent', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'ontop', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'ontop', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
@@ -310,8 +310,8 @@
);
Surface root = graph.addSurface(
'root_of_test', properties, '', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'root_of_test', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'root_of_test', ViewHolderToken(value: EventPair(null)));
// properties for root surface
properties = new SurfaceProperties();
@@ -322,8 +322,8 @@
);
Surface firstOnTop = graph.addSurface(
'ontop1', properties, 'root_of_test', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'ontop1', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'ontop1', ViewHolderToken(value: EventPair(null)));
// properties for the ontop surface
properties = new SurfaceProperties();
@@ -334,8 +334,8 @@
);
Surface secondOntop = graph.addSurface(
'ontop2', properties, 'ontop1', surfaceRelation, '', '');
- graph.connectViewFromImportToken(
- 'ontop2', ImportToken(value: EventPair(null)));
+ graph.connectViewFromViewHolderToken(
+ 'ontop2', ViewHolderToken(value: EventPair(null)));
List<Surface> surfaces = [
root,
diff --git a/shell/mondrian_story_shell/test/model/surface/surface_graph_test.dart b/shell/mondrian_story_shell/test/model/surface/surface_graph_test.dart
index b14adfd..d897866 100644
--- a/shell/mondrian_story_shell/test/model/surface/surface_graph_test.dart
+++ b/shell/mondrian_story_shell/test/model/surface/surface_graph_test.dart
@@ -5,7 +5,7 @@
import 'dart:convert';
import 'package:fidl_fuchsia_modular/fidl.dart';
-import 'package:fidl_fuchsia_ui_gfx/fidl.dart' show ImportToken;
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mondrian/models/surface/surface.dart';
import 'package:mondrian/models/surface/surface_graph.dart';
@@ -24,7 +24,8 @@
);
graph
..addSurface('value', properties, '', relation, null, '')
- ..connectViewFromImportToken('value', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value', ViewHolderToken(value: EventPair(null)))
..focusSurface('value');
expect(graph.focusStack.length, 1);
String encoded = json.encode(graph);
@@ -53,8 +54,8 @@
);
graph
..addSurface('parent', properties, '', relation, null, '')
- ..connectViewFromImportToken(
- 'parent', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'parent', ViewHolderToken(value: EventPair(null)))
..focusSurface('parent');
expect(graph.focusStack.length, 1);
@@ -66,7 +67,8 @@
);
graph
..addSurface('child', properties, 'parent', relation, null, '')
- ..connectViewFromImportToken('child', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'child', ViewHolderToken(value: EventPair(null)))
..focusSurface('child');
expect(graph.focusStack.length, 2);
@@ -108,8 +110,8 @@
);
graph
..addSurface('parent', properties, '', relation, null, '')
- ..connectViewFromImportToken(
- 'parent', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'parent', ViewHolderToken(value: EventPair(null)))
..focusSurface('parent');
expect(graph.focusStack.length, 1);
@@ -121,7 +123,8 @@
);
graph
..addSurface('child1', properties, 'parent', relation, null, '')
- ..connectViewFromImportToken('child', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'child', ViewHolderToken(value: EventPair(null)))
..focusSurface('child1');
expect(graph.focusStack.length, 2);
@@ -133,8 +136,8 @@
);
graph
..addSurface('child2', properties, 'parent', relation, null, '')
- ..connectViewFromImportToken(
- 'child2', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'child2', ViewHolderToken(value: EventPair(null)))
..focusSurface('child2');
expect(graph.focusStack.length, 3);
@@ -183,14 +186,14 @@
graph
..addSurface('parent', new SurfaceProperties(), '', new SurfaceRelation(),
null, '')
- ..connectViewFromImportToken(
- 'parent', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'parent', ViewHolderToken(value: EventPair(null)))
..focusSurface('parent')
// Now add external surface
..addSurface(
'external', externalProp, 'parent', new SurfaceRelation(), null, '')
- ..connectViewFromImportToken(
- 'external', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'external', ViewHolderToken(value: EventPair(null)))
..focusSurface('external')
// Now dismiss the external surface
..dismissSurface('external');
@@ -209,13 +212,15 @@
);
graph
..addSurface('value', properties, '', relation, null, '')
- ..connectViewFromImportToken('value', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value', ViewHolderToken(value: EventPair(null)))
..focusSurface('value');
expect(graph.treeSize, 2);
graph
..addSurface('value', properties, '', relation, null, '')
- ..connectViewFromImportToken('value', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value', ViewHolderToken(value: EventPair(null)))
..focusSurface('value');
expect(graph.treeSize, 2);
});
@@ -231,21 +236,22 @@
);
graph
..addSurface('value', properties, '', relation, null, '')
- ..connectViewFromImportToken('value', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value', ViewHolderToken(value: EventPair(null)))
..focusSurface('value');
expect(graph.treeSize, 2);
graph
..addSurface('value.child', properties, '', relation, null, '')
- ..connectViewFromImportToken(
- 'value.child', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value.child', ViewHolderToken(value: EventPair(null)))
..focusSurface('value.child');
expect(graph.treeSize, 3);
graph
..addSurface('value.child', properties, '', relation, null, '')
- ..connectViewFromImportToken(
- 'value.child', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value.child', ViewHolderToken(value: EventPair(null)))
..focusSurface('value.child');
expect(graph.treeSize, 3);
});
@@ -261,21 +267,22 @@
);
graph
..addSurface('value', properties, '', relation, null, '')
- ..connectViewFromImportToken('value', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value', ViewHolderToken(value: EventPair(null)))
..focusSurface('value');
expect(graph.treeSize, 2);
graph
..addSurface('value.child', properties, '', relation, null, '')
- ..connectViewFromImportToken(
- 'value.child', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value.child', ViewHolderToken(value: EventPair(null)))
..focusSurface('value.child');
expect(graph.treeSize, 3);
graph
..addSurface('value.child', properties, '', relation, null, '')
- ..connectViewFromImportToken(
- 'value.child', ImportToken(value: EventPair(null)))
+ ..connectViewFromViewHolderToken(
+ 'value.child', ViewHolderToken(value: EventPair(null)))
..focusSurface('value.child');
expect(graph.treeSize, 3);
});
