ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: make homepage a subroute of /rooms so that the state of /rooms will be maintained when navigating between them (#2829)

Browse source
This commit is contained in:
ggurdin 2025-05-19 09:24:20 -04:00 • committed by GitHub
parent 18ebc03ba3
commit c5b7b550f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
lib/config/routes.dart
View file

@ -188,43 +188,6 @@ abstract class AppRoutes {
),
],
),
ShellRoute(
pageBuilder: chatListShellRouteBuilder,
routes: [
GoRoute(
path: '/homepage',
redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const SuggestionsPage(),
),
routes: [
...newRoomRoutes,
GoRoute(
path: '/planner',
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const ActivityPlannerPage(),
),
redirect: loggedOutRedirect,
routes: [
GoRoute(
path: '/generator',
redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const ActivityGenerator(),
),
),
],
),
],
),
],
),
// Pangea#
ShellRoute(
// Never use a transition on the shell route. Changing the PageBuilder
@ -402,6 +365,40 @@ abstract class AppRoutes {
: child,
),
routes: [
// #Pangea
GoRoute(
path: '/homepage',
redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const SuggestionsPage(),
),
routes: [
...newRoomRoutes,
GoRoute(
path: '/planner',
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const ActivityPlannerPage(),
),
redirect: loggedOutRedirect,
routes: [
GoRoute(
path: '/generator',
redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder(
context,
state,
const ActivityGenerator(),
),
),
],
),
],
),
// Pangea#
GoRoute(
path: 'settings',
pageBuilder: (context, state) => defaultPageBuilder(

2
lib/pangea/activity_planner/activity_planner_page_appbar.dart
View file

@ -70,7 +70,7 @@ class ActivityPlannerPageAppBar extends StatelessWidget
customBorder: const CircleBorder(),
onTap: () => roomID != null
? context.go('/rooms/$roomID/planner/generator')
: context.go("/homepage/planner/generator"),
: context.go("/rooms/homepage/planner/generator"),
child: Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,

2
lib/pangea/activity_suggestions/activity_suggestions_area.dart
View file

@ -180,7 +180,7 @@ class ActivitySuggestionsAreaState extends State<ActivitySuggestionsArea> {
),
IconButton(
icon: const Icon(Icons.menu_outlined),
onPressed: () => context.go('/homepage/planner'),
onPressed: () => context.go('/rooms/homepage/planner'),
tooltip: L10n.of(context).activityPlannerTitle,
),
],

2
lib/pangea/layouts/bottom_nav_layout.dart
View file

@ -43,7 +43,7 @@ class BottomNavBarState extends State<BottomNavBar> {
void onItemTapped(int index) {
switch (index) {
case 0:
context.go('/homepage');
context.go('/rooms/homepage');
break;
case 1:
context.go('/rooms');