fixed guest login and navigator errors

swciitg · Sep 14, 2023 · 4781549 · 4781549
1 parent a928dbf
commit 4781549
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 46 deletions.
diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:onestop_dev/globals/size_config.dart';
+import 'package:onestop_dev/pages/login/welcome.dart';
 import 'package:onestop_dev/widgets/login/login_webview.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
@@ -15,7 +16,7 @@ class LoginPage extends StatefulWidget {
 }
 
 class _LoginPageState extends State<LoginPage> {
-  // bool loading = false;
+  bool loading = false;
   final Completer<WebViewController> _controller =
       Completer<WebViewController>();
 
@@ -30,15 +31,14 @@ class _LoginPageState extends State<LoginPage> {
     SizeConfig().init(context);
     return Scaffold(
         body:
-        //  loading
-            // ?
+         loading
+            ?
              SafeArea(child: LoginWebView(controller: _controller))
-            // : WelcomePage(setLoading: () {
-            //     setState(() {
-            //       loading = true;
-            //     });
-            //   })
-
-              );
+            : WelcomePage(setLoading: () {
+                setState(() {
+                  loading = true;
+                });
+              }
+              ));
   }
 }
diff --git a/lib/pages/login/splash.dart b/lib/pages/login/splash.dart
@@ -20,34 +20,24 @@ class _SplashPageState extends State<SplashPage> {
   @override
   void initState() {
     super.initState();
+    LoginStore()
+        .isAlreadyAuthenticated()
+        .then((result) {
+      if (result == SplashResponse.authenticated && LoginStore.isProfileComplete){
+        Navigator.of(context).pushNamedAndRemoveUntil(HomePage.id, (Route<dynamic> route) => false);
+      }
+      else if(result == SplashResponse.blocked){
+        Navigator.of(context).pushNamedAndRemoveUntil(BlockedPage.id, (Route<dynamic> route) => false);
+      }
+      else {
+        Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.id, (Route<dynamic> route) => false);
+      }
+    });
   }
 
+
   @override
   Widget build(BuildContext context) {
-    return  FutureBuilder<SplashResponse>(
-        future: LoginStore().isAlreadyAuthenticated(),
-          builder: (context, snapshot){
-          if(snapshot.hasData)
-            {
-              SplashResponse result = snapshot.data!;
-              if (result == SplashResponse.authenticated && LoginStore.isProfileComplete){
-                return const HomePage();
-              } else if(result == SplashResponse.blocked){
-                return const BlockedPage();
-              }else{
-                return const LoginPage();
-              }
-            }
-          else if(snapshot.hasError)
-            {
-              return const Scaffold();
-            }
-          else
-            {
-              //Waiting State
-              return Scaffold(
-              );
-            }
-      });
+    return const Scaffold();
   }
 }
diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart
@@ -7,9 +7,9 @@ import '../../globals/size_config.dart';
 
 class WelcomePage extends StatelessWidget {
   static String id = "/login2";
-  // final Function setLoading;
+  final Function setLoading;
   const WelcomePage({Key? key, 
-  // required this.setLoading
+  required this.setLoading
   }) : super(key: key);
 
   @override
@@ -38,7 +38,7 @@ class WelcomePage extends StatelessWidget {
                 padding: EdgeInsets.symmetric(
                     horizontal: MySpaces.horizontalScreenPadding
                     ),
-                child: const LoginButton(),
+                child:  LoginButton(setLoading: setLoading,),
               ),
             ),
           ],

diff --git a/lib/routes.dart b/lib/routes.dart
@@ -41,6 +41,5 @@ final routes = {
   Scoreboard.id: (context) => const Scoreboard(),
   Upsp.id: (context) => const Upsp(),
   GuestHouse.id: (context) => const GuestHouse(),
-  WelcomePage.id:(context)=> const WelcomePage(),
   ComplaintsPage.id:(context)=> const ComplaintsPage()
 };
diff --git a/lib/widgets/login/login_button.dart b/lib/widgets/login/login_button.dart
@@ -9,10 +9,10 @@ import 'package:provider/provider.dart';
 class LoginButton extends StatelessWidget {
   const LoginButton({
     Key? key,
-    // required this.setLoading,
+    required this.setLoading,
   }) : super(key: key);
 
-  // final Function setLoading;
+  final Function setLoading;
 
   @override
   Widget build(BuildContext context) {
@@ -32,10 +32,10 @@ class LoginButton extends StatelessWidget {
                 shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(18))),
             onPressed: () {
-              // setLoading();
-              Navigator.of(context).pushNamed(
-                '/login',
-              );
+              setLoading();
+              // Navigator.of(context).pushNamed(
+              //   '/login',
+              // );
             },
             child: FittedBox(
               fit: BoxFit.fitWidth,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.1.1+44
+version: 2.1.2+45
 
 environment:
   sdk: ">=2.17.0 <3.0.0"