Force to run the splash initialization when user wants to open a link…

… (such as the lobby deep link)
imaNNeo · Nov 13, 2024 · ce28e46 · ce28e46
1 parent a3f2627
commit ce28e46
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 71 deletions.
diff --git a/lib/data/remote/nakama_data_source.dart b/lib/data/remote/nakama_data_source.dart
@@ -121,7 +121,7 @@ class NakamaDataSource {
       session: _currentSession,
       id: 'get_waiting_match',
     );
-    if (matchId == null) {
+    if (matchId == null || matchId.isBlank) {
       throw Exception('Failed to get match id');
     }
     return matchId;

diff --git a/lib/main.dart b/lib/main.dart
@@ -7,6 +7,7 @@ import 'package:flappy_dash/presentation/bloc/leaderboard/leaderboard_cubit.dart
 import 'package:flappy_dash/presentation/bloc/multiplayer/multiplayer_cubit.dart';
 import 'package:flappy_dash/presentation/bloc/multiplayer/ping/ping_cubit.dart';
 import 'package:flappy_dash/presentation/pages/debug/debug_panel.dart';
+import 'package:flappy_dash/presentation/pages/splash/cubit/splash_cubit.dart';
 import 'package:flappy_dash/service_locator.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -67,6 +68,11 @@ class MyApp extends StatelessWidget {
           ),
           lazy: false,
         ),
+        BlocProvider(
+          create: (context) => SplashCubit(
+            getIt.get<GameRepository>(),
+          ),
+        ),
       ],
       child: MaterialApp.router(
         routerConfig: AppRoutes.router,

diff --git a/lib/presentation/app_routes.dart b/lib/presentation/app_routes.dart
@@ -2,7 +2,9 @@ import 'package:flappy_dash/presentation/pages/home/home_page.dart';
 import 'package:flappy_dash/presentation/pages/multiplayer/game/multiplayer_game_page.dart';
 import 'package:flappy_dash/presentation/pages/multiplayer/lobby/multiplayer_lobby_page.dart';
 import 'package:flappy_dash/presentation/pages/singleplayer/singleplayer_game_page.dart';
+import 'package:flappy_dash/presentation/pages/splash/cubit/splash_cubit.dart';
 import 'package:flappy_dash/presentation/pages/splash/splash_page.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 
 import 'pages/multiplayer/result/match_result_page.dart';
@@ -13,44 +15,54 @@ class AppRoutes {
     routes: [
       GoRoute(
         path: '/splash',
-        builder: (context, state) => const SplashPage(),
+        builder: (context, state) {
+          final redirectTo = state.uri.queryParameters['redirectTo'];
+          return SplashPage(redirectTo: redirectTo);
+        },
       ),
       GoRoute(
-        path: '/',
-        builder: (context, state) => const HomePage(),
-        routes: [
-          GoRoute(
-            path: 'single_player',
-            builder: (context, state) => const SinglePlayerGamePage(),
-          ),
-          GoRoute(
-            path: 'lobby/:matchId',
-            builder: (context, state) {
-              return MultiPlayerLobbyPage(
-                matchId: state.pathParameters['matchId']!,
-              );
-            },
-          ),
-          GoRoute(
-            path: 'multi_player/:matchId',
-            builder: (context, state) {
-              return MultiPlayerGamePage(
-                matchId: state.pathParameters['matchId']!,
-              );
-            },
-            routes: [
-              GoRoute(
-                path: 'result',
+          path: '/',
+          builder: (context, state) => const HomePage(),
+          routes: [
+            GoRoute(
+              path: 'single_player',
+              builder: (context, state) => const SinglePlayerGamePage(),
+            ),
+            GoRoute(
+              path: 'lobby/:matchId',
+              builder: (context, state) {
+                return MultiPlayerLobbyPage(
+                  matchId: state.pathParameters['matchId']!,
+                );
+              },
+            ),
+            GoRoute(
+                path: 'multi_player/:matchId',
                 builder: (context, state) {
-                  return MatchResultPage(
+                  return MultiPlayerGamePage(
                     matchId: state.pathParameters['matchId']!,
                   );
                 },
-              ),
-            ]
-          ),
-        ]
-      ),
+                routes: [
+                  GoRoute(
+                    path: 'result',
+                    builder: (context, state) {
+                      return MatchResultPage(
+                        matchId: state.pathParameters['matchId']!,
+                      );
+                    },
+                  ),
+                ]),
+          ]),
     ],
+    redirect: (context, state) {
+      final splashCubit = context.read<SplashCubit>();
+      final splashInitialized = splashCubit.state.isSplashInitialized;
+      if (!splashInitialized && state.uri.path != '/splash') {
+        final encodedPath = Uri.encodeComponent(state.uri.toString());
+        return '/splash?redirectTo=$encodedPath';
+      }
+      return null;
+    },
   );
 }
diff --git a/lib/presentation/pages/home/home_page.dart b/lib/presentation/pages/home/home_page.dart
@@ -28,10 +28,9 @@ class HomePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (BuildContext context) =>
-          HomeCubit(
-            getIt.get<MultiplayerRepository>(),
-          ),
+      create: (BuildContext context) => HomeCubit(
+        getIt.get<MultiplayerRepository>(),
+      ),
       child: const HomePageContent(),
     );
   }
@@ -83,9 +82,9 @@ class HomePageContent extends StatelessWidget {
                       ),
                       const SizedBox(height: 18),
                       MultiPlayerButton(
-                        onPressed: () {
-                          context.read<HomeCubit>().onMultiPlayerButtonPressed();
-                        },
+                        onPressed: context
+                            .read<HomeCubit>()
+                            .onMultiPlayerButtonPressed,
                         showLoading: state.multiPlayerMatchIdLoading,
                       ),
                       const SizedBox(height: 8),
@@ -114,8 +113,8 @@ class HomePageContent extends StatelessWidget {
                         ),
                         Expanded(
                             child: Container(
-                              height: 0,
-                            )),
+                          height: 0,
+                        )),
                         const ProfileOverlay(),
                         const SizedBox(
                           width: PresentationConstants.defaultPadding,

diff --git a/lib/presentation/pages/splash/cubit/splash_cubit.dart b/lib/presentation/pages/splash/cubit/splash_cubit.dart
@@ -28,15 +28,17 @@ class SplashCubit extends Cubit<SplashState> {
       if (difference < _splashDuration) {
         await Future.delayed(_splashDuration - difference);
       }
-
+      emit(state.copyWith(
+        isSplashInitialized: true,
+      ));
       _openHomePage();
     } catch (e, stack) {
       print('error: $e, $stack');
     }
   }
 
   void _openHomePage() async {
-    emit(state.copyWith(openHomePage: true));
-    emit(state.copyWith(openHomePage: false));
+    emit(state.copyWith(openTheNextPage: true));
+    emit(state.copyWith(openTheNextPage: false));
   }
 }
diff --git a/lib/presentation/pages/splash/cubit/splash_state.dart b/lib/presentation/pages/splash/cubit/splash_state.dart
@@ -3,24 +3,29 @@ part of 'splash_cubit.dart';
 class SplashState with EquatableMixin {
   const SplashState({
     this.isLoading = false,
-    this.openHomePage = false,
+    this.openTheNextPage = false,
+    this.isSplashInitialized = false,
   });
 
   final bool isLoading;
-  final bool openHomePage;
+  final bool openTheNextPage;
+  final bool isSplashInitialized;
 
   SplashState copyWith({
     bool? isLoading,
-    bool? openHomePage,
+    bool? openTheNextPage,
+    bool? isSplashInitialized,
   }) =>
       SplashState(
         isLoading: isLoading ?? this.isLoading,
-        openHomePage: openHomePage ?? this.openHomePage,
+        openTheNextPage: openTheNextPage ?? this.openTheNextPage,
+        isSplashInitialized: isSplashInitialized ?? this.isSplashInitialized,
       );
 
   @override
   List<Object> get props => [
         isLoading,
-        openHomePage,
+        openTheNextPage,
+        isSplashInitialized,
       ];
 }
diff --git a/lib/presentation/pages/splash/splash_page.dart b/lib/presentation/pages/splash/splash_page.dart
@@ -1,32 +1,19 @@
-import 'package:flappy_dash/domain/repositories/game_repository.dart';
-import 'package:flappy_dash/service_locator.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 
 import 'cubit/splash_cubit.dart';
 
-class SplashPage extends StatelessWidget {
-  const SplashPage({super.key});
+class SplashPage extends StatefulWidget {
+  const SplashPage({super.key, this.redirectTo});
 
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (_) => SplashCubit(getIt.get<GameRepository>()),
-      child: const SplashPageContent(),
-    );
-  }
-}
-
-class SplashPageContent extends StatefulWidget {
-  const SplashPageContent({super.key});
+  final String? redirectTo;
 
   @override
-  State<SplashPageContent> createState() => _SplashPageContentState();
+  State<SplashPage> createState() => _SplashPageState();
 }
 
-class _SplashPageContentState extends State<SplashPageContent> {
-
+class _SplashPageState extends State<SplashPage> {
   @override
   void initState() {
     context.read<SplashCubit>().onPageOpen();
@@ -37,8 +24,12 @@ class _SplashPageContentState extends State<SplashPageContent> {
   Widget build(BuildContext context) {
     return BlocConsumer<SplashCubit, SplashState>(
       listener: (context, state) {
-        if (state.openHomePage) {
-          GoRouter.of(context).replace('/');
+        if (state.openTheNextPage) {
+          if (widget.redirectTo != null) {
+            GoRouter.of(context).replace(widget.redirectTo!);
+          } else {
+            GoRouter.of(context).replace('/');
+          }
         }
       },
       builder: (context, state) {
@@ -59,7 +50,7 @@ class _SplashPageContentState extends State<SplashPageContent> {
                       Text(
                         'Flappy Dash',
                         style:
-                        TextStyle(fontSize: 28, color: Color(0xFF25165F)),
+                            TextStyle(fontSize: 28, color: Color(0xFF25165F)),
                       ),
                     ],
                   ),