diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart
index b8a8d95..87c6b31 100644
--- a/lib/ui/landing/dashboard_screen.dart
+++ b/lib/ui/landing/dashboard_screen.dart
@@ -1,25 +1,21 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
+import 'dart:ui' as ui;
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:mohem_flutter_app/api/dashboard_api_client.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/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
-import 'package:mohem_flutter_app/main.dart';
 import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
-import 'package:mohem_flutter_app/ui/landing/itg/its_add_screen_video_image.dart';
 import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart';
 import 'package:mohem_flutter_app/ui/landing/widget/menus_widget.dart';
 import 'package:mohem_flutter_app/ui/landing/widget/services_widget.dart';
@@ -237,11 +233,14 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                                                   crossAxisAlignment: CrossAxisAlignment.start,
                                                                   children: [
                                                                     9.height,
-                                                                    CountdownTimer(
-                                                                      endTime: model.endTime,
-                                                                      onEnd: null,
-                                                                      endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
-                                                                      textStyle: const TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
+                                                                    Directionality(
+                                                                      textDirection: ui.TextDirection.ltr,
+                                                                      child: CountdownTimer(
+                                                                        endTime: model.endTime,
+                                                                        onEnd: null,
+                                                                        endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
+                                                                        textStyle: const TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
+                                                                      ),
                                                                     ),
                                                                     LocaleKeys.timeLeftToday.tr().toText12(color: Colors.white),
                                                                     9.height,
diff --git a/lib/ui/landing/today_attendance_screen2.dart b/lib/ui/landing/today_attendance_screen2.dart
index ada652c..f0228eb 100644
--- a/lib/ui/landing/today_attendance_screen2.dart
+++ b/lib/ui/landing/today_attendance_screen2.dart
@@ -99,10 +99,13 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen2> {
                                                 child: CountdownTimer(
                                                   endTime: model.endTime,
                                                   widgetBuilder: (context, v) {
-                                                    return AutoSizeText(
-                                                      getValue(v?.hours) + " : " + getValue(v?.min) + " : " + getValue(v?.sec),
-                                                      maxLines: 1,
-                                                      style: const TextStyle(color: Colors.white, fontSize: 42, letterSpacing: -1.92, fontWeight: FontWeight.bold, height: 1),
+                                                    return Directionality(
+                                                      textDirection: TextDirection.ltr,
+                                                      child: AutoSizeText(
+                                                        getValue(v?.hours) + " : " + getValue(v?.min) + " : " + getValue(v?.sec),
+                                                        maxLines: 1,
+                                                        style: const TextStyle(color: Colors.white, fontSize: 42, letterSpacing: -1.92, fontWeight: FontWeight.bold, height: 1),
+                                                      ),
                                                     );
                                                   },
                                                   onEnd: null,
@@ -116,7 +119,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen2> {
                                                   mainAxisAlignment: MainAxisAlignment.center,
                                                   crossAxisAlignment: CrossAxisAlignment.center,
                                                   children: [
-                                                    LocaleKeys.shiftTime.tr().tr().toTextAuto(color: MyColors.greyACColor, fontSize: 18, maxLine: 1).paddingOnly(left: 21,right: 21),
+                                                    LocaleKeys.shiftTime.tr().tr().toTextAuto(color: MyColors.greyACColor, fontSize: 18, maxLine: 1).paddingOnly(left: 21, right: 21),
                                                     (model.attendanceTracking!.pShtName ?? "00:00:00").toString().toTextAuto(color: Colors.white, isBold: true, fontSize: 26, maxLine: 1),
                                                   ],
                                                 ),
diff --git a/lib/ui/marathon/widgets/countdown_timer.dart b/lib/ui/marathon/widgets/countdown_timer.dart
index bb8da6d..4296bc5 100644
--- a/lib/ui/marathon/widgets/countdown_timer.dart
+++ b/lib/ui/marathon/widgets/countdown_timer.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:ui' as ui;
 
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -53,80 +54,83 @@ class BuildCountdownTimer extends StatelessWidget {
   );
 
   Widget buildEmptyWidget() {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: <Widget>[
-        Column(
-          children: <Widget>[
-            // todo @faiz: Make a separate method and pass string , so we can minimize code replication
-            AutoSizeText(
-              "00",
-              maxFontSize: 24,
-              minFontSize: 20,
-              style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-            ),
-            AutoSizeText(
-              LocaleKeys.days.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-        buildSeparator(),
-        Column(
-          children: <Widget>[
-            AutoSizeText(
-              "00",
-              maxFontSize: 24,
-              minFontSize: 20,
-              style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-            ),
-            AutoSizeText(
-              LocaleKeys.hours.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-        buildSeparator(),
-        Column(
-          children: <Widget>[
-            AutoSizeText(
-              "00",
-              maxFontSize: 24,
-              minFontSize: 20,
-              style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-            ),
-            AutoSizeText(
-              LocaleKeys.minutes.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-        buildSeparator(),
-        Column(
-          children: <Widget>[
-            AutoSizeText(
-              "00",
-              maxFontSize: 24,
-              minFontSize: 20,
-              style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-            ),
-            AutoSizeText(
-              LocaleKeys.seconds.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-      ],
+    return Directionality(
+      textDirection: ui.TextDirection.ltr,
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Column(
+            children: <Widget>[
+              // todo @faiz: Make a separate method and pass string , so we can minimize code replication
+              AutoSizeText(
+                "00",
+                maxFontSize: 24,
+                minFontSize: 20,
+                style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+              ),
+              AutoSizeText(
+                LocaleKeys.days.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+          buildSeparator(),
+          Column(
+            children: <Widget>[
+              AutoSizeText(
+                "00",
+                maxFontSize: 24,
+                minFontSize: 20,
+                style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+              ),
+              AutoSizeText(
+                LocaleKeys.hours.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+          buildSeparator(),
+          Column(
+            children: <Widget>[
+              AutoSizeText(
+                "00",
+                maxFontSize: 24,
+                minFontSize: 20,
+                style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+              ),
+              AutoSizeText(
+                LocaleKeys.minutes.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+          buildSeparator(),
+          Column(
+            children: <Widget>[
+              AutoSizeText(
+                "00",
+                maxFontSize: 24,
+                minFontSize: 20,
+                style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+              ),
+              AutoSizeText(
+                LocaleKeys.seconds.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+        ],
+      ),
     );
   }
 
@@ -149,108 +153,111 @@ class BuildCountdownTimer extends StatelessWidget {
 
       return buildEmptyWidget();
     }
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: <Widget>[
-        Column(
-          children: <Widget>[
-            // todo @faiz: Make a separate method and pass value and string , so we can minimize code replication
-            time.days == null
-                ? AutoSizeText(
-                    "00",
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  )
-                : AutoSizeText(
-                    time.days! < 10 ? "0${time.days.toString()}" : time.days.toString(),
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  ),
-            AutoSizeText(
-              LocaleKeys.days.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-        buildSeparator(),
-        Column(
-          children: <Widget>[
-            time.hours == null
-                ? AutoSizeText(
-                    "00",
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  )
-                : AutoSizeText(
-                    time.hours! < 10 ? "0${time.hours.toString()}" : time.hours.toString(),
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  ),
-            AutoSizeText(
-              LocaleKeys.hours.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-        buildSeparator(),
-        Column(
-          children: <Widget>[
-            time.min == null
-                ? AutoSizeText(
-                    "00",
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  )
-                : AutoSizeText(
-                    time.min! < 10 ? "0${time.min.toString()}" : time.min.toString(),
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  ),
-            AutoSizeText(
-              LocaleKeys.minutes.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-        buildSeparator(),
-        Column(
-          children: <Widget>[
-            time.sec == null
-                ? AutoSizeText(
-                    "00",
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  )
-                : AutoSizeText(
-                    time.sec! < 10 ? "0${time.sec.toString()}" : time.sec.toString(),
-                    maxFontSize: 24,
-                    minFontSize: 20,
-                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                  ),
-            AutoSizeText(
-              LocaleKeys.seconds.tr(),
-              minFontSize: 7,
-              maxFontSize: 8,
-              style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
-            ),
-          ],
-        ),
-      ],
+    return Directionality(
+      textDirection: ui.TextDirection.ltr,
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Column(
+            children: <Widget>[
+              // todo @faiz: Make a separate method and pass value and string , so we can minimize code replication
+              time.days == null
+                  ? AutoSizeText(
+                      "00",
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    )
+                  : AutoSizeText(
+                      time.days! < 10 ? "0${time.days.toString()}" : time.days.toString(),
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    ),
+              AutoSizeText(
+                LocaleKeys.days.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+          buildSeparator(),
+          Column(
+            children: <Widget>[
+              time.hours == null
+                  ? AutoSizeText(
+                      "00",
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    )
+                  : AutoSizeText(
+                      time.hours! < 10 ? "0${time.hours.toString()}" : time.hours.toString(),
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    ),
+              AutoSizeText(
+                LocaleKeys.hours.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+          buildSeparator(),
+          Column(
+            children: <Widget>[
+              time.min == null
+                  ? AutoSizeText(
+                      "00",
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    )
+                  : AutoSizeText(
+                      time.min! < 10 ? "0${time.min.toString()}" : time.min.toString(),
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    ),
+              AutoSizeText(
+                LocaleKeys.minutes.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+          buildSeparator(),
+          Column(
+            children: <Widget>[
+              time.sec == null
+                  ? AutoSizeText(
+                      "00",
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    )
+                  : AutoSizeText(
+                      time.sec! < 10 ? "0${time.sec.toString()}" : time.sec.toString(),
+                      maxFontSize: 24,
+                      minFontSize: 20,
+                      style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
+                    ),
+              AutoSizeText(
+                LocaleKeys.seconds.tr(),
+                minFontSize: 7,
+                maxFontSize: 8,
+                style: screenFlag == 0 ? styleTextHome : styleTextMarathon,
+              ),
+            ],
+          ),
+        ],
+      ),
     );
   }