Revert "[story_shell] Add onHandlingBackGesture for session shell coordination"
This reverts commit ca7245cf14a99f88ae5da871de8dc564941c1e0c.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> [story_shell] Add onHandlingBackGesture for session shell coordination
>
> Reland this change
>
> This is a reland of f51521954ece1c08022194e918b290376afef3b3
>
> Original change's description:
> > [story_shell] Add onHandlingBackGesture for session shell coordination
> >
> > Adds a signal Story Shell and Session Shell can use to coordinate
> > gesture handling on Story state that indicates whether the Story Shell
> > wants to use back gestures to dismiss mods, or can defer to Session
> > Shell for dismissing stories.
> >
> > Whenever the handling state changes, onHandlingBackGesture is triggered
> > which precipitates a change in story state.
> >
> > Test: manual
> >
> > Change-Id: I94f51e048d968ac187f017cf6ba3d9aba16f5436
>
> Change-Id: I4cd11ba904f531c7e96958c5c6877decd9f6506f
TBR=anwilson@google.com,djmurphy@google.com,jphsiao@google.com,cligh@google.com
Change-Id: Iecc59374b50a073ad70d11bf0e0d4774e03a9f68
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
diff --git a/bin/session_shell/armadillo_session_shell/lib/story_provider_watcher_impl.dart b/bin/session_shell/armadillo_session_shell/lib/story_provider_watcher_impl.dart
index cd35b5c..394a16b 100644
--- a/bin/session_shell/armadillo_session_shell/lib/story_provider_watcher_impl.dart
+++ b/bin/session_shell/armadillo_session_shell/lib/story_provider_watcher_impl.dart
@@ -22,12 +22,9 @@
StoryProviderWatcherImpl({this.onStoryChanged, this.onStoryDeleted});
@override
- void onChange(
- StoryInfo storyInfo,
- StoryState storyState,
- StoryVisibilityState storyVisibilityState,
- bool handleBackGesture,
- ) {
+ void onChange(StoryInfo storyInfo,
+ StoryState storyState,
+ StoryVisibilityState storyVisibilityState) {
// TODO(SY-684): Handle story visibility state changes.
onStoryChanged?.call(storyInfo, storyState);
}
diff --git a/shell/mondrian_story_shell/lib/story_shell_impl.dart b/shell/mondrian_story_shell/lib/story_shell_impl.dart
index c77ee9d..41ccc4d 100644
--- a/shell/mondrian_story_shell/lib/story_shell_impl.dart
+++ b/shell/mondrian_story_shell/lib/story_shell_impl.dart
@@ -18,7 +18,6 @@
import 'package:lib.widgets/utils.dart';
import 'package:zircon/zircon.dart';
-import 'models/surface/surface.dart';
import 'models/surface/surface_graph.dart';
import 'models/surface/surface_properties.dart';
@@ -49,24 +48,13 @@
..watchVisualState(_visualStateWatcherBinding.wrap(this))
..getLink(_linkProxy.ctrl.request());
await reloadStoryState().then(onLinkContentsFetched);
- surfaceGraph
- ..addListener(() {
- String surfaceId = surfaceGraph.focused?.node?.value;
- if (surfaceId != null && surfaceId != _lastFocusedSurfaceId) {
- _storyShellBinding.events.onSurfaceFocused(surfaceId);
- _lastFocusedSurfaceId = surfaceId;
- }
- })
- ..addListener(() {
- Surface focusedSurface = surfaceGraph.focused;
- // Check whether the story has a dismissible surface, and so should handle
- // the back gesture or not
- if (focusedSurface != null) {
- _storyShellBinding.events.onHandlingBackGesture(
- focusedSurface.canDismiss(),
- );
- }
- });
+ surfaceGraph.addListener(() {
+ String surfaceId = surfaceGraph.focused?.node?.value;
+ if (surfaceId != null && surfaceId != _lastFocusedSurfaceId) {
+ _storyShellBinding.events.onSurfaceFocused(surfaceId);
+ _lastFocusedSurfaceId = surfaceId;
+ }
+ });
}
/// Bind an [InterfaceRequest] for a [StoryShell] interface to this object.
