Removed GapTime for last question and some minor bugs fixed!

assets/langs/ar-SA.json

@@ -489,9 +489,11 @@
   "sponsoredBy": "برعاية:",
   "question": "سؤال",
   "marathoners": "الماراثون",
+  "marathoner": "ماراثونر",
   "prize": "جائزة:",
   "winnerSelection": "اختيار الفائز",
   "qualifiers": "تصفيات",
+  "qualifier": "المؤهل",
   "getReadyForContest": "استعد للمسابقة القادمة:",
   "winnerSelectedRandomly": "سيتم اختيار الفائز عشوائياً من بين التصفيات.",
   "fingersCrossed": "تشابك الاصابع!!!",

assets/langs/en-US.json

@@ -478,6 +478,7 @@
   "sponsoredBy": "Sponsored By:",
   "question": "Question",
   "marathoners": "Marathoners",
+  "marathoner": "Marathoner",
   "prize": "Prize:",
   "advancedSearch": "Advanced Search",
   "openNot": "Open Notifications",
@@ -492,6 +493,7 @@
   "none": "None",
   "winnerSelection": "Winner Selection",
   "qualifiers": "Qualifiers",
+  "qualifier": "Qualifier",
   "getReadyForContest": "Get Ready for the coming contest:",
   "winnerSelectedRandomly": "The winner will be selected randomly among the qualifiers.",
   "fingersCrossed": "Fingers Crossed!!!",

lib/api/marathon/marathon_api_client.dart

@@ -29,7 +29,6 @@ class MarathonApiClient {
       (json) {
         MarathonGenericModel marathonModel = MarathonGenericModel.fromJson(json);
         AppState().setMarathonToken = marathonModel.data["token"] ?? "";
-        print("marathonToken: ${"AppState(): ${AppState().getMarathonToken}"}");
         return marathonModel.data["token"] ?? "";
       },
       ApiConsts.marathonParticipantLoginUrl,

lib/generated/codegen_loader.g.dart

@@ -498,9 +498,11 @@ class CodegenLoader extends AssetLoader {
     "sponsoredBy": "برعاية:",
     "question": "سؤال",
     "marathoners": "الماراثون",
+    "marathoner": "ماراثونر",
     "prize": "جائزة:",
     "winnerSelection": "اختيار الفائز",
     "qualifiers": "تصفيات",
+    "qualifier": "المؤهل",
     "getReadyForContest": "استعد للمسابقة القادمة:",
     "winnerSelectedRandomly": "سيتم اختيار الفائز عشوائياً من بين التصفيات.",
     "fingersCrossed": "تشابك الاصابع!!!",
@@ -1000,6 +1002,7 @@ class CodegenLoader extends AssetLoader {
     "sponsoredBy": "Sponsored By:",
     "question": "Question",
     "marathoners": "Marathoners",
+    "marathoner": "Marathoner",
     "prize": "Prize:",
     "advancedSearch": "Advanced Search",
     "openNot": "Open Notifications",
@@ -1014,6 +1017,7 @@ class CodegenLoader extends AssetLoader {
     "none": "None",
     "winnerSelection": "Winner Selection",
     "qualifiers": "Qualifiers",
+    "qualifier": "Qualifier",
     "getReadyForContest": "Get Ready for the coming contest:",
     "winnerSelectedRandomly": "The winner will be selected randomly among the qualifiers.",
     "fingersCrossed": "Fingers Crossed!!!",

lib/generated/locale_keys.g.dart

@@ -475,9 +475,11 @@ abstract class  LocaleKeys {
   static const sponsoredBy = 'sponsoredBy';
   static const question = 'question';
   static const marathoners = 'marathoners';
+  static const marathoner = 'marathoner';
   static const prize = 'prize';
   static const winnerSelection = 'winnerSelection';
   static const qualifiers = 'qualifiers';
+  static const qualifier = 'qualifier';
   static const getReadyForContest = 'getReadyForContest';
   static const winnerSelectedRandomly = 'winnerSelectedRandomly';
   static const fingersCrossed = 'fingersCrossed';

lib/ui/marathon/marathon_provider.dart

@@ -136,6 +136,8 @@ class MarathonProvider extends ChangeNotifier {
     notifyListeners();
   }
 
+  // 9c47d281-c5b5-4b5d-a90a-08dacb8cbdb6
+  // MarathonI
   //****************TIMERS**********
 
   int sponsorsSecondsCounter = 0;
@@ -208,8 +210,6 @@ class MarathonProvider extends ChangeNotifier {
         }
 
         if (totalCurrentQuestionTime == currentGapTime) {
-          totalCurrentQuestionTime--;
-
           updateCardStatusToAnswer();
 
           scheduleMicrotask(() async {
@@ -222,20 +222,23 @@ class MarathonProvider extends ChangeNotifier {
               });
             }
           });
-        }
 
-        if (totalCurrentQuestionTime == 0) {
+          if (currentQuestionNumber  == marathonDetailModel.totalQuestions!) {
-          gapTimeImage = currentQuestion.gapImage;
-          gapTimeText = currentQuestion.gapText;
-          gapTimeType = currentQuestion.gapType;
-          updateCardData();
-          if (currentQuestionNumber - 1 == marathonDetailModel.totalQuestions!) {
             isGettingQualifiers = true;
             updateQuestionCardStatus(QuestionCardStatus.findingWinner);
             timer.cancel();
             cancelTimer();
             notifyListeners();
           }
+          totalCurrentQuestionTime--;
+        }
+
+        if (totalCurrentQuestionTime == 0) {
+          gapTimeImage = currentQuestion.gapImage;
+          gapTimeText = currentQuestion.gapText;
+          gapTimeType = currentQuestion.gapType;
+          updateCardData();
+
           return;
         } else {
           if (totalCurrentQuestionTime != currentGapTime) {

lib/ui/marathon/widgets/countdown_timer_detail_screen.dart

@@ -10,6 +10,7 @@ import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/main.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
+import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_banner.dart';
 
 class CountdownTimerForDetailScreen extends StatelessWidget {
   final int timeToMarathon;
@@ -192,7 +193,8 @@ class CountdownTimerForDetailScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return CountdownTimer(
-      endTime: timeToMarathon,
+      endTime: dummyTime,
+      // endTime: timeToMarathon,
       onEnd: null,
       widgetBuilder: (BuildContext context, CurrentRemainingTime? time) {
         return buildCountdownTimer(time);

lib/ui/marathon/widgets/marathon_progress_container.dart

@@ -31,7 +31,7 @@ class MarathonProgressContainer extends StatelessWidget {
                 padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 8),
                 child: "${provider.currentQuestionNumber.toString()} / ${provider.marathonDetailModel.totalQuestions.toString()}  ${LocaleKeys.question.tr()}".toText12(color: MyColors.white),
               ),
-              "${provider.totalMarathoners} ${LocaleKeys.marathoners.tr()}".toText14(),
+              "${provider.totalMarathoners} ${provider.totalMarathoners == 1 ? LocaleKeys.marathoner.tr() : LocaleKeys.marathoners.tr()}".toText14(),
               provider.questionCardStatus == QuestionCardStatus.question
                   ? "00:${(provider.totalCurrentQuestionTime - provider.currentGapTime) < 10 ? "0${provider.totalCurrentQuestionTime - provider.currentGapTime}" : provider.totalCurrentQuestionTime - provider.currentGapTime}"
                       .toText18(color: provider.totalCurrentQuestionTime - provider.currentGapTime < 5 ? MyColors.redColor : MyColors.black)
@@ -46,9 +46,7 @@ class MarathonProgressContainer extends StatelessWidget {
             children: <Widget>[
               "${provider.currentQuestionNumber == 1 ? 0 : (((provider.currentQuestionNumber - 1) / provider.marathonDetailModel.totalQuestions!) * 100).toInt()}% ${LocaleKeys.completed.tr()}"
                   .toText14(),
-              provider.isUserOutOfGame
+              provider.isUserOutOfGame ? LocaleKeys.youAreOutOfContest.tr().toText14(color: MyColors.redColor) : const SizedBox(),
-                  ? LocaleKeys.youAreOutOfContest.tr().toText14(color: MyColors.redColor)
-                  : const SizedBox(),
             ],
           ),
         ],
@@ -97,21 +95,28 @@ class MarathonProgressContainer extends StatelessWidget {
   Widget roundContainer(Color color, bool isNeedLeftBorder) {
     if (isNeedLeftBorder) {
       return Row(
-        children: [
+        children: <Widget>[
-          Divider(thickness: 6, color: color).expanded,
+          Divider(
+            thickness: 6,
+            color: color,
+          ).expanded,
           Container(
+            margin: EdgeInsets.zero,
+            padding: EdgeInsets.zero,
             width: 10,
             height: 10,
-            decoration: BoxDecoration(shape: BoxShape.circle, color: color),
+            decoration: BoxDecoration(shape: BoxShape.circle, color: color, border: Border.all(color: color, width: 2)),
           ),
         ],
       ).expanded;
     }
 
     return Container(
+      margin: EdgeInsets.zero,
+      padding: EdgeInsets.zero,
       width: 10,
       height: 10,
-      decoration: BoxDecoration(shape: BoxShape.circle, color: color),
+      decoration: BoxDecoration(shape: BoxShape.circle, color: color, border: Border.all(color: color, width: 2)),
     );
   }
 }

lib/ui/marathon/widgets/marathon_qualifiers_container.dart

@@ -57,7 +57,7 @@ class _QualifiersContainerState extends State<QualifiersContainer> {
                   children: <Widget>[
                     widget.provider.totalQualifiers != null ? widget.provider.totalQualifiers.toString().toText30(color: MyColors.greenColor, isBold: true) : const SizedBox(),
                     2.width,
-                    LocaleKeys.qualifiers.tr().toText16(color: MyColors.greenColor),
+                    (widget.provider.totalQualifiers == 1 ? LocaleKeys.qualifier.tr() : LocaleKeys.qualifiers.tr()).toText16(color: MyColors.greenColor),
                   ],
                 ),
         ],