firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1438 from Hixie/state_route

Browse Source 
Rename RouteState to StateRoute
This commit is contained in:
Ian Hickson 2015-10-01 13:22:51 -07:00
commit 434a36be27
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/widgets/drawer.dart
View File

@ -123,8 +123,8 @@ class DrawerState extends State<Drawer> {
void _handleDismissed() { void _handleDismissed() {
if (config.navigator != null && if (config.navigator != null &&
config.navigator.currentRoute is RouteState && config.navigator.currentRoute is StateRoute &&
(config.navigator.currentRoute as RouteState).owner == this) // TODO(ianh): remove cast once analyzer is cleverer (config.navigator.currentRoute as StateRoute).owner == this) // TODO(ianh): remove cast once analyzer is cleverer
config.navigator.pop(); config.navigator.pop();
if (config.onDismissed != null) if (config.onDismissed != null)
config.onDismissed(); config.onDismissed();

10
packages/flutter/lib/src/widgets/navigator.dart
View File

@ -10,7 +10,7 @@ import 'package:sky/src/widgets/transitions.dart';
typedef Widget RouteBuilder(NavigatorState navigator, Route route); typedef Widget RouteBuilder(NavigatorState navigator, Route route);
typedef RouteBuilder RouteGenerator(String name); typedef RouteBuilder RouteGenerator(String name);
typedef void RouteStateCallback(RouteState route); typedef void StateRouteCallback(StateRoute route);
typedef void NotificationCallback(); typedef void NotificationCallback();
class Navigator extends StatefulComponent { class Navigator extends StatefulComponent {
@ -48,7 +48,7 @@ class NavigatorState extends State<Navigator> {
} }
void pushState(State owner, Function callback) { void pushState(State owner, Function callback) {
push(new RouteState( push(new StateRoute(
route: currentRoute, route: currentRoute,
owner: owner, owner: owner,
callback: callback callback: callback
@ -275,12 +275,12 @@ class PageRoute extends Route {
} }
} }
class RouteState extends Route { class StateRoute extends Route {
RouteState({ this.route, this.owner, this.callback }); StateRoute({ this.route, this.owner, this.callback });
Route route; Route route;
State owner; State owner;
RouteStateCallback callback; StateRouteCallback callback;
bool get hasContent => false; bool get hasContent => false;
bool get modal => false; bool get modal => false;