-
Notifications
You must be signed in to change notification settings - Fork 0
Improve app navigation. #111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e383801
improve app navigation, and save navigation based on the auth state
amaury901130 b10b72b
improve auth state ref
amaury901130 394ee16
imrpove go router
amaury901130 15f9331
add deeplink support
amaury901130 24a3a95
add deeplink support
amaury901130 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,137 @@ | ||
| import 'package:app/main/init.dart'; | ||
| import 'package:app/presentation/ui/pages/home/home_page.dart'; | ||
| import 'package:app/presentation/ui/pages/login/login_page.dart'; | ||
| import 'package:app/presentation/ui/pages/sign_up/sign_up_page.dart'; | ||
| import 'package:app/presentation/ui/pages/splash/splash_page.dart'; | ||
| import 'package:common/core/resource.dart'; | ||
| import 'package:domain/bloc/auth/auth_cubit.dart'; | ||
| import 'package:domain/bloc/auth/auth_state.dart'; | ||
| import 'package:flutter/widgets.dart'; | ||
| import 'package:flutter_bloc/flutter_bloc.dart'; | ||
| import 'package:go_router/go_router.dart'; | ||
|
|
||
| enum Routes { | ||
| auth, | ||
| login, | ||
| signup, | ||
| app, | ||
| home, | ||
| placeholder; | ||
|
|
||
| String get path => '/$name'; | ||
|
||
| String get subPath => name; | ||
|
|
||
| void nav(BuildContext context, {Object? extra}) { | ||
| context.router.goNamed( | ||
| name, | ||
| extra: extra, | ||
| ); | ||
| } | ||
|
|
||
| static GoRouter init(BuildContext context, {String? initialLocation}) => | ||
| Routers.appRouter(context, initialLocation: initialLocation); | ||
| } | ||
|
|
||
| extension ContextOnRouter on BuildContext { | ||
| GoRouter get router => GoRouter.of(this); | ||
| } | ||
|
|
||
| class Routers { | ||
| static GoRouter authRouter = GoRouter( | ||
| initialLocation: "/splash", | ||
| routes: [ | ||
| GoRoute( | ||
| name: "login", | ||
| path: "/login", | ||
| builder: (context, state) => const LoginPage(), | ||
| ), | ||
| GoRoute( | ||
| name: "splash", | ||
| path: "/splash", | ||
| builder: (context, state) => const SplashPage(), | ||
| ), | ||
| GoRoute( | ||
| name: "signUp", | ||
| path: "/signUp", | ||
| builder: (context, state) => const SignUpPage(), | ||
| ), | ||
| GoRoute( | ||
| name: "home", | ||
| path: "/home", | ||
| builder: (context, state) => const HomePage(), | ||
| ), | ||
| ], | ||
| ); | ||
| static GoRouter appRouter( | ||
| BuildContext context, { | ||
| String? initialLocation, | ||
| }) => | ||
| GoRouter( | ||
| initialLocation: initialLocation ?? | ||
| (getIt<AuthCubit>().isLoggedIn() | ||
| ? Routes.app.path | ||
| : Routes.auth.path), | ||
| routes: [ | ||
| GoRoute( | ||
| path: '/', | ||
| builder: (context, state) { | ||
| return BlocListener<AuthCubit, Resource>( | ||
| listenWhen: (previous, current) => current is RSuccess, | ||
| listener: (_, appState) { | ||
| if (appState is RSuccess) { | ||
| switch (appState.data) { | ||
| case AuthStateAuthenticated _: | ||
| debugPrint('User is authenticated: ${state.fullPath}'); | ||
| if (state.fullPath?.startsWith(Routes.app.path) ?? | ||
| false) { | ||
| // Already navigating to app, do nothing | ||
| return; | ||
| } | ||
| debugPrint('Navigating to app route'); | ||
| Routes.app.nav(context); | ||
| break; | ||
| case AuthStateUnauthenticated _: | ||
| debugPrint( | ||
| 'User is unauthenticated: ${state.fullPath}'); | ||
| if (state.fullPath?.startsWith(Routes.auth.path) ?? | ||
| false) { | ||
| // Already navigating to auth, do nothing | ||
| return; | ||
| } | ||
| debugPrint('Navigating to auth route'); | ||
| Routes.auth.nav(context); | ||
| break; | ||
| case _: | ||
| } | ||
| } | ||
| }, | ||
| child: const SplashPage(), | ||
| ); | ||
| }, | ||
| routes: [ | ||
| ShellRoute( | ||
| builder: (context, state, child) => child, | ||
| routes: [ | ||
| GoRoute( | ||
| name: Routes.auth.name, | ||
| path: Routes.auth.path, | ||
| redirect: (context, state) { | ||
| if (getIt<AuthCubit>().isLoggedIn()) { | ||
| return Routes.app.path; | ||
| } | ||
| return null; | ||
| }, | ||
| builder: (context, state) => const LoginPage(), | ||
| routes: [ | ||
| GoRoute( | ||
| name: Routes.signup.name, | ||
| path: Routes.signup.subPath, | ||
| builder: (context, state) => const SignUpPage(), | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ), | ||
| ShellRoute( | ||
| builder: (context, state, child) => child, | ||
| routes: [ | ||
| GoRoute( | ||
| name: Routes.app.name, | ||
| path: Routes.app.path, | ||
| redirect: (context, state) { | ||
| if (!getIt<AuthCubit>().isLoggedIn()) { | ||
| return Routes.auth.path; | ||
| } | ||
| return null; | ||
| }, | ||
| builder: (context, state) => const HomePage(), | ||
| routes: [ | ||
| GoRoute( | ||
| name: Routes.placeholder.name, | ||
| path: Routes.placeholder.subPath, | ||
| builder: (context, state) => const Placeholder(), | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| # | ||
|
|
||
| list(APPEND FLUTTER_PLUGIN_LIST | ||
| gtk | ||
| ) | ||
|
|
||
| list(APPEND FLUTTER_FFI_PLUGIN_LIST | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
usePathUrlStrategy()call should be placed afterWidgetsFlutterBinding.ensureInitialized()but before any other initialization. However, it's currently placed after the binding initialization but on a separate line without a comment. While functionally correct, consider adding a comment explaining why path-based URLs are being used instead of hash-based URLs (e.g., for better SEO, cleaner URLs).