Merge branch 'master' into development_haroon

lib/extensions/string_extensions.dart

@@ -23,11 +23,11 @@ extension TrimString on String {
 }
 
 String displayLocalizedContent({required bool isPhoneLangArabic,required int selectedLanguage,required String englishContent,required String arabicContent}) {
-  if (selectedLanguage == 0) {
+  if (selectedLanguage == 1) {
     return englishContent;
-  } else if (selectedLanguage == 1) {
-    return arabicContent;
   } else if (selectedLanguage == 2) {
+    return arabicContent;
+  } else if (selectedLanguage == 3) {
     return isPhoneLangArabic ? arabicContent : englishContent;
   }
   return englishContent;

lib/ui/marathon/marathon_provider.dart

@@ -298,10 +298,12 @@ class MarathonProvider extends ChangeNotifier {
 
   void updateLanguageAsPerMarathon(BuildContext context, MarathonDetailModel detailModel) {
     savedLocale = context.locale;
-    if (detailModel.selectedLanguage == 0) {
+    if (detailModel.selectedLanguage == 1) {
       context.setLocale(const Locale("en", "US"));
-    } else if (detailModel.selectedLanguage == 1) {
+    } else if (detailModel.selectedLanguage == 2) {
       context.setLocale(const Locale("ar", "SA"));
+    } else {
+      context.setLocale(const Locale("en", "US"));
     }
   }
 

lib/ui/marathon/widgets/marathon_banner.dart

@@ -434,7 +434,12 @@ class MarathonBanner extends StatelessWidget {
                                       ),
                                       Flexible(
                                         child: Text(
-                                          (AppState().isArabic(context) ? provider.marathonDetailModel.titleAr ?? "" : provider.marathonDetailModel.titleEn ?? "").trimString(isTablet ? 25 : 15),
+                                          displayLocalizedContent(
+                                            isPhoneLangArabic: AppState().isArabic(context),
+                                            selectedLanguage: provider.marathonDetailModel.selectedLanguage ?? 0,
+                                            englishContent: provider.marathonDetailModel.titleEn ?? "",
+                                            arabicContent: provider.marathonDetailModel.titleAr ?? "",
+                                          ),
                                           overflow: TextOverflow.ellipsis,
                                           style: TextStyle(
                                             fontStyle: FontStyle.italic,