Merge branch 'hot_fix' into 'diplomatic-quarter-live'

hot fixes

See merge request Cloud_Solution/diplomatic-quarter!199

lib/pages/MyAppointments/widgets/AppointmentCardView.dart

@@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/pages/MyAppointments/models/AppointmentType
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_countdown_timer/countdown_timer_controller.dart';
 import 'package:flutter_countdown_timer/current_remaining_time.dart';
 import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
 import 'package:provider/provider.dart';
@@ -23,6 +24,16 @@ class AppointmentCard extends StatefulWidget {
 }
 
 class _ApointmentCardState extends State<AppointmentCard> {
+
+  CountdownTimerController controller;
+
+  @override
+  void initState() {
+    super.initState();
+    int endTime = DateTime.now().millisecondsSinceEpoch + 1000 * 30;
+    controller = CountdownTimerController(endTime: endTime,);
+  }
+
   @override
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
@@ -126,9 +137,7 @@ class _ApointmentCardState extends State<AppointmentCard> {
                                 AppointmentType.CONFIRMED)
                         ? Container(
                             child: CountdownTimer(
-                              endTime: DateTime.now().millisecondsSinceEpoch +
+                              controller: controller,
-                                  (widget.appo.remaniningHoursTocanPay * 1000) *
-                                      60,
                               widgetBuilder: (_, CurrentRemainingTime time) {
                                 return Text(
                                     '${time.days}:${time.hours}:${time.min}:${time.sec} ' +

lib/pages/ToDoList/ToDo.dart

@@ -22,6 +22,7 @@ import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_countdown_timer/countdown_timer_controller.dart';
 import 'package:flutter_countdown_timer/current_remaining_time.dart';
 import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -52,6 +53,7 @@ class _ToDoState extends State<ToDo> {
   List<ImagesInfo> imagesInfo = List();
 
   ToDoCountProviderModel toDoProvider;
+  CountdownTimerController controller;
 
   @override
   void initState() {
@@ -65,6 +67,8 @@ class _ToDoState extends State<ToDo> {
             'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/en/0.png',
         imageAr:
             'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/ar/0.png'));
+    int endTime = DateTime.now().millisecondsSinceEpoch + 1000 * 30;
+    controller = CountdownTimerController(endTime: endTime,);
   }
 
   @override
@@ -229,12 +233,7 @@ class _ToDoState extends State<ToDo> {
                                         ),
                                         Container(
                                           child: CountdownTimer(
-                                            endTime: DateTime.now()
+                                           controller: controller,
-                                                    .millisecondsSinceEpoch +
-                                                (widget.appoList[index]
-                                                            .remaniningHoursTocanPay *
-                                                        1000) *
-                                                    60,
                                             widgetBuilder:
                                                 (_, CurrentRemainingTime time) {
                                               return Text(