Merge branch 'faiz_cs' into 'master'

Pushing for testing

See merge request Cloud_Solution/mohemm-flutter-app!104

lib/api/marathon/marathon_api_client.dart

@@ -97,6 +97,7 @@ class MarathonApiClient {
 
     if (marathonModel.statusCode == 208) {
       // means participant is already in the marathon i.e already joined
+      //TODO:  NEED TO LOOK UPON THIS
       return marathonModel.data["remainingTime"];
     }
 
@@ -116,13 +117,13 @@ class MarathonApiClient {
     Map<String, String?> jsonObject = <String, String?>{
       "previousQuestionId": questionId,
       "marathonId": marathonId,
-    }; 
+    };
 
     Response response = await ApiClient().postJsonForResponse(ApiConsts.marathonNextQuestionUrl, jsonObject, token: AppState().getMarathonToken ?? await getMarathonToken());
 
     var json = jsonDecode(response.body);
 
-    
+
     logger.i("json in NextQuestion: $json");
     var data = json["data"];
 

lib/classes/consts.dart

@@ -2,9 +2,9 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
-  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
-  static String baseUrl = "https://hmgwebservices.com"; // Live server
+  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+  // static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
@@ -28,6 +28,7 @@ class ApiConsts {
 
   //Brain Marathon Constants
   static String marathonBaseUrl = "https://marathoon.com/service/api/";
+  static String marathonBaseUrlServices = "https://marathoon.com/service/";
   static String marathonParticipantLoginUrl = marathonBaseUrl + "auth/participantlogin";
   static String marathonProjectGetUrl = marathonBaseUrl + "Project/Project_Get";
   static String marathonUpcomingUrl = marathonBaseUrl + "marathon/upcoming/";

lib/ui/marathon/marathon_provider.dart

@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/marathon/marathon_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_model.dart';
@@ -30,6 +31,11 @@ class MarathonProvider extends ChangeNotifier {
   String? selectedOptionId;
   int? totalQualifiers;
 
+  //TODO:  THIS BUG NEEDS TO BE FIXED. NOT DONE YET
+  String? gapTimeImage;
+  String? gapTimeText;
+  int? gapTimeType;
+
   bool iAmWinner = false;
   bool isPrivilegedWithMarathon = false;
 
@@ -99,8 +105,7 @@ class MarathonProvider extends ChangeNotifier {
   late VideoPlayerController videoController;
 
   Future<void> initializeVideoPlayer() async {
-    // videoController = VideoPlayerController.network(marathonDetailModel.sponsors!.first.video!)..initialize();
+    videoController = VideoPlayerController.network(ApiConsts.marathonBaseUrlServices + marathonDetailModel.sponsors!.first.video!);
-    videoController = VideoPlayerController.network("http://clips.vorwaerts-gmbh.de/VfE_html5.mp4");
     await videoController.initialize();
     await videoController.play();
     await videoController.setVolume(1.0);
@@ -178,16 +183,21 @@ class MarathonProvider extends ChangeNotifier {
 
           updateCardStatusToAnswer();
 
-          await callSubmitOptionApi().then((bool value) async {
+          scheduleMicrotask(() async {
-            if (value) {
+            await callSubmitOptionApi().then((bool value) async {
-              await callNextQuestionApi();
+              if (value) {
-            }
+                await callNextQuestionApi();
+              }
+            });
           });
         }
 
         if (totalCurrentQuestionTime == 0) {
+          gapTimeImage = currentQuestion.gapImage;
+          gapTimeText = currentQuestion.gapText;
+          gapTimeType = currentQuestion.gapType;
           updateCardData();
-          if (currentQuestionNumber == marathonDetailModel.totalQuestions! ) {
+          if (currentQuestionNumber - 1 == marathonDetailModel.totalQuestions!) {
             callGetQualifiersApi();
             updateQuestionCardStatus(QuestionCardStatus.findingWinner);
             timer.cancel();
@@ -254,13 +264,14 @@ class MarathonProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  // TODO: here I need to add a logic where I should call this function for Api but for the 1st question it should behave differently
-  // TODO: Verify the callings!!!
   Future<void> callNextQuestionApi() async {
     if (currentQuestionNumber < marathonDetailModel.totalQuestions!) {
       if (currentQuestionNumber == 0) {
         Utils.showLoading(AppRoutes.navigatorKey.currentContext!);
         currentQuestion = (await MarathonApiClient().getNextQuestion(questionId: null, marathonId: marathonDetailModel.id!))!;
+        gapTimeImage = currentQuestion.gapImage;
+        gapTimeText = currentQuestion.gapText;
+        gapTimeType = currentQuestion.gapType;
         if (Utils.isLoading) {
           Utils.hideLoading(AppRoutes.navigatorKey.currentContext!);
         }
@@ -281,6 +292,7 @@ class MarathonProvider extends ChangeNotifier {
     }
     selectedOptionIndex = null;
     currentQuestionNumber++;
+
     cardContentList.add(const CardContent());
     totalCurrentQuestionTime = currentQuestion.questionTime! + currentQuestion.nextQuestGap!;
     currentGapTime = currentQuestion.nextQuestGap!;
@@ -291,7 +303,7 @@ class MarathonProvider extends ChangeNotifier {
 
   void populateQuestionStatusesList() {
     if (marathonDetailModel.totalQuestions != null) {
-      for (int i = 0; i < marathonDetailModel.totalQuestions! - 1; i++) {
+      for (int i = 0; i < marathonDetailModel.totalQuestions!; i++) {
         answerStatusesList.add(QuestionCardStatus.question);
       }
       notifyListeners();
@@ -420,9 +432,6 @@ class MarathonProvider extends ChangeNotifier {
         Navigator.pushReplacementNamed(context, AppRoutes.marathonWaitingScreen);
       }
     } catch (e) {
-      if (kDebugMode) {
-        print("error in onJoinMarathonPressed: ${e.toString()}");
-      }
       Utils.hideLoading(context);
       Utils.confirmDialog(context, e.toString());
     }

lib/ui/marathon/marathon_screen.dart

@@ -6,6 +6,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:lottie/lottie.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
+import 'package:mohem_flutter_app/classes/consts.dart';
 import 'package:mohem_flutter_app/classes/decorations_helper.dart';
 import 'package:mohem_flutter_app/classes/lottie_consts.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
@@ -21,6 +22,7 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_qualifiers_contai
 import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 import 'package:mohem_flutter_app/ui/marathon/widgets/question_card_builder.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
+import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart';
 import 'package:provider/provider.dart';
 
@@ -43,24 +45,13 @@ class MarathonScreen extends StatelessWidget {
     return Image.asset(MyLottieConsts.congratsGif, height: 200);
   }
 
-  // SizedBox(
-  //    height: 200,
-  //    child: Stack(
-  //      fit: StackFit.expand,
-  //      children: <Widget>[
-  //        Lottie.asset(MyLottieConsts.celebrate1Lottie, height: 200),
-  //        // Lottie.asset(MyLottieConsts.celebrate2Lottie, height: 200),
-  //      ],
-  //    ),
-  //  ),
-
   Widget getWinnerWidget(BuildContext context, {required MarathonProvider provider}) {
     return Container(
       width: double.infinity,
       decoration: MyDecorations.shadowDecoration,
       padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
       child: Stack(
-        children: [
+        children: <Widget>[
           Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
@@ -80,7 +71,7 @@ class MarathonScreen extends StatelessWidget {
                 ),
               ),
               16.height,
-              !provider.iAmWinner
+              provider.iAmWinner
                   ? Column(
                       children: <Widget>[
                         (AppState().isArabic(context) ? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr : AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn)!.toText22(
@@ -103,7 +94,7 @@ class MarathonScreen extends StatelessWidget {
                   itemBuilder: (BuildContext context, int index) {
                     return Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
+                      children: <Widget>[
                         (AppState().isArabic(context) ? provider.selectedWinners![index].nameEn : provider.selectedWinners![index].nameEn)!.toText16(
                           color: MyColors.grey3AColor,
                         ),
@@ -127,10 +118,10 @@ class MarathonScreen extends StatelessWidget {
                 ),
                 5.height,
                 Image.network(
-                  provider.marathonDetailModel.sponsors!.first.image!,
+                  ApiConsts.marathonBaseUrlServices + provider.marathonDetailModel.sponsors!.first.image!,
-                  height: 40,
+                  height: 50,
                   width: 150,
-                  fit: BoxFit.fill,
+                  fit: BoxFit.contain,
                   errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
                     return const Center();
                   },
@@ -207,57 +198,74 @@ class MarathonScreen extends StatelessWidget {
             }
           },
         ),
-        body: SingleChildScrollView(
+        body: Column(
-          child: Column(
+          children: <Widget>[
-            children: <Widget>[
+            ListView(
-              20.height,
+              children: [
-              if (provider.questionCardStatus == QuestionCardStatus.findingWinner) ...<Widget>[
+                20.height,
-                QualifiersContainer(provider: provider).paddingOnly(left: 21, right: 21),
+                if (provider.questionCardStatus == QuestionCardStatus.findingWinner) ...<Widget>[
-              ] else if (provider.questionCardStatus == QuestionCardStatus.winnerFound)
+                  QualifiersContainer(provider: provider).paddingOnly(left: 21, right: 21),
-                ...<Widget>[]
+                ] else if (provider.questionCardStatus == QuestionCardStatus.winnerFound)
-              else ...<Widget>[
+                  ...<Widget>[]
-                MarathonProgressContainer(provider: provider).paddingOnly(left: 21, right: 21),
+                else ...<Widget>[
-              ],
+                  MarathonProgressContainer(provider: provider).paddingOnly(left: 21, right: 21),
-              if (provider.questionCardStatus == QuestionCardStatus.findingWinner) ...<Widget>[
+                ],
-                getNameContainer(context),
+                if (provider.questionCardStatus == QuestionCardStatus.findingWinner) ...<Widget>[
+                  getNameContainer(context),
+                ],
+                QuestionCardBuilder(
+                  onQuestion: (BuildContext context) => const QuestionCard(),
+                  onCompleted: (BuildContext context) => CustomStatusWidget(
+                    asset: Lottie.asset(MyLottieConsts.allQuestions, height: 200),
+                    title: LocaleKeys.congrats.tr().toText22(color: MyColors.greenColor),
+                    subTitle: LocaleKeys.allQuestionsCorrect.toText18(color: MyColors.darkTextColor, isCentered: true),
+                  ),
+                  onCorrectAnswer: (BuildContext context) => CustomStatusWidget(
+                    asset: getSuccessWidget(gapType: provider.gapTimeType, gapImage: provider.gapTimeImage, gapText: provider.gapTimeText),
+                    title: LocaleKeys.congrats.tr().toText22(color: MyColors.greenColor),
+                    subTitle: LocaleKeys.yourAnswerCorrect.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
+                  ),
+                  onWinner: (BuildContext context) => getWinnerWidget(context, provider: provider),
+                  onWrongAnswer: (BuildContext context) => CustomStatusWidget(
+                    asset: Image.asset(MyLottieConsts.wrongAnswerGif, height: 200),
+                    title: LocaleKeys.oops.tr().toText22(color: MyColors.redColor),
+                    subTitle: LocaleKeys.wrongAnswer.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
+                  ),
+                  onSkippedAnswer: (BuildContext context) => CustomStatusWidget(
+                    asset: Image.asset(MyLottieConsts.wrongAnswerGif, height: 200),
+                    title: LocaleKeys.oops.tr().toText22(color: MyColors.redColor),
+                    subTitle: LocaleKeys.youMissedTheQuestion.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
+                  ),
+                  onFindingWinner: (BuildContext context) => CustomStatusWidget(
+                    asset: Lottie.asset(MyLottieConsts.winnerLottie, height: 168),
+                    title: LocaleKeys.fingersCrossed.tr().toText22(color: MyColors.greenColor),
+                    subTitle: LocaleKeys.winnerSelectedRandomly.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
+                  ),
+                  questionCardStatus: provider.questionCardStatus,
+                ).paddingOnly(top: 12, left: 21, right: 21),
               ],
-              QuestionCardBuilder(
+            ).expanded,
-                onQuestion: (BuildContext context) => const QuestionCard(),
+            provider.questionCardStatus == QuestionCardStatus.winnerFound
-                onCompleted: (BuildContext context) => CustomStatusWidget(
+                ? DefaultButton(LocaleKeys.ok.tr(), () {
-                  asset: Lottie.asset(MyLottieConsts.allQuestions, height: 200),
+                    provider.resetValues();
-                  title: LocaleKeys.congrats.tr().toText22(color: MyColors.greenColor),
+                    Navigator.of(context).popUntil(ModalRoute.withName(AppRoutes.dashboard));
-                  subTitle: LocaleKeys.allQuestionsCorrect.toText18(color: MyColors.darkTextColor, isCentered: true),
+                  }).insideContainer
-                ),
+                : const SizedBox()
-                onCorrectAnswer: (BuildContext context) => CustomStatusWidget(
+          ],
-                  asset: getSuccessWidget(gapType: provider.currentQuestion.gapType, gapImage: provider.currentQuestion.gapImage, gapText: provider.currentQuestion.gapText),
-                  title: LocaleKeys.congrats.tr().toText22(color: MyColors.greenColor),
-                  subTitle: LocaleKeys.yourAnswerCorrect.toText18(color: MyColors.darkTextColor, isCentered: true),
-                ),
-                onWinner: (BuildContext context) => getWinnerWidget(context, provider: provider),
-                onWrongAnswer: (BuildContext context) => CustomStatusWidget(
-                  asset: Image.asset(MyLottieConsts.wrongAnswerGif, height: 200),
-                  title: LocaleKeys.oops.tr().toText22(color: MyColors.redColor),
-                  subTitle: LocaleKeys.wrongAnswer.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
-                ),
-                onSkippedAnswer: (BuildContext context) => CustomStatusWidget(
-                  asset: Image.asset(MyLottieConsts.wrongAnswerGif, height: 200),
-                  title: LocaleKeys.oops.tr().toText22(color: MyColors.redColor),
-                  subTitle: LocaleKeys.youMissedTheQuestion.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
-                ),
-                onFindingWinner: (BuildContext context) => CustomStatusWidget(
-                  asset: Lottie.asset(MyLottieConsts.winnerLottie, height: 168),
-                  title: LocaleKeys.fingersCrossed.tr().toText22(color: MyColors.greenColor),
-                  subTitle: LocaleKeys.winnerSelectedRandomly.tr().toText18(color: MyColors.darkTextColor, isCentered: true),
-                ),
-                questionCardStatus: provider.questionCardStatus,
-              ).paddingOnly(top: 12, left: 21, right: 21),
-            ],
-          ),
         ),
       ),
       onWillPop: () {
-        provider.resetValues();
+        showDialog(
-        return Future<bool>.value(true);
+          context: context,
+          builder: (BuildContext context) => ConfirmDialog(
+            message: LocaleKeys.youWantToLeaveMarathon.tr(),
+            onTap: () {
+              provider.resetValues();
+              Navigator.of(context).popUntil(ModalRoute.withName(AppRoutes.dashboard));
+            },
+          ),
+        );
+        return Future<bool>.value(false);
       },
     );
   }

lib/ui/marathon/marathon_sponsor_video_screen.dart

@@ -15,9 +15,6 @@ import 'package:video_player/video_player.dart';
 class SponsorVideoScreen extends StatelessWidget {
   const SponsorVideoScreen({Key? key}) : super(key: key);
 
-  Future<void> onSponsorVideoClosed(BuildContext context) async {
-    Navigator.pop(context);
-  }
 
   @override
   Widget build(BuildContext context) {

lib/ui/marathon/widgets/marathon_details_card.dart

@@ -1,16 +1,14 @@
-
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
+import 'package:mohem_flutter_app/classes/consts.dart';
 import 'package:mohem_flutter_app/classes/decorations_helper.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
 
-
-
 class MarathonDetailsCard extends StatelessWidget {
   final MarathonProvider provider;
 
@@ -38,16 +36,16 @@ class MarathonDetailsCard extends StatelessWidget {
                   )
                 ],
               ),
-              if (provider.itsMarathonTime && provider.marathonDetailModel.sponsors != null) ...<Widget>[
+              if (provider.marathonDetailModel.sponsors != null) ...<Widget>[
                 5.height,
                 provider.marathonDetailModel.sponsors?.first.sponsorPrizes != null
                     ? Row(
-                  children: <Widget>[
+                        children: <Widget>[
-                    "${LocaleKeys.prize.tr()} ".toText16(color: MyColors.grey77Color, isBold: true),
+                          "${LocaleKeys.prize.tr()} ".toText16(color: MyColors.grey77Color, isBold: true),
-                    "${AppState().isArabic(context) ? provider.marathonDetailModel.sponsors?.first.sponsorPrizes?.first.marathonPrizeAr : provider.marathonDetailModel.sponsors?.first.sponsorPrizes?.first.marathonPrizeAr}"
+                          "${AppState().isArabic(context) ? provider.marathonDetailModel.sponsors?.first.sponsorPrizes?.first.marathonPrizeAr : provider.marathonDetailModel.sponsors?.first.sponsorPrizes?.first.marathonPrizeAr}"
-                        .toText16(color: MyColors.greenColor, isBold: true),
+                              .toText16(color: MyColors.greenColor, isBold: true),
-                  ],
+                        ],
-                )
+                      )
                     : const SizedBox(),
                 Row(
                   children: <Widget>[
@@ -61,10 +59,10 @@ class MarathonDetailsCard extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: <Widget>[
                     Image.network(
-                      provider.marathonDetailModel.sponsors!.first.image!,
+                      ApiConsts.marathonBaseUrlServices + provider.marathonDetailModel.sponsors!.first.image!,
-                      height: 40,
+                      height: 50,
                       width: 150,
-                      fit: BoxFit.fill,
+                      fit: BoxFit.contain,
                       errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
                         return const Center();
                       },
@@ -79,4 +77,3 @@ class MarathonDetailsCard extends StatelessWidget {
     );
   }
 }
-

lib/ui/marathon/widgets/marathon_footer.dart

@@ -47,20 +47,3 @@ class MarathonFooter extends StatelessWidget {
     ).insideContainer;
   }
 }
-
-//Container(
-//       color: Colors.white,
-//       child: Column(
-//         mainAxisSize: MainAxisSize.min,
-//         children: <Widget>[
-//           buildNoteForDemo(),
-//           DefaultButton(
-//             LocaleKeys.joinDemoMarathon.tr(),
-//                 () {
-//               provider.connectSignalrAndJoinMarathon(context);
-//             },
-//             color: MyColors.yellowColorII,
-//           ).insideContainer,
-//         ],
-//       ),
-//     );

lib/ui/marathon/widgets/marathon_progress_container.dart

@@ -43,7 +43,8 @@ class MarathonProgressContainer extends StatelessWidget {
           8.height,
           Row(
             children: <Widget>[
-              "${((provider.currentQuestionNumber / provider.marathonDetailModel.totalQuestions!) * 100).toInt()}% ${LocaleKeys.completed.tr()}".toText14(),
+              "${provider.currentQuestionNumber == 1 ? 0 : (((provider.currentQuestionNumber - 1) / provider.marathonDetailModel.totalQuestions!) * 100).toInt()}% ${LocaleKeys.completed.tr()}"
+                  .toText14(),
             ],
           ),
         ],
@@ -52,9 +53,6 @@ class MarathonProgressContainer extends StatelessWidget {
   }
 
   Color getStepColor(QuestionCardStatus status, bool isOutOfGame) {
-    if (isOutOfGame) {
-      return MyColors.redColor;
-    }
     switch (status) {
       case QuestionCardStatus.question:
         return MyColors.yellowColorII;
@@ -79,7 +77,7 @@ class MarathonProgressContainer extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget>[
-          for (int i = 0; i < totalQuestions - 1; i++)
+          for (int i = 0; i < totalQuestions; i++)
             if (value <= i)
               roundContainer(MyColors.lightGreyDeColor, i != 0)
             else

lib/ui/marathon/widgets/marathon_qualifiers_container.dart

@@ -43,6 +43,7 @@ class _QualifiersContainerState extends State<QualifiersContainer> {
           ),
           10.height,
           Row(
+             crossAxisAlignment: CrossAxisAlignment.end,
             children: <Widget>[
               widget.provider.totalQualifiers != null ? widget.provider.totalQualifiers.toString().toText30(color: MyColors.greenColor, isBold: true) : const SizedBox(),
               2.width,