diff --git a/lib/ui/screens/collectible_found/collectible_found_screen.dart b/lib/ui/screens/collectible_found/collectible_found_screen.dart index 3a968667..57d6a1ae 100644 --- a/lib/ui/screens/collectible_found/collectible_found_screen.dart +++ b/lib/ui/screens/collectible_found/collectible_found_screen.dart @@ -184,6 +184,6 @@ class CollectibleFoundScreen extends StatelessWidget { void _handleViewCollectionPressed(BuildContext context) { Navigator.pop(context); - context.push(ScreenPaths.collection(collectible.id)); + context.go(ScreenPaths.collection(collectible.id)); } } diff --git a/lib/ui/screens/home_menu/home_menu.dart b/lib/ui/screens/home_menu/home_menu.dart index fdce4781..87b253b4 100644 --- a/lib/ui/screens/home_menu/home_menu.dart +++ b/lib/ui/screens/home_menu/home_menu.dart @@ -42,9 +42,9 @@ class _HomeMenuState extends State { ); } - void _handleCollectionPressed(BuildContext context) => context.push(ScreenPaths.collection('')); + void _handleCollectionPressed(BuildContext context) => context.go(ScreenPaths.collection('')); - void _handleTimelinePressed(BuildContext context) => context.push(ScreenPaths.timeline(widget.data.type)); + void _handleTimelinePressed(BuildContext context) => context.go(ScreenPaths.timeline(widget.data.type)); void _handleWonderPressed(BuildContext context, WonderData data) => Navigator.pop(context, data.type); diff --git a/lib/ui/screens/wonder_events/widgets/_timeline_btn.dart b/lib/ui/screens/wonder_events/widgets/_timeline_btn.dart index 5bfc4805..1045f711 100644 --- a/lib/ui/screens/wonder_events/widgets/_timeline_btn.dart +++ b/lib/ui/screens/wonder_events/widgets/_timeline_btn.dart @@ -7,7 +7,7 @@ class _TimelineBtn extends StatelessWidget { @override Widget build(BuildContext context) { - void handleBtnPressed() => context.push(ScreenPaths.timeline(type)); + void handleBtnPressed() => context.go(ScreenPaths.timeline(type)); return Padding( padding: EdgeInsets.symmetric(horizontal: $styles.insets.md), child: SizedBox( diff --git a/lib/ui/screens/wonder_events/wonder_events.dart b/lib/ui/screens/wonder_events/wonder_events.dart index 95db3609..960bd0ea 100644 --- a/lib/ui/screens/wonder_events/wonder_events.dart +++ b/lib/ui/screens/wonder_events/wonder_events.dart @@ -35,7 +35,7 @@ class _WonderEventsState extends State { @override Widget build(BuildContext context) { - void handleTimelineBtnPressed() => context.push(ScreenPaths.timeline(widget.type)); + void handleTimelineBtnPressed() => context.go(ScreenPaths.timeline(widget.type)); // Main view content switches between 1 and 2 column layouts // On mobile, use the 2 column layout on screens close to landscape (>.85). This is primarily an optimization for foldable devices which have square-ish dimensions when opened. final twoColumnAspect = PlatformInfo.isMobile ? .85 : 1;