bfix: Fix navigation issues.

Signed-off-by: BURG3R5 <77491630+BURG3R5@users.noreply.github.com>

Author: BURG3R5

lib/data/constants/routes.dart

@@ -1,11 +1,11 @@
 /// Constant strings representing the names of the routes for easy refactoring.
 class AppRoutes {
   // Pre-Auth
-  static const String login = '/login';
-  static const String signUp = '/signup';
-  static const String onboarding = '/onboarding';
-  static const String verify = '/verify';
+  static const String login = 'login';
+  static const String signUp = 'signup';
+  static const String onboarding = 'onboarding';
+  static const String verify = 'verify';
 
   // Post-Auth
-  static const String home = '/home';
+  static const String home = 'home';
 }

lib/presentation/core/main_app.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
@@ -28,7 +29,7 @@ class Codephile extends StatelessWidget {
             );
           },
           debugShowCheckedModeBanner: false,
-          initialRoute: AppRoutes.onboarding,
+          initialRoute: _getInitialRoute(),
           navigatorObservers: <NavigatorObserver>[
             SentryNavigatorObserver(),
             AppNavigationObserver(),
@@ -46,6 +47,19 @@ class Codephile extends StatelessWidget {
     ImageService.init();
     StorageService.init();
 
+    Future.delayed(const Duration(seconds: 1), FlutterNativeSplash.remove);
+
     return const Codephile();
   }
+
+  String _getInitialRoute() {
+    if (StorageService.newUser) {
+      return AppRoutes.onboarding;
+    } else if (StorageService.user != null &&
+        StorageService.authToken != null) {
+      return AppRoutes.home;
+    } else {
+      return AppRoutes.login;
+    }
+  }
 }

lib/presentation/onboarding/decide_next_screen.dart

@@ -1,18 +1,14 @@
-import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:get/get.dart';
 
 import '../../data/constants/routes.dart';
 import '../../data/services/local/storage_service.dart';
 
 Future<void> decideNextScreen() async {
-  await Future.delayed(const Duration(seconds: 1));
   if (!StorageService.newUser) {
     if (StorageService.user != null && StorageService.authToken != null) {
       Get.offNamed(AppRoutes.home);
     } else {
       Get.offNamed(AppRoutes.login);
     }
   }
-  await Future.delayed(const Duration(seconds: 1));
-  FlutterNativeSplash.remove();
 }

lib/presentation/onboarding/onboarding_screen.dart

@@ -1,15 +1,13 @@
 import 'package:card_swiper/card_swiper.dart';
 import 'package:flutter/material.dart';
 
-import 'decide_next_screen.dart';
 import 'widgets/onboarding_widgets.dart';
 
 /// The onboarding screen widget.
 class OnboardingScreen extends StatelessWidget {
   /// The onboarding screen widget.
   OnboardingScreen({Key? key}) : super(key: key) {
     _controller = SwiperController();
-    decideNextScreen();
   }
 
   /// Internal controller for the [Swiper] widget.