Merge branch 'development_sikander' into 'master'

Development sikander

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

lib/ui/landing/dashboard_screen.dart

@@ -1,15 +1,13 @@
 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';
@@ -18,7 +16,6 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.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';
@@ -240,12 +237,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                                                   crossAxisAlignment: CrossAxisAlignment.start,
                                                                   children: [
                                                                     9.height,
-                                                                    CountdownTimer(
+                                                                    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,
                                                                     ClipRRect(

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(
+                                                    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),
                                                   ],
                                                 ),

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,7 +54,9 @@ class BuildCountdownTimer extends StatelessWidget {
   );
 
   Widget buildEmptyWidget() {
-    return Row(
+    return Directionality(
+      textDirection: ui.TextDirection.ltr,
+      child: Row(
         mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -127,6 +130,7 @@ class BuildCountdownTimer extends StatelessWidget {
             ],
           ),
         ],
+      ),
     );
   }
 
@@ -149,7 +153,9 @@ class BuildCountdownTimer extends StatelessWidget {
 
       return buildEmptyWidget();
     }
-    return Row(
+    return Directionality(
+      textDirection: ui.TextDirection.ltr,
+      child: Row(
         mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -251,6 +257,7 @@ class BuildCountdownTimer extends StatelessWidget {
             ],
           ),
         ],
+      ),
     );
   }