fix navigator issues

lib/core/service/NavigationService.dart

@@ -15,4 +15,12 @@ class NavigationService {
   Future<dynamic> pushNamedAndRemoveUntil(String routeName) {
     return navigatorKey.currentState.pushNamedAndRemoveUntil(routeName,(asd)=>false);
   }
+
+  Future<dynamic> pushAndRemoveUntil(Route newRoute) {
+    return navigatorKey.currentState.pushAndRemoveUntil(newRoute,(asd)=>false);
+  }
+
+   pop() {
+    return navigatorKey.currentState.pop();
+  }
 }

lib/models/doctor/profile_req_Model.dart

@@ -29,6 +29,7 @@ class ProfileReqModel {
       this.languageID,
       this.stamp = '2020-04-26T09:32:18.317Z',
       this.iPAdress='11.11.11.11',
+      // this.versionID=5.5,
       this.channel=9,
       this.sessionID='E2bsEeYEJo',
       this.tokenID,

lib/util/helpers.dart

@@ -2,6 +2,7 @@ import 'package:connectivity/connectivity.dart';
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart';
+import 'package:doctor_app_flutter/core/service/NavigationService.dart';
 import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart';
@@ -17,6 +18,7 @@ import 'package:html/parser.dart';
 
 import '../UpdatePage.dart';
 import '../config/size_config.dart';
+import '../locator.dart';
 import '../util/dr_app_toast_msg.dart';
 import 'dr_app_shared_pref.dart';
 
@@ -188,16 +190,26 @@ class Helpers {
   }
 
   navigateToUpdatePage(String message, String androidLink, iosLink) {
-    Navigator.pushAndRemoveUntil(
-        AppGlobal.CONTEX,
-        FadePage(
-          page: UpdatePage(
-            message: message,
-            androidLink: androidLink,
-            iosLink: iosLink,
-          ),
+    locator<NavigationService>().pushAndRemoveUntil(
+      FadePage(
+        page: UpdatePage(
+          message: message,
+          androidLink: androidLink,
+          iosLink: iosLink,
         ),
-        (r) => false);
+      ),
+    );
+
+    // Navigator.pushAndRemoveUntil(
+    //     AppGlobal.CONTEX,
+    //     FadePage(
+    //       page: UpdatePage(
+    //         message: message,
+    //         androidLink: androidLink,
+    //         iosLink: iosLink,
+    //       ),
+    //     ),
+    //     (r) => false);
   }
 
   static String parseHtmlString(String htmlString) {
@@ -277,7 +289,13 @@ class Helpers {
     String twoDigitSeconds = twoDigits(duration.inSeconds.remainder(60));
     return "$twoDigitMinutes:$twoDigitSeconds";
   }
-  static double getTextFieldHeight(){
-    return SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ?10:SizeConfig.isHeightShort?8:6);
+
+  static double getTextFieldHeight() {
+    return SizeConfig.heightMultiplier *
+        (SizeConfig.isHeightVeryShort
+            ? 10
+            : SizeConfig.isHeightShort
+                ? 8
+                : 6);
   }
 }

lib/widgets/shared/loader/gif_loader_dialog_utils.dart

@@ -9,6 +9,7 @@ class GifLoaderDialogUtils {
   }
 
   static hideDialog(BuildContext context) {
+    if(Navigator.canPop(context))
     Navigator.of(context).pop();
   }
 }