From 8dc0529646375f3f442002714cc62b9564bd858f Mon Sep 17 00:00:00 2001
From: unknown <racuin.jr@gmail.com>
Date: Sat, 7 Oct 2023 21:30:44 +0800
Subject: [PATCH] fix try again button

---
 lib/bloc/user/user_event.dart                 |  6 +-
 .../offline/homepage/module_screen.dart       | 68 ++++++++++---------
 lib/screens/unit2/login/login.dart            |  9 ++-
 3 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/lib/bloc/user/user_event.dart b/lib/bloc/user/user_event.dart
index 6a4e2fb..20869b7 100644
--- a/lib/bloc/user/user_event.dart
+++ b/lib/bloc/user/user_event.dart
@@ -6,11 +6,11 @@ abstract class UserEvent extends Equatable {
 }
 
 class GetApkVersion extends UserEvent {
-  final String username;
-  final String password;
+  final String? username;
+  final String? password;
   GetApkVersion({required this.password, required this.username});
   @override
-  List<Object> get props => [username, password];
+  List<Object> get props => [];
 }
 
 class UserLogin extends UserEvent {
diff --git a/lib/screens/offline/homepage/module_screen.dart b/lib/screens/offline/homepage/module_screen.dart
index 1ea6868..3055108 100644
--- a/lib/screens/offline/homepage/module_screen.dart
+++ b/lib/screens/offline/homepage/module_screen.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_progress_hud/flutter_progress_hud.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:flutter_zoom_drawer/flutter_zoom_drawer.dart';
 import 'package:fluttericon/font_awesome5_icons.dart';
 import 'package:unit2/bloc/offline/offline_bloc/offline_bloc.dart';
@@ -28,37 +30,41 @@ class OfflineModuleScreen extends StatelessWidget {
             ),
           ),
         ),
-        body: BlocConsumer<OfflineBloc, OfflineState>(
-          listener: (context, state) {
-            // TODO: implement listener
-          },
-          builder: (context, state) {
-            if (state is OfflineModeState) {
-              return Padding(
-                padding: const EdgeInsets.all(24),
-                child: GridView.count(
-                    shrinkWrap: true,
-                    crossAxisCount: 4,
-                    crossAxisSpacing: 8,
-                    mainAxisSpacing: 10,
-                    physics: const BouncingScrollPhysics(),
-                    padding:
-                        const EdgeInsets.symmetric(vertical: 5, horizontal: 5),
-                    children: state.offlineModules
-                        .map((e) => CardLabel(
-                            icon: FontAwesome5.eye,
-                            title: "Field Surveyor",
-                            ontap: () {
-                              Navigator.push(context,
-                                  MaterialPageRoute(builder: ((context) {
-                                return PassoDashBoard();
-                              })));
-                            }))
-                        .toList()),
-              );
-            }
-            return Container();
-          },
+        body: ProgressHUD(
+          backgroundColor: Colors.black87,
+          indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
+          child: BlocConsumer<OfflineBloc, OfflineState>(
+            listener: (context, state) {
+              if (state is OfflineLoadingState) {}
+            },
+            builder: (context, state) {
+              if (state is OfflineModeState) {
+                return Padding(
+                  padding: const EdgeInsets.all(24),
+                  child: GridView.count(
+                      shrinkWrap: true,
+                      crossAxisCount: 4,
+                      crossAxisSpacing: 8,
+                      mainAxisSpacing: 10,
+                      physics: const BouncingScrollPhysics(),
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 5, horizontal: 5),
+                      children: state.offlineModules
+                          .map((e) => CardLabel(
+                              icon: FontAwesome5.eye,
+                              title: "Field Surveyor",
+                              ontap: () {
+                                Navigator.push(context,
+                                    MaterialPageRoute(builder: ((context) {
+                                  return PassoDashBoard();
+                                })));
+                              }))
+                          .toList()),
+                );
+              }
+              return Container();
+            },
+          ),
         ));
   }
 }
diff --git a/lib/screens/unit2/login/login.dart b/lib/screens/unit2/login/login.dart
index a54ffbb..d02695a 100644
--- a/lib/screens/unit2/login/login.dart
+++ b/lib/screens/unit2/login/login.dart
@@ -63,6 +63,7 @@ class _UniT2LoginState extends State<UniT2Login> {
           backgroundColor: Colors.black87,
           indicatorWidget: const SpinKitFadingCircle(color: Colors.white),
           child: BlocConsumer<UserBloc, UserState>(listener: (context, state) {
+            print(state);
             if (state is UserLoggedIn ||
                 state is UuidLoaded ||
                 state is LoginErrorState) {
@@ -372,7 +373,8 @@ class _UniT2LoginState extends State<UniT2Login> {
                 onpressed: () {
                   BlocProvider.of<UserBloc>(
                           NavigationService.navigatorKey.currentContext!)
-                      .add(LoadVersion(username: username, password: password));
+                      .add(GetApkVersion(
+                          username: username, password: password));
                   return MaterialPageRoute(builder: (_) {
                     return const UniT2Login();
                   });
@@ -388,7 +390,7 @@ class _UniT2LoginState extends State<UniT2Login> {
                     onpressed: () {
                       BlocProvider.of<UserBloc>(
                               NavigationService.navigatorKey.currentContext!)
-                          .add(LoadVersion(
+                          .add(GetApkVersion(
                               username: username, password: password));
                       return MaterialPageRoute(builder: (_) {
                         return const UniT2Login();
@@ -434,7 +436,8 @@ class _UniT2LoginState extends State<UniT2Login> {
                 onpressed: () {
                   BlocProvider.of<UserBloc>(
                           NavigationService.navigatorKey.currentContext!)
-                      .add(LoadVersion(username: username, password: password));
+                      .add(GetApkVersion(
+                          username: username, password: password));
                   return MaterialPageRoute(builder: (_) {
                     return const UniT2Login();
                   });