fix issues happend after merge

lib/config/size_config.dart

@@ -92,22 +92,6 @@ class SizeConfig {
     return widthMultiplier;
   }
 
-  static getTextMultiplierBasedOnWidth({double? width}) {
-    // TODO handel LandScape case
-    if (width != null) {
-      return width / 100;
-    }
-    return widthMultiplier;
-  }
-
-  static getWidthMultiplier({double? width}) {
-    // TODO handel LandScape case
-    if (width != null) {
-      return width / 100;
-    }
-    return widthMultiplier;
-  }
-
   static getHeightMultiplier({double? height}) {
     // TODO handel LandScape case
     if (height != null) {

lib/core/model/Prescriptions/prescription_report.dart

@@ -5,7 +5,7 @@ class PrescriptionReport {
   String? companyName;
   dynamic? days;
   String? doctorName;
-  var? doseDailyQuantity;
+  var doseDailyQuantity;
   String? frequency;
   dynamic? frequencyNumber;
   String? image;

lib/core/viewModel/authentication_view_model.dart

@@ -318,28 +318,27 @@ class AuthenticationViewModel extends BaseViewModel {
     }
   }
 
+  /// call firebase service to check if the user already login in before or not
   /// call firebase service to check if the user already login in before or not
   getDeviceInfoFromFirebase() async {
     _firebaseMessaging.setAutoInitEnabled(true);
     if (Platform.isIOS) {
-      await _firebaseMessaging.requestPermission(sound: true, badge: true, alert: true, provisional: true);
-    }
-      setState(ViewState.Busy);
-    } catch (e) {
-      Helpers.showErrorToast("fdfdfdfdf" + e.toString());
+      _firebaseMessaging.requestNotificationPermissions();
     }
+    setState(ViewState.Busy);
     var token = await _firebaseMessaging.getToken();
     if (localToken == "") {
-      localToken = token!;
+      localToken = token;
 
       await _authService.selectDeviceImei(localToken);
       if (_authService.hasError) {
-        error = _authService.error!;
+        error = _authService.error;
         setState(ViewState.ErrorLocal);
       } else {
         if (_authService.dashboardItemsList.length > 0) {
-          user = _authService.dashboardItemsList[0];
-          sharedPref.setObj(LAST_LOGIN_USER, _authService.dashboardItemsList[0]);
+          user =_authService.dashboardItemsList[0];
+          sharedPref.setObj(
+              LAST_LOGIN_USER, _authService.dashboardItemsList[0]);
           await  sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
               user.vidaRefreshTokenID);
           await  sharedPref.setString(VIDA_AUTH_TOKEN_ID,
@@ -353,6 +352,7 @@ class AuthenticationViewModel extends BaseViewModel {
     }
   }
 
+
   /// determine the status of the app
   APP_STATUS get status {
     if (state == ViewState.Busy) {

lib/screens/home/home_screen.dart

@@ -1,4 +1,5 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/enum/viewstate.dart';
 import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
 import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
@@ -18,6 +19,7 @@ import 'package:doctor_app_flutter/screens/patients/patient_search/patient_searc
 import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart';
 import 'package:doctor_app_flutter/screens/patients/register_patient/RegisterPatientPage.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
+import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';

pubspec.lock

@@ -7,21 +7,21 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "12.0.0"
+    version: "14.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.40.6"
+    version: "0.41.2"
   archive:
     dependency: transitive
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.13"
+    version: "3.1.6"
   args:
     dependency: transitive
     description:
@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   autocomplete_textfield:
     dependency: "direct main"
     description:
@@ -43,6 +43,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.3"
+  badges:
+    dependency: "direct main"
+    description:
+      name: badges
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
   barcode_scan_fix:
     dependency: "direct main"
     description:
@@ -134,6 +141,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "8.1.0"
+  cached_network_image:
+    dependency: "direct main"
+    description:
+      name: cached_network_image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.5.1"
   characters:
     dependency: transitive
     description:
@@ -147,7 +161,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   charts_common:
     dependency: transitive
     description:
@@ -252,7 +266,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "3.0.1"
   csslib:
     dependency: transitive
     description:
@@ -412,6 +426,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_blurhash:
+    dependency: transitive
+    description:
+      name: flutter_blurhash
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.0"
+  flutter_cache_manager:
+    dependency: transitive
+    description:
+      name: flutter_cache_manager
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.2"
   flutter_colorpicker:
     dependency: "direct main"
     description:
@@ -574,6 +602,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.4"
+  hijri:
+    dependency: transitive
+    description:
+      name: hijri
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.3"
+  hijri_picker:
+    dependency: "direct main"
+    description:
+      name: hijri_picker
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   html:
     dependency: "direct main"
     description:
@@ -616,6 +658,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.8"
   imei_plugin:
     dependency: "direct main"
     description:
@@ -692,7 +741,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -735,6 +784,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
+  octo_image:
+    dependency: transitive
+    description:
+      name: octo_image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
   package_config:
     dependency: transitive
     description:
@@ -763,6 +819,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.7"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.6"
+  path_provider_ios:
+    dependency: transitive
+    description:
+      name: path_provider_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.6"
   path_provider_linux:
     dependency: transitive
     description:
@@ -770,6 +847,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  path_provider_macos:
+    dependency: transitive
+    description:
+      name: path_provider_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -889,6 +973,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.25.0"
   scratch_space:
     dependency: transitive
     description:
@@ -978,6 +1069,20 @@ packages:
       relative: true
     source: path
     version: "0.0.0"
+  sqflite:
+    dependency: transitive
+    description:
+      name: sqflite
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0+4"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1+1"
   stack_trace:
     dependency: transitive
     description:
@@ -1013,6 +1118,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0"
   term_glyph:
     dependency: transitive
     description:
@@ -1026,7 +1138,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   timing:
     dependency: transitive
     description:
@@ -1097,6 +1209,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.5"
   vector_math:
     dependency: transitive
     description:
@@ -1217,5 +1336,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
-  flutter: ">=2.2.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"