From 2853af8f6121ff0b28f7d0718a9c41e7650b1b2e Mon Sep 17 00:00:00 2001 From: Shawn Date: Thu, 11 Jan 2024 10:15:30 -0700 Subject: [PATCH] Add support for nested artifacts (probably going to switch back to push() due to an apparent bug in GoRouter) --- .../artifact/artifact_carousel/artifact_carousel_screen.dart | 4 ++-- .../artifact/artifact_search/artifact_search_screen.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart b/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart index 14583f32..b45c3572 100644 --- a/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart +++ b/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart @@ -34,13 +34,13 @@ class _ArtifactScreenState extends State { _currentArtifactIndex.value = _wrappedPageIndex; } - void _handleSearchTap() => context.push(ScreenPaths.search(widget.type)); + void _handleSearchTap() => context.go(ScreenPaths.search(widget.type)); void _handleArtifactTap(int index) { int delta = index - _currentPage.value.round(); if (delta == 0) { HighlightData data = _artifacts[index % _artifacts.length]; - context.push(ScreenPaths.artifact(data.artifactId)); + context.go(ScreenPaths.artifact(data.artifactId)); } else { _pageController?.animateToPage( _currentPage.value.round() + delta, diff --git a/lib/ui/screens/artifact/artifact_search/artifact_search_screen.dart b/lib/ui/screens/artifact/artifact_search/artifact_search_screen.dart index b67d6187..61789a81 100644 --- a/lib/ui/screens/artifact/artifact_search/artifact_search_screen.dart +++ b/lib/ui/screens/artifact/artifact_search/artifact_search_screen.dart @@ -65,7 +65,7 @@ class _ArtifactSearchScreenState extends State with GetItS _updateFilter(); } - void _handleResultPressed(SearchData o) => context.push(ScreenPaths.artifact(o.id.toString())); + void _handleResultPressed(SearchData o) => context.go(ScreenPaths.artifact(o.id.toString())); void _handlePanelControllerChanged() { settingsLogic.isSearchPanelOpen.value = panelController.value;