Merge branch 'faiz_cs' into 'master'

Added Language Support

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

lib/extensions/string_extensions.dart

@@ -22,6 +22,17 @@ extension TrimString on String {
   }
 }
 
+String displayLocalizedContent({required bool isPhoneLangArabic,required int selectedLanguage,required String englishContent,required String arabicContent}) {
+  if (selectedLanguage == 0) {
+    return englishContent;
+  } else if (selectedLanguage == 1) {
+    return arabicContent;
+  } else if (selectedLanguage == 2) {
+    return isPhoneLangArabic ? arabicContent : englishContent;
+  }
+  return englishContent;
+}
+
 extension EmailValidator on String {
   Widget get toWidget => Text(this);
 

lib/ui/marathon/marathon_intro_screen.dart

@@ -17,7 +17,18 @@ class MarathonIntroScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     MarathonProvider provider = context.watch<MarathonProvider>();
     return Scaffold(
-      appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr()),
+      appBar: AppBarWidget(
+        context,
+        title: LocaleKeys.brainMarathon.tr(),
+        onHomeTapped: () {
+          Navigator.pop(context);
+          context.setLocale(provider.savedLocale);
+        },
+        onBackTapped: () {
+          Navigator.pop(context);
+          context.setLocale(provider.savedLocale);
+        },
+      ),
       body: Column(
         children: <Widget>[
           ListView(

lib/ui/marathon/marathon_provider.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'dart:developer';
 
 import 'package:appinio_swiper/appinio_swiper.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/marathon/demo_marathon_repo.dart';
@@ -32,7 +32,7 @@ class MarathonProvider extends ChangeNotifier {
   int? selectedOptionIndex;
   String? selectedOptionId;
   int? totalQualifiers;
-
+  Locale savedLocale = const Locale("en", "US");
   String? gapTimeImage;
   String? gapTimeText;
   int? gapTimeType;
@@ -135,7 +135,6 @@ class MarathonProvider extends ChangeNotifier {
   late VideoPlayerController videoController;
 
   Future<void> initializeVideoPlayer() async {
-    log("VIDEO PLAYER INITIALIZED!!!");
     videoController = VideoPlayerController.network(ApiConsts.marathonBaseUrlServices + marathonDetailModel.sponsors!.first.video!);
     await videoController.initialize();
     await videoController.play();
@@ -297,6 +296,15 @@ class MarathonProvider extends ChangeNotifier {
 
   //************************************************ FUNCTIONS **********************************************************
 
+  void updateLanguageAsPerMarathon(BuildContext context, MarathonDetailModel detailModel) {
+    savedLocale = context.locale;
+    if (detailModel.selectedLanguage == 0) {
+      context.setLocale(const Locale("en", "US"));
+    } else if (detailModel.selectedLanguage == 1) {
+      context.setLocale(const Locale("ar", "SA"));
+    }
+  }
+
   Future<bool> callSubmitOptionApi() async {
     return await MarathonApiClient().submitSelectedOption(marathonId: marathonDetailModel.id!, questionId: currentQuestion.id, selectedAnswerId: selectedOptionId);
   }
@@ -512,6 +520,7 @@ class MarathonProvider extends ChangeNotifier {
         answerStatusesList[i] = QuestionCardStatus.question;
       }
     }
+    AppRoutes.navigatorKey.currentContext!.setLocale(savedLocale);
     notifyListeners();
   }
 

lib/ui/marathon/marathon_screen.dart

@@ -78,7 +78,12 @@ class MarathonScreen extends StatelessWidget {
                   16.height,
                   Column(
                     children: <Widget>[
-                      (AppState().isArabic(context) ? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr : AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn)!.toText22(
+                      displayLocalizedContent(
+                        isPhoneLangArabic: AppState().isArabic(context),
+                        selectedLanguage: provider.demoMarathonDetailModel.selectedLanguage!,
+                        arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr!,
+                        englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn!,
+                      ).toText22(
                         color: MyColors.grey3AColor,
                         isCentered: true,
                       ),
@@ -92,7 +97,12 @@ class MarathonScreen extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: <Widget>[
                         "${LocaleKeys.sponsoredBy.tr()} ".toText14(color: MyColors.grey77Color),
-                        (AppState().isArabic(context) ? provider.demoMarathonDetailModel.sponsors!.first.nameAr ?? "" : provider.demoMarathonDetailModel.sponsors!.first.nameEn ?? "").toText14(
+                        displayLocalizedContent(
+                          isPhoneLangArabic: AppState().isArabic(context),
+                          selectedLanguage: provider.demoMarathonDetailModel.selectedLanguage!,
+                          englishContent: provider.demoMarathonDetailModel.sponsors!.first.nameEn!,
+                          arabicContent: provider.demoMarathonDetailModel.sponsors!.first.nameAr!,
+                        ).toText14(
                           color: MyColors.darkTextColor,
                           isBold: true,
                         ),
@@ -160,7 +170,12 @@ class MarathonScreen extends StatelessWidget {
                         provider.iAmWinner
                             ? Column(
                                 children: <Widget>[
-                                  (AppState().isArabic(context) ? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr : AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn)!.toText22(
+                                  displayLocalizedContent(
+                                    isPhoneLangArabic: AppState().isArabic(context),
+                                    selectedLanguage: provider.marathonDetailModel.selectedLanguage ?? 0,
+                                    arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "",
+                                    englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
+                                  ).toText22(
                                     color: MyColors.grey3AColor,
                                     isCentered: true,
                                   ),
@@ -173,7 +188,12 @@ class MarathonScreen extends StatelessWidget {
                           provider.selectedWinners!.length == 1
                               ? Column(
                                   children: <Widget>[
-                                    (AppState().isArabic(context) ? provider.selectedWinners![0].nameEn : provider.selectedWinners![0].nameEn)!.toText24(
+                                    displayLocalizedContent(
+                                      isPhoneLangArabic: AppState().isArabic(context),
+                                      selectedLanguage: provider.marathonDetailModel.selectedLanguage ?? 0,
+                                      arabicContent: provider.selectedWinners![0].nameAr ?? "",
+                                      englishContent: provider.selectedWinners![0].nameEn ?? "",
+                                    ).toText24(
                                       color: MyColors.grey3AColor,
                                       isCentered: true,
                                     ),
@@ -191,10 +211,15 @@ class MarathonScreen extends StatelessWidget {
                                     return Column(
                                       crossAxisAlignment: CrossAxisAlignment.start,
                                       children: <Widget>[
-                                        (AppState().isArabic(context) ? provider.selectedWinners![index].nameEn : provider.selectedWinners![index].nameEn)!.toText16(
+                                        displayLocalizedContent(
+                                          isPhoneLangArabic: AppState().isArabic(context),
+                                          selectedLanguage: provider.marathonDetailModel.selectedLanguage ?? 0,
+                                          arabicContent: provider.selectedWinners![index].nameAr ?? "",
+                                          englishContent: provider.selectedWinners![index].nameEn ?? "",
+                                        ).toText16(
                                           color: MyColors.grey3AColor,
                                         ),
-                                        provider.selectedWinners!.first.employeeId!.toText16(color: MyColors.grey57Color),
+                                        provider.selectedWinners![index].employeeId!.toText16(color: MyColors.grey57Color),
                                       ],
                                     );
                                   },
@@ -206,7 +231,12 @@ class MarathonScreen extends StatelessWidget {
                             mainAxisAlignment: MainAxisAlignment.center,
                             children: <Widget>[
                               "${LocaleKeys.sponsoredBy.tr()} ".toText14(color: MyColors.grey77Color),
-                              (AppState().isArabic(context) ? provider.marathonDetailModel.sponsors!.first.nameAr ?? "" : provider.marathonDetailModel.sponsors!.first.nameEn ?? "").toText14(
+                              displayLocalizedContent(
+                                isPhoneLangArabic: AppState().isArabic(context),
+                                selectedLanguage: provider.marathonDetailModel.selectedLanguage!,
+                                arabicContent: provider.marathonDetailModel.sponsors!.first.nameAr ?? "",
+                                englishContent: provider.marathonDetailModel.sponsors!.first.nameEn ?? "",
+                              ).toText14(
                                 color: MyColors.darkTextColor,
                                 isBold: true,
                               ),
@@ -231,7 +261,7 @@ class MarathonScreen extends StatelessWidget {
     );
   }
 
-  Widget getNameContainer(BuildContext context) {
+  Widget getNameContainer(BuildContext context, MarathonProvider provider) {
     return Container(
       height: 50,
       padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -243,8 +273,12 @@ class MarathonScreen extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget>[
-          (AppState().isArabic(context) ? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr! : AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn!)
+          displayLocalizedContent(
-              .toText17(isBold: true, color: MyColors.white),
+            isPhoneLangArabic: AppState().isArabic(context),
+            selectedLanguage: (!AppState().getIsDemoMarathon ? provider.marathonDetailModel.selectedLanguage : provider.demoMarathonDetailModel.selectedLanguage) ?? 0,
+            arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "",
+            englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
+          ).toText17(isBold: true, color: MyColors.white),
           AppState().memberInformationList!.eMPLOYEENUMBER!.toText17(isBold: true, color: MyColors.white),
         ],
       ),
@@ -310,7 +344,7 @@ class MarathonScreen extends StatelessWidget {
                   MarathonProgressContainer(provider: provider).paddingOnly(left: 21, right: 21),
                 ],
                 if (provider.questionCardStatus == QuestionCardStatus.findingWinner && !provider.isUserOutOfGame) ...<Widget>[
-                  getNameContainer(context),
+                  getNameContainer(context, provider),
                 ],
                 QuestionCardBuilder(
                   onQuestion: (BuildContext context) => const QuestionCard(),

lib/ui/marathon/widgets/marathon_banner.dart

@@ -525,10 +525,7 @@ class MarathonBanner extends StatelessWidget {
                   ],
                 ).onPress(() async {
                   int remainingTimeInMinutes = DateTime.parse(provider.marathonDetailModel.startTime!).difference(DateTime.now()).inMinutes;
-
                   if (remainingTimeInMinutes > 5 && provider.marathonDetailModel.sponsors != null && provider.marathonDetailModel.sponsors!.isNotEmpty) {
-                    log("IF CALLED!!!");
-                    log("Remaining Time: $remainingTimeInMinutes");
                     Utils.showLoading(context);
                     try {
                       await provider.initializeVideoPlayer().then((_) {
@@ -537,20 +534,16 @@ class MarathonBanner extends StatelessWidget {
                         Navigator.pushNamed(context, AppRoutes.marathonSponsorVideoScreen);
                       });
                     } catch (e) { 
-                      // if (kDebugMode) {
+                      if (kDebugMode) {
                         log("Error in VideoPlayer: ${e.toString()}");
-                      // }
+                      }
                       Utils.hideLoading(context);
-                      Navigator.pushNamed(context, AppRoutes.marathonIntroScreen).then((value) {
+                      Navigator.pushNamed(context, AppRoutes.marathonIntroScreen);
-                        print("Back to home!!!");
-                      });
                     }
                   } else {
-                    log("ELSE CALLED!!!");
+                    Navigator.pushNamed(context, AppRoutes.marathonIntroScreen);
-                    Navigator.pushNamed(context, AppRoutes.marathonIntroScreen).then((value) {
-                      print("Back to home!!!");
-                    });
                   }
+                  provider.updateLanguageAsPerMarathon(context, provider.isUpComingMarathon ? provider.marathonDetailModel : provider.demoMarathonDetailModel);
                 }),
               )
             : getNoUpcomingMarathonWidget(context);

lib/ui/marathon/widgets/marathon_details_card.dart

@@ -39,11 +39,23 @@ class MarathonDetailsCard extends StatelessWidget {
                 ),
           7.height,
           LocaleKeys.contestTopicAbout.tr().toText16(color: MyColors.grey77Color),
-          "${AppState().isArabic(context) ? marathonDetailModel.titleAr : marathonDetailModel.titleEn}".toText20(color: MyColors.textMixColor, isBold: true),
+          displayLocalizedContent(
+            isPhoneLangArabic: AppState().isArabic(context),
+            selectedLanguage: marathonDetailModel.selectedLanguage ?? 0,
+            englishContent: marathonDetailModel.titleEn ?? "",
+            arabicContent: marathonDetailModel.titleAr ?? "",
+          ).toText20(color: MyColors.textMixColor, isBold: true),
           Row(
             children: <Widget>[
               Flexible(
-                child: "${AppState().isArabic(context) ? marathonDetailModel.descAr : marathonDetailModel.descEn}".toText14(color: MyColors.grey77Color),
+                child: displayLocalizedContent(
+                  isPhoneLangArabic: AppState().isArabic(context),
+                  selectedLanguage: marathonDetailModel.selectedLanguage ?? 0,
+                  englishContent: marathonDetailModel.descEn ?? "",
+                  arabicContent: marathonDetailModel.descAr ?? "",
+                ).toText14(
+                  color: MyColors.grey77Color,
+                ),
               )
             ],
           ),
@@ -57,18 +69,22 @@ class MarathonDetailsCard extends StatelessWidget {
                         child: SizedBox(
                           height: 30,
                           child: ListView.builder(
-                              scrollDirection: Axis.horizontal,
+                            scrollDirection: Axis.horizontal,
-                              shrinkWrap: true,
+                            shrinkWrap: true,
-                              itemCount: marathonDetailModel.sponsors!.first.sponsorPrizes!.length,
+                            itemCount: marathonDetailModel.sponsors!.first.sponsorPrizes!.length,
-                              itemBuilder: (BuildContext context, int index) {
+                            itemBuilder: (BuildContext context, int index) {
-                                SponsorPrizes prizes = marathonDetailModel.sponsors!.first.sponsorPrizes![index];
+                              SponsorPrizes prizes = marathonDetailModel.sponsors!.first.sponsorPrizes![index];
-                                return Container(
+                              return Container(
-                                  decoration: BoxDecoration(color: MyColors.backgroundColor, borderRadius: BorderRadius.circular(100), border: Border.all(color: MyColors.grey57Color.withOpacity(0.1))),
+                                decoration: BoxDecoration(color: MyColors.backgroundColor, borderRadius: BorderRadius.circular(100), border: Border.all(color: MyColors.grey57Color.withOpacity(0.1))),
-                                  child: "${AppState().isArabic(context) ? prizes.marathonPrizeAr : prizes.marathonPrizeEn}"
+                                child: displayLocalizedContent(
-                                      .toText16(color: MyColors.greenColor, isBold: true)
+                                  isPhoneLangArabic: AppState().isArabic(context),
-                                      .paddingOnly(left: 5, right: 5),
+                                  selectedLanguage: marathonDetailModel.selectedLanguage ?? 0,
-                                ).paddingOnly(left: 5);
+                                  englishContent: prizes.marathonPrizeEn ?? "",
-                              }),
+                                  arabicContent: prizes.marathonPrizeAr ?? "",
+                                ).toText16(color: MyColors.greenColor, isBold: true).paddingOnly(left: 5, right: 5),
+                              ).paddingOnly(left: 5);
+                            },
+                          ),
                         ),
                       )
                     ],
@@ -77,7 +93,12 @@ class MarathonDetailsCard extends StatelessWidget {
             Row(
               children: <Widget>[
                 "${LocaleKeys.sponsoredBy.tr()} ".toText16(color: MyColors.grey77Color),
-                "${AppState().isArabic(context) ? marathonDetailModel.sponsors?.first.nameAr : marathonDetailModel.sponsors?.first.nameEn}".toText16(color: MyColors.darkTextColor, isBold: true),
+                displayLocalizedContent(
+                  isPhoneLangArabic: AppState().isArabic(context),
+                  selectedLanguage: marathonDetailModel.selectedLanguage ?? 0,
+                  englishContent: marathonDetailModel.sponsors?.first.nameEn ?? "",
+                  arabicContent: marathonDetailModel.sponsors?.first.nameAr ?? "",
+                ).toText16(color: MyColors.darkTextColor, isBold: true),
               ],
             ),
             10.height,

lib/ui/marathon/widgets/marathon_header.dart

@@ -3,8 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/classes/colors.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';
-import 'package:provider/provider.dart';
 
 class MarathonHeader extends StatelessWidget {
   const MarathonHeader({Key? key}) : super(key: key);

lib/ui/marathon/widgets/question_card.dart

@@ -85,7 +85,12 @@ class CardContent extends StatelessWidget {
               child: Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 13, vertical: 15),
                 child: Text(
-                  AppState().isArabic(context) ? "${provider.currentQuestion.titleAr}" ?? "" : provider.currentQuestion.titleEn ?? "",
+                  displayLocalizedContent(
+                    isPhoneLangArabic: AppState().isArabic(context),
+                    selectedLanguage: (AppState().getIsDemoMarathon ? provider.demoMarathonDetailModel.selectedLanguage : provider.marathonDetailModel.selectedLanguage) ?? 0,
+                    englishContent: provider.currentQuestion.titleEn ?? "",
+                    arabicContent: provider.currentQuestion.titleAr ?? "",
+                  ),
                   style: const TextStyle(
                     color: MyColors.white,
                     fontSize: 16,
@@ -170,9 +175,12 @@ class AnswerTileForText extends StatelessWidget {
         alignment: Alignment.centerLeft,
         decoration: MyDecorations.getAnswersContainerColor(provider.currentQuestion.questionOptions![index].optionStatus!),
         child: Center(
-          child: (AppState().isArabic(context) ? provider.currentQuestion.questionOptions![index].titleAr! : provider.currentQuestion.questionOptions![index].titleEn!)
+          child: displayLocalizedContent(
-              .toText16(color: provider.isUserOutOfGame ? MyColors.darkTextColor : getAnswerTextColor(provider.currentQuestion.questionOptions![index].optionStatus!))
+            isPhoneLangArabic: AppState().isArabic(context),
-              .paddingOnly(top: 13, bottom: 13),
+            selectedLanguage: (AppState().getIsDemoMarathon ? provider.demoMarathonDetailModel.selectedLanguage : provider.marathonDetailModel.selectedLanguage) ?? 0,
+            englishContent: provider.currentQuestion.questionOptions![index].titleEn ?? "",
+            arabicContent: provider.currentQuestion.questionOptions![index].titleAr ?? "",
+          ).toText16(color: provider.isUserOutOfGame ? MyColors.darkTextColor : getAnswerTextColor(provider.currentQuestion.questionOptions![index].optionStatus!)).paddingOnly(top: 13, bottom: 13),
         ),
       ),
     );