Pushing before updating API Structure

lib/api/marathon/marathon_api_client.dart

@@ -1,14 +1,19 @@
 import 'dart:convert';
 
+import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:logger/logger.dart' as L;
 import 'package:mohem_flutter_app/api/api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/models/marathon/marathon_generic_model.dart';
 import 'package:mohem_flutter_app/models/marathon/marathon_model.dart';
 import 'package:mohem_flutter_app/models/marathon/question_model.dart';
 import 'package:mohem_flutter_app/models/marathon/winner_model.dart';
+import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
+import 'package:provider/provider.dart';
 import 'package:signalr_netcore/hub_connection.dart';
 
 class MarathonApiClient {
@@ -41,6 +46,17 @@ class MarathonApiClient {
     }
   }
 
+
+  //  Future<GenericResponseModel?> getGetMenuEntries() async {
+  //     String url = "${ApiConsts.erpRest}GET_MENU_ENTRIES";
+  //     Map<String, dynamic> postParams = {"P_SELECTED_RESP_ID": -999, "P_MENU_TYPE": "E"};
+  //     postParams.addAll(AppState().postParamsJson);
+  //     return await ApiClient().postJsonForObject((json) {
+  //       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+  //       return responseData;
+  //     }, url, postParams);
+  //   }
+
   Future<String> getProjectId() async {
     Response response = await ApiClient().postJsonForResponse(ApiConsts.marathonProjectGetUrl, <String, dynamic>{}, token: AppState().getMarathonToken ?? await getMarathonToken());
 
@@ -123,12 +139,53 @@ class MarathonApiClient {
 
     var json = jsonDecode(response.body);
 
-
     logger.i("json in NextQuestion: $json");
-    var data = json["data"];
+    MarathonGenericModel marathonModel = MarathonGenericModel.fromJson(json);
+
+    if (marathonModel.statusCode == 404) {
+      Utils.confirmDialog(
+        AppRoutes.navigatorKey.currentContext,
+        marathonModel.message!,
+        onTap: () {
+          AppRoutes.navigatorKey.currentContext!.read<MarathonProvider>().resetValues();
+          Navigator.of(
+            AppRoutes.navigatorKey.currentContext!,
+          ).popUntil(ModalRoute.withName(AppRoutes.dashboard));
+        },
+      );
+      return null;
+    }
 
-    if (data != null) {
-      QuestionModel newQuestion = QuestionModel.fromJson(data);
+    if (marathonModel.statusCode == 208) {
+      Utils.confirmDialog(
+        AppRoutes.navigatorKey.currentContext,
+        marathonModel.message!,
+        onTap: () {
+          AppRoutes.navigatorKey.currentContext!.read<MarathonProvider>().resetValues();
+          Navigator.of(
+            AppRoutes.navigatorKey.currentContext!,
+          ).popUntil(ModalRoute.withName(AppRoutes.dashboard));
+        },
+      );
+      return null;
+    }
+
+    if (marathonModel.statusCode == 204) {
+      Utils.confirmDialog(
+        AppRoutes.navigatorKey.currentContext,
+        marathonModel.message!,
+        onTap: () {
+          AppRoutes.navigatorKey.currentContext!.read<MarathonProvider>().resetValues();
+          Navigator.of(
+            AppRoutes.navigatorKey.currentContext!,
+          ).popUntil(ModalRoute.withName(AppRoutes.dashboard));
+        },
+      );
+      return null;
+    }
+
+    if (marathonModel.data != null && marathonModel.isSuccessful == true) {
+      QuestionModel newQuestion = QuestionModel.fromJson(marathonModel.data);
       return newQuestion;
     } else {
       return null;

lib/classes/utils.dart

@@ -113,7 +113,7 @@ class Utils {
       if (!AppState().isAuthenticated) {
         showDialog(
           context: cxt,
-          builder: (cxt) => ConfirmDialog(
+          builder: (BuildContext cxt) => ConfirmDialog(
             message: errorMessage,
             onTap: () {
               Navigator.pushNamedAndRemoveUntil(cxt, AppRoutes.login, (Route<dynamic> route) => false);
@@ -130,11 +130,22 @@ class Utils {
     }
   }
 
-  static void confirmDialog(cxt, String message) {
+  static Future showErrorDialog({required BuildContext context, required VoidCallback onOkTapped, required String message}) async {
+    return showDialog(
+      context: context,
+      builder: (BuildContext context) => ConfirmDialog(
+        message: message,
+        onTap: onOkTapped,
+      ),
+    );
+  }
+
+  static void confirmDialog(cxt, String message, {VoidCallback? onTap}) {
     showDialog(
       context: cxt,
-      builder: (cxt) => ConfirmDialog(
+      builder: (BuildContext cxt) => ConfirmDialog(
         message: message,
+        onTap: onTap,
       ),
     );
   }
@@ -317,13 +328,13 @@ class Utils {
     if (!Platform.isIOS) {
       await showCupertinoModalPopup(
         context: context,
-        builder: (cxt) => Container(
+        builder: (BuildContext cxt) => Container(
           height: 250,
           color: Colors.white,
           child: CupertinoDatePicker(
             backgroundColor: Colors.white,
             mode: CupertinoDatePickerMode.date,
-            onDateTimeChanged: (value) {
+            onDateTimeChanged: (DateTime value) {
               if (value != null && value != selectedDate) {
                 selectedDate = value;
               }
@@ -343,7 +354,7 @@ class Utils {
 
   static void readNFc({required Function(String) onRead}) {
     NfcManager.instance.startSession(onDiscovered: (NfcTag tag) async {
-      var f;
+      MifareUltralight f;
       if (Platform.isAndroid) {
         f = MifareUltralight(tag: tag, identifier: tag.data["nfca"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
       } else {

lib/ui/marathon/marathon_provider.dart

@@ -31,7 +31,6 @@ class MarathonProvider extends ChangeNotifier {
   String? selectedOptionId;
   int? totalQualifiers;
 
-  //TODO:  THIS BUG NEEDS TO BE FIXED. NOT DONE YET
   String? gapTimeImage;
   String? gapTimeText;
   int? gapTimeType;
@@ -173,7 +172,7 @@ class MarathonProvider extends ChangeNotifier {
     timerForQuestion = Timer.periodic(
       oneSec,
       (Timer timer) async {
-        // This 2 is just to show the color of answer tile for 2 seconds and then update card status
+        // This 2 is just to show the color of answer tile for 1 and then update card status
         if (totalCurrentQuestionTime - currentGapTime == 1) {
           getCorrectAnswerAndUpdateAnswerColor();
         }
@@ -366,6 +365,8 @@ class MarathonProvider extends ChangeNotifier {
     }
   }
 
+  void resetProgressColorValues() {}
+
   void resetValues() async {
     _currentQuestionNumber = 0;
     cardContentList.clear();
@@ -378,9 +379,14 @@ class MarathonProvider extends ChangeNotifier {
     totalCurrentQuestionTime = 0;
     sponsorsSecondsCounter = 0;
     totalSponsorVideoSeconds = 0;
-    totalSecondsToWaitForMarathon = 20;
+    totalSecondsToWaitForMarathon = 0;
     currentGapTime = 0;
     currentQuestion = QuestionModel();
+    if (answerStatusesList.isNotEmpty) {
+      for (int i = 0; i < answerStatusesList.length; i++) {
+        answerStatusesList[i] = QuestionCardStatus.question;
+      }
+    }
     notifyListeners();
   }
 

lib/ui/marathon/marathon_screen.dart

@@ -123,7 +123,7 @@ class MarathonScreen extends StatelessWidget {
                   width: 150,
                   fit: BoxFit.contain,
                   errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
-                    return const Center();
+                    return Image.asset("assets/images/logos/main_mohemm_logo.png", height: 50, width: 150);
                   },
                 )
               ],

lib/ui/marathon/widgets/marathon_banner.dart

@@ -357,8 +357,7 @@ class MarathonBanner extends StatelessWidget {
                   ],
                 ).onPress(() async {
                     int remainingTimeInMinutes = DateTime.parse(provider.marathonDetailModel.startTime!).difference(DateTime.now()).inMinutes;
-
-                    if (remainingTimeInMinutes > 2) {
+                    if (remainingTimeInMinutes > 2 && provider.marathonDetailModel.sponsors != null && provider.marathonDetailModel.sponsors!.isNotEmpty) {
                       Utils.showLoading(context);
                       try {
                         await provider.initializeVideoPlayer().then((_) {

lib/ui/marathon/widgets/marathon_details_card.dart

@@ -36,9 +36,9 @@ class MarathonDetailsCard extends StatelessWidget {
                   )
                 ],
               ),
-              if (provider.marathonDetailModel.sponsors != null) ...<Widget>[
+              if (provider.marathonDetailModel.sponsors != null && provider.marathonDetailModel.sponsors!.isNotEmpty) ...<Widget>[
                 5.height,
-                provider.marathonDetailModel.sponsors?.first.sponsorPrizes != null
+                provider.marathonDetailModel.sponsors!.first.sponsorPrizes != null
                     ? Row(
                         children: <Widget>[
                           "${LocaleKeys.prize.tr()} ".toText16(color: MyColors.grey77Color, isBold: true),
@@ -64,7 +64,7 @@ class MarathonDetailsCard extends StatelessWidget {
                       width: 150,
                       fit: BoxFit.contain,
                       errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
-                        return const Center();
+                        return Image.asset("assets/images/logos/main_mohemm_logo.png", height: 50, width: 150);
                       },
                     )
                   ],

lib/ui/marathon/widgets/question_card.dart

@@ -126,7 +126,11 @@ class AnswerContent extends StatelessWidget {
                 return AnswerTileForText(
                   index: index,
                   onAnswerTapped: () {
+                    if (provider.totalCurrentQuestionTime - provider.currentGapTime <= 1) {
+                      null;
+                    } else {
                       provider.updateCurrentQuestionOptionStatus(QuestionsOptionStatus.selected, index);
+                    }
                   },
                 );
               },