pop removed

# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart

Certs/VOIP Certs/HMGVoIPCSR.certSigningRequest

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICgjCCAWoCAQAwPTEjMCEGCSqGSIb3DQEJARYUSGFyb29uNjEzOEBnbWFpbC5j
+b20xCTAHBgNVBAMMADELMAkGA1UEBhMCQUUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDHadAER62mSf+wOxPu9rF1EvifDxbAEv6znZIHvwimgShdPLLS
+rkFdN4VpSHMzrASqpHnlSL3wxO6eym9pATH3WfLvKIQxnn9OkO5fScjQi0RkFbe0
+JqTqN2LaFxrSFrhqQ/1p/izr690HqjrfquRI8t8evatyTku67/xcCj6uSIVLfJoS
+8YCDVn0Y+w9n2Vw/+kHiNY6P96qp/CfXZgMLFpUu0mqcmZl97htfmB9AH2tC45yh
+mKxDJiKEnk69zVCh/bkc9tFE1tUDkkKblJTCEyWfdDUUYM4ET3t3fBqWB78F4J3m
+XglByGZmHgY2+7nsSQBiq7k9tFN2c7FZ9BD3AgMBAAGgADANBgkqhkiG9w0BAQsF
+AAOCAQEAJxqoyfEJ7V83ffCAqkYNNEcCQMIRi1Y4cTTm/5KZGA/UPeDeX48/bm4K
+XIf2zbv88OGASInBrvMDp0x0zs13Dx2yXxofGN+iQSBwN6jPV/upmm0DjgTmgUGh
+BJste70LaU228ADzWDw8UJm/GKjK8WvE0XOGpPKYq9cuVW3M+6QRoRHXy0eJc2PX
+VgopsuhHUyA5trxM7k4yc6GgYVx+fAwMaplovTwn5U8XK6bDEIvCjImfat/u4Wp8
+R31p0BQzQaeyWfpp9Ucn/fvQSeB+wtjhHuA1ukcyWY1kBYOyCMIHymFrJLaTpUj7
+aQFYZDV28HYv0yWhWIAD9Pu+aDHWpA==
+-----END CERTIFICATE REQUEST-----

Certs/VOIP Certs/VOIP.pem

@@ -0,0 +1,74 @@
+Bag Attributes
+    friendlyName: VoIP Services: com.HMG.HMG-Smartphone
+    localKeyID: 70 4A 99 03 F8 D7 92 FA F7 2F DD 3B D8 BF 2C F0 BD CE 21 C8 
+subject=/UID=com.HMG.HMG-Smartphone.voip/CN=VoIP Services: com.HMG.HMG-Smartphone/OU=3A359E86ZF/O=Dr Sulaiman Al Habib Medical Center/C=SA
+issuer=/CN=Apple Worldwide Developer Relations Certification Authority/OU=G4/O=Apple Inc./C=US
+-----BEGIN CERTIFICATE-----
+MIIGkTCCBXmgAwIBAgIQFB+/PYFlrZ6SCzSX9cqOBDANBgkqhkiG9w0BAQsFADB1
+MUQwQgYDVQQDDDtBcHBsZSBXb3JsZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9ucyBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTELMAkGA1UECwwCRzQxEzARBgNVBAoMCkFw
+cGxlIEluYy4xCzAJBgNVBAYTAlVTMB4XDTI0MDYwOTEyMDc1MVoXDTI1MDcwOTEy
+MDc1MFowga0xKzApBgoJkiaJk/IsZAEBDBtjb20uSE1HLkhNRy1TbWFydHBob25l
+LnZvaXAxLjAsBgNVBAMMJVZvSVAgU2VydmljZXM6IGNvbS5ITUcuSE1HLVNtYXJ0
+cGhvbmUxEzARBgNVBAsMCjNBMzU5RTg2WkYxLDAqBgNVBAoMI0RyIFN1bGFpbWFu
+IEFsIEhhYmliIE1lZGljYWwgQ2VudGVyMQswCQYDVQQGEwJTQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMdp0ARHraZJ/7A7E+72sXUS+J8PFsAS/rOd
+kge/CKaBKF08stKuQV03hWlIczOsBKqkeeVIvfDE7p7Kb2kBMfdZ8u8ohDGef06Q
+7l9JyNCLRGQVt7QmpOo3YtoXGtIWuGpD/Wn+LOvr3QeqOt+q5Ejy3x69q3JOS7rv
+/FwKPq5IhUt8mhLxgINWfRj7D2fZXD/6QeI1jo/3qqn8J9dmAwsWlS7SapyZmX3u
+G1+YH0Afa0LjnKGYrEMmIoSeTr3NUKH9uRz20UTW1QOSQpuUlMITJZ90NRRgzgRP
+e3d8GpYHvwXgneZeCUHIZmYeBjb7uexJAGKruT20U3ZzsVn0EPcCAwEAAaOCAuIw
+ggLeMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUW9n6HeeaGgujmXYiUIY+kchb
+d6gwcAYIKwYBBQUHAQEEZDBiMC0GCCsGAQUFBzAChiFodHRwOi8vY2VydHMuYXBw
+bGUuY29tL3d3ZHJnNC5kZXIwMQYIKwYBBQUHMAGGJWh0dHA6Ly9vY3NwLmFwcGxl
+LmNvbS9vY3NwMDMtd3dkcmc0MDUwggEeBgNVHSAEggEVMIIBETCCAQ0GCSqGSIb3
+Y2QFATCB/zCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRp
+ZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRo
+ZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1
+c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGlj
+ZSBzdGF0ZW1lbnRzLjA3BggrBgEFBQcCARYraHR0cHM6Ly93d3cuYXBwbGUuY29t
+L2NlcnRpZmljYXRlYXV0aG9yaXR5LzATBgNVHSUEDDAKBggrBgEFBQcDAjAyBgNV
+HR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmFwcGxlLmNvbS93d2RyZzQtNi5jcmww
+HQYDVR0OBBYEFHBKmQP415L69y/dO9i/LPC9ziHIMA4GA1UdDwEB/wQEAwIHgDAQ
+BgoqhkiG92NkBgMBBAIFADAQBgoqhkiG92NkBgMCBAIFADBDBgoqhkiG92NkBgME
+BDUMM2NvbS5ITUcuSE1HLVNtYXJ0cGhvbmUsIGNvbS5ITUcuSE1HLVNtYXJ0cGhv
+bmUudm9pcDAQBgoqhkiG92NkBgMFBAIFADAmBgoqhkiG92NkBgMDBBgMFmNvbS5I
+TUcuSE1HLVNtYXJ0cGhvbmUwDQYJKoZIhvcNAQELBQADggEBAJAcIzSskk8/GbxQ
+7nGUPPEWFswL66xTt3GusHmeXkKDXG3ac+4jLk8yU7gunos77CNDm+9TkShdJ2Rg
+tTRopK4ockqwoPrCeEVrooHR4e42YvmkB6AfYKJRnQZQVJIpW0OES7vrtoWVGoNj
+ktHOV+wFIuAQPI9P4z0RFyRw85MHr+jFqxeLU/1500PwCxIiNHkIcUtzZgrnr22R
+7rgkxav+RrjLjXVQvC4VJispKCU7yR69Xv1rsC5zc7OTCuCkbQ9FvnfsiUz5ZDzp
+3D0gGojU9wmJ1yVk9HiZsuiVwmg/LbDHI3pSYbxz3n1UHB6Pu0jX3c3Uxkx674HD
+/0uvHzg=
+-----END CERTIFICATE-----
+Bag Attributes
+    localKeyID: 70 4A 99 03 F8 D7 92 FA F7 2F DD 3B D8 BF 2C F0 BD CE 21 C8 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHadAER62mSf+w
+OxPu9rF1EvifDxbAEv6znZIHvwimgShdPLLSrkFdN4VpSHMzrASqpHnlSL3wxO6e
+ym9pATH3WfLvKIQxnn9OkO5fScjQi0RkFbe0JqTqN2LaFxrSFrhqQ/1p/izr690H
+qjrfquRI8t8evatyTku67/xcCj6uSIVLfJoS8YCDVn0Y+w9n2Vw/+kHiNY6P96qp
+/CfXZgMLFpUu0mqcmZl97htfmB9AH2tC45yhmKxDJiKEnk69zVCh/bkc9tFE1tUD
+kkKblJTCEyWfdDUUYM4ET3t3fBqWB78F4J3mXglByGZmHgY2+7nsSQBiq7k9tFN2
+c7FZ9BD3AgMBAAECggEBALTXH58SBcd86hS+rsgSDkJ2ruNIQsBzOWpYJjtCIi0l
+ih5r0lu/TWWk2SbuXhLpF95MhILLIf18Ck4UlU5rmA2SE/6RBrkc3KS6SII/no6J
+Db+Z9lu4g+wnyEyxkVAe7KTp/aGmsMROxMaTuQpnptkE8BSnuxhRKtpfksNBQzC2
+19OkEy4JAO7xWbm9w/ASiCtYf0Vj26DQo982Fe44cpG08iB2v1uUJINQkGzmg+85
+vvn5A1ECpSpgd/eOa68ojxeNSU7iFGZPbpjuincLPBFlC5zp9KD1Bt6p2KwIizBl
+GPYTp6a1DnWly6n0PuLN0fl/nRmI6ar48Ja1Qzk8NvECgYEA5iQo9lnjNOHjT6bk
+hj5QXMz3MDMCPdJo6jQyADtmsC/F4RjufujfXPhMv2v8JLAjQjNMgfhTSF68zYHf
+i1qW8e/CgWu7mGQEIhWtxiTkLou8zW3VjxwpgfeUsGI5L+PxoN53ZUVcetLz4Y58
+8ATEhlxh02uGmG2k3HbvFu9NBT8CgYEA3dHJfFX2xv53ZD1E2IE1rM3j7a32s7VB
+k/YX8ODrAJxwNmy/vm4gd5h6ofqVS1/IV4NHFbmQ5c1tzB44YGOEZH5Ta9hhHgHU
+xoa3q6t+kjR9KrQvxjTSe9mW5x/jAgU0Wp/XrAfMZxc2eukb4/sJAGKG0kyFeX5O
+5abVixWj7kkCgYAafd8ZPI+i7r2z1YpIybOGezGZIsYHR8k77HY1AKF5doZYuv35
+LeVIVmy/PDbyIjRs0mrkKymrEvy4y1JoQC1P/EFvlG8rw5eWNNikDmsV0JATNal3
+p84/X7iF9UiP8rVFx1YHGkzi9pWMSVKobmQQ82FvbNk5gqWPm0E6aqF7EQKBgQDB
+mE0PlT9SIdk1xTuG8g5UiUV6tS/xXCql5kyy0LqJx/8voO4gV6FCf/PX1wnhxPDn
+YA30agaKaiZ/1YhCp9hulMpd/3WTaOm5cu5uh7hqBiGP2b8wb/2cViWcBnpr0vsE
+dSkYXZ4KA3pq/3R2HyyWB2e/t0Vu6cwWJuuM/hAa8QKBgGNRStNVSMPvzx2X7mB6
+EqdlWqVbfSTHJiZKyNPWHlSuZgdQ14BRwq7KZ0ysZy+kOX4rh1rIfqzrKc62xEXB
+E+fmIpu+DUOM5ojEPCf9Om87r3fMJ54SjM7z1dtVc+Muy4TnFZ4UQcN9txWbnkAo
+++H5gC9DBedOEXkwoCYjoeuM
+-----END PRIVATE KEY-----

README.md

@@ -1,4 +1,4 @@
-# diplomaticquarterapp
+'# diplomaticquarterapp
 
 A new Flutter application.
 

android/app/build.gradle

@@ -36,13 +36,14 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 
 configurations.all {
-    c -> c.resolutionStrategy.eachDependency {
-        DependencyResolveDetails dependency ->
-            println dependency.requested.group
-            if (dependency.requested.group == 'org.bouncycastle') {
-                dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.68'
-            }
-    }
+    c ->
+        c.resolutionStrategy.eachDependency {
+            DependencyResolveDetails dependency ->
+                println dependency.requested.group
+                if (dependency.requested.group == 'org.bouncycastle') {
+                    dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.68'
+                }
+        }
 }
 
 //configurations.all {
@@ -53,6 +54,7 @@ configurations.all {
 
 android {
     compileSdkVersion 34
+//    ndkVersion "24.0.8215888"
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -62,18 +64,23 @@ android {
         disable 'MissingTranslation'
         checkReleaseBuilds false
     }
-    
+
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.ejada.hmg"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
     }
 
+    sourceSets.main {
+        jniLibs.srcDir 'src/main/libs'
+        jni.srcDirs = [] //disable automatic ndk-build call
+    }
+
     signingConfigs {
         release {
             keyAlias keystoreProperties['keyAlias']
@@ -87,10 +94,13 @@ android {
         debug {
             debuggable true
             signingConfig signingConfigs.debug
+//            ndk {
+//                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+//            }
         }
         release {
             debuggable false
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -107,8 +117,14 @@ android {
 
     packagingOptions {
         exclude 'META-INF/proguard/androidx-annotations.pro'
+//        pickFirst 'lib/x86/libc++_shared.so'
+//        pickFirst 'lib/x86_64/libc++_shared.so'
+//        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+//        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+//        pickFirst '**/*.so'
     }
 
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -126,9 +142,9 @@ dependencies {
 //        exclude group: 'com.google.protobuf',module: 'protobuf-javalite'
 //        exclude group: 'com.google.protobuf',module: 'protobuf-lite'
 //    })
-    implementation 'pub.devrel:easypermissions:0.4.0'
+    implementation 'pub.devrel:easypermissions:3.0.0'
 //    implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
-   // implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
+    // implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
     implementation 'com.google.guava:guava:27.0.1-android'
     // Dependency on local binaries
     implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -138,8 +154,20 @@ dependencies {
 //    implementation 'com.example.android:app-magic:12.3'
 
 
+    implementation "us.zoom.videosdk:zoomvideosdk-core:1.10.1"
+    implementation "us.zoom.videosdk:zoomvideosdk-annotation:1.10.1"
+    implementation "us.zoom.videosdk:zoomvideosdk-videoeffects:1.10.1"
+
     // Native Dependency
-    implementation "org.jetbrains.anko:anko-commons:0.10.4"
+
+//    implementation "us.zoom.videosdk:ZoomVideoSDK:1.10.11"
+//    implementation group: 'us.zoom.videosdk', name: 'zoomvideosdk-core', version: '1.10.11'
+
+    implementation "us.zoom.videosdk:zoomvideosdk-core:1.10.1"
+    implementation "us.zoom.videosdk:zoomvideosdk-annotation:1.10.1"
+    implementation "us.zoom.videosdk:zoomvideosdk-videoeffects:1.10.1"
+
+//    implementation "org.jetbrains.anko:anko-commons:0.10.4"
     implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM
     implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0'
     implementation 'com.google.android.gms:play-services-location:17.1.0'//for Android

android/app/proguard-rules.pro

@@ -37,5 +37,20 @@
 -keep class com.opentok.otc.** { *; }
 -keep class org.otwebrtc.** { *; }
 
+
+##Flutter Zoom
+-keep class us.zoom**{
+   *;
+}
+-keep interface us.zoom**{
+   *;
+}
+-keep class org.webrtc**{
+   *;
+}
+-keep class com.zipow**{
+   *;
+}
+
 -dontwarn com.opentok.android.**
 -dontwarn com.opentok.otc.**

android/app/src/main/AndroidManifest.xml

@@ -6,12 +6,26 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" tools:node="remove"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.BLUETOOTH" tools:node="remove"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" tools:node="remove"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" tools:node="remove"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="remove"/>
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" tools:node="remove"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" tools:node="remove"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" tools:node="remove"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:node="remove"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -50,6 +64,8 @@
         android:showOnLockScreen="true"
         android:screenOrientation="sensorPortrait"
         android:allowBackup="false"
+        android:extractNativeLibs="true"
+        tools:replace="android:extractNativeLibs"
         android:label="Dr. Alhabib">
 
         <meta-data android:name="push_kit_auto_init_enabled" android:value="true" />

android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt

@@ -22,7 +22,6 @@ import com.github.kittinunf.fuel.httpPost
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import io.flutter.plugin.common.MethodChannel
-import org.jetbrains.anko.doAsyncResult
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
@@ -208,7 +207,6 @@ fun <T>httpPost(url: String, body: Map<String, Any?>, onSuccess: (response: HTTP
             .header("Content-Type", "application/json")
             .header("Allow", "*/*")
             .response { request, response, result ->
-                result.doAsyncResult {  }
                 result.fold({ data ->
                     val dataString = String(data)
                     if (isJSONValid(dataString)) {

android/build.gradle

@@ -1,8 +1,18 @@
 buildscript {
     ext.kotlin_version = '1.8.0'
+
+//    if (System.properties['os.arch'] == "aarch64") {
+//        // For M1 Users we need to use the NDK 24 which added support for aarch64
+//        ndkVersion = "24.0.8215888"
+//    } else {
+//        // Otherwise we default to the side-by-side NDK version from AGP.
+//        ndkVersion = "21.4.7075529"
+//    }
+
     repositories {
         google()
-        jcenter()
+//        jcenter()
+        mavenCentral()
         maven { url 'https://developer.huawei.com/repo/' }
 
 //        maven {
@@ -28,6 +38,9 @@ allprojects {
         maven {
             url 'https://developer.huawei.com/repo/'
         }
+        maven {
+            url 'https://mvnrepository.com/artifact/'
+        }
         maven {
             url "https://artifactory.ess-dev.com/artifactory/gradle-dev-local"
         }

android/gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx4096m
 #android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

assets/images/new/bottom_nav/my_file.svg

@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="21.035" height="25.699" viewBox="0 0 21.035 25.699">
   <g id="file_4_" data-name="file (4)" transform="translate(0 0)">
-    <path id="Path_4376" data-name="Path 4376" d="M199.117,108.4h.751v18.461a2.228,2.228,0,0,0,2.225,2.225h13.668v.684a1.42,1.42,0,0,1-1.42,1.42H199.12a1.42,1.42,0,0,1-1.42-1.42V109.82A1.418,1.418,0,0,1,199.117,108.4Z" transform="translate(-197.7 -105.491)" fill="#989898"/>
-    <path id="Path_4377" data-name="Path 4377" d="M95.931,22.79H88.32a1.42,1.42,0,0,1-1.42-1.42V1.42A1.42,1.42,0,0,1,88.32,0H98.462V.47a1.378,1.378,0,0,0-.008.15V4.509a2,2,0,0,0,2,2h3.889c.04,0,.083,0,.123-.005h.494V21.371a1.42,1.42,0,0,1-1.42,1.42H95.931Zm-.287-4.825h4.962a.671.671,0,0,0,0-1.342H95.641a.671.671,0,1,0,0,1.342Zm-4.965-3.424h9.927a.671.671,0,0,0,0-1.342H90.679a.671.671,0,0,0,0,1.342Zm9.927-4.978H90.679a.671.671,0,0,0,0,1.342h9.927a.671.671,0,0,0,0-1.342Z" transform="translate(-83.924 0)" fill="#989898"/>
-    <path id="Path_4378" data-name="Path 4378" d="M92.626,6.481h-3.9A1.191,1.191,0,0,1,87.546,5.3V1.4a.6.6,0,0,1,.6-.6.582.582,0,0,1,.419.177L93.05,5.462A.6.6,0,0,1,92.626,6.481Z" transform="translate(-72.209 -0.779)" fill="#989898"/>
+    <path id="Path_4376" data-name="Path 4376" d="M199.117,108.4h.751v18.461a2.228,2.228,0,0,0,2.225,2.225h13.668v.684a1.42,1.42,0,0,1-1.42,1.42H199.12a1.42,1.42,0,0,1-1.42-1.42V109.82A1.418,1.418,0,0,1,199.117,108.4Z" transform="translate(-197.7 -105.491)" fill="#00000"/>
+    <path id="Path_4377" data-name="Path 4377" d="M95.931,22.79H88.32a1.42,1.42,0,0,1-1.42-1.42V1.42A1.42,1.42,0,0,1,88.32,0H98.462V.47a1.378,1.378,0,0,0-.008.15V4.509a2,2,0,0,0,2,2h3.889c.04,0,.083,0,.123-.005h.494V21.371a1.42,1.42,0,0,1-1.42,1.42H95.931Zm-.287-4.825h4.962a.671.671,0,0,0,0-1.342H95.641a.671.671,0,1,0,0,1.342Zm-4.965-3.424h9.927a.671.671,0,0,0,0-1.342H90.679a.671.671,0,0,0,0,1.342Zm9.927-4.978H90.679a.671.671,0,0,0,0,1.342h9.927a.671.671,0,0,0,0-1.342Z" transform="translate(-83.924 0)" fill="#00000"/>
+    <path id="Path_4378" data-name="Path 4378" d="M92.626,6.481h-3.9A1.191,1.191,0,0,1,87.546,5.3V1.4a.6.6,0,0,1,.6-.6.582.582,0,0,1,.419.177L93.05,5.462A.6.6,0,0,1,92.626,6.481Z" transform="translate(-72.209 -0.779)" fill="#00000"/>
   </g>
 </svg>

assets/images/new/zoom/index.ts

@@ -0,0 +1,22 @@
+export const icons = {
+  chatSend: require('./chat-send.png'),
+  defaultAvatar: require('./default-avatar.png'),
+  locked: require('./locked.png'),
+  more: require('./more.png'),
+  mute: require('./mute.png'),
+  muted: require('./muted.png'),
+  shareOn: require('./share-on.png'),
+  shareOff: require('./share-off.png'),
+  speakerOn: require('./speaker-on.png'),
+  speakerOff: require('./speaker-off.png'),
+  switchCamera: require('./switch-camera.png'),
+  hamburger: require('./hamburger.png'),
+  questionBalloon: require('./question-ballon.png'),
+  talking: require('./talking.png'),
+  unmute: require('./unmute.png'),
+  unlocked: require('./unlocked.png'),
+  videoOn: require('./video-on.png'),
+  videoOff: require('./video-off.png'),
+};
+
+export type IconTypes = keyof typeof icons;

encryption_public_key.pem

@@ -0,0 +1,11 @@
+-----BEGIN PUBLIC KEY-----
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEApKqued5RaqBjKntLoVhj
+rflB5NpGELhAftnKrXO+0lCQGm0huxWeb/KtSgniJpPQ1LXfhGKqjaZwu3zd2xsU
+9D6i7Ie1QJvIJlxHwi/zKdBX7nSHx5phK+yRJF+Fnt5wieZ8bzT4Eqn31J6Cdahl
+0sZDTjixl/fhM2G+E8gYNsWMihcWnMXejHdKT2yHG+rJXt4FvYYAuwIW/S75vSOM
+L4CE4JS5D9UcYpNxU4Cv6KxiAAK/oQmzrrSoU9lJ6mp5wrwJDsBUgwOrXxYPct9N
+FoqYgh54fs9xuh5fvHozst8wFY8Kf4hPVmOdPtcUlWQSbtRf0CehJ9yuftHmFxWX
+yjyoa9X3MK7yHoZIAFXvbh1n+QUWGMNrCNIdqDtPEtjVBtSAGL5x+lxqfFMMRKJA
+OfOtzjG1QDPP3EPrw/vfU2hCXZ75wlOoqEy6vmrVaYWJ5Apx0ftujtUxslSJ15Zz
+CghYLtu/JolJT1Hxg5uOFpLaX3VoAs+y9e7+oRgPPVtHAgMBAAE=
+-----END PUBLIC KEY-----

ios/Runner.xcodeproj/project.pbxproj

@@ -69,6 +69,9 @@
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		762D738C274E42650063CE73 /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring_30Sec.caf; path = ../../assets/sounds/ring_30Sec.caf; sourceTree = "<group>"; };
 		762D738D274E42650063CE73 /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ring_30Sec.mp3; path = ../../assets/sounds/ring_30Sec.mp3; sourceTree = "<group>"; };
+		7643E4042BE0D0B400BD2F25 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main_Custom.strings; sourceTree = "<group>"; };
+		7643E4052BE0D0B400BD2F25 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main.strings; sourceTree = "<group>"; };
+		7643E4062BE0D0B400BD2F25 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
 		76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		76F2556027F1FFED0062C1CD /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
@@ -287,6 +290,7 @@
 			knownRegions = (
 				en,
 				Base,
+				ar,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -442,6 +446,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C146FB1CF9000F007C117D /* Base */,
+				7643E4052BE0D0B400BD2F25 /* ar */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -450,6 +455,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C147001CF9000F007C117D /* Base */,
+				7643E4062BE0D0B400BD2F25 /* ar */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -458,6 +464,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				E91B53A2256AAD8200E96549 /* Base */,
+				7643E4042BE0D0B400BD2F25 /* ar */,
 			);
 			name = Main_Custom.storyboard;
 			sourceTree = "<group>";
@@ -469,6 +476,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -541,7 +549,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.5.63;
+				MARKETING_VERSION = 4.5.93;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -557,6 +565,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -612,6 +621,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -686,7 +696,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.5.63;
+				MARKETING_VERSION = 4.5.93;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -724,7 +734,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.5.63;
+				MARKETING_VERSION = 4.5.93;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/Constants.dart

@@ -1,5 +1,6 @@
+import 'package:diplomaticquarterapp/theme/theme_value.dart';
 import 'package:flutter/material.dart';
 
-final Color? secondaryColor = Colors.red[800];
+final Color? secondaryColor = appColor;
 
 final Color? dividerColor = Colors.grey[600];

lib/config/config.dart

@@ -24,10 +24,7 @@ var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
 // var  BASE_URL = 'http://10.50.100.198:4422/';
 var BASE_URL = 'https://uat.hmgwebservices.com/';
 // var BASE_URL = 'https://hmgwebservices.com/';
-//var BASE_URL = 'https://hmgwebservices.com/';
 //  var  BASE_URL = 'http://10.20.200.111:1010/';
-//var BASE_URL = 'https://uat.hmgwebservices.com/';
-// var BASE_URL = 'https://hmgwebservices.com/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
@@ -347,7 +344,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
 var CHANNEL = 3;
 var GENERAL_ID = 'Cs2020@2016\$2958';
 var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 15.6;
+var VERSION_ID = 15.9;
 var SETUP_ID = '91877';
 var LANGUAGE = 2;
 // var  PATIENT_OUT_SA = 0;
@@ -664,6 +661,10 @@ var GET_BLOOD_DONATION_PROJECTS_LIST = 'Services/OUTPs.svc/REST/BD_getProjectsHa
 
 var GET_BLOOD_DONATION_FREE_SLOTS = 'Services/OUTPs.svc/REST/BD_GetFreeSlots';
 
+var GET_WE_CARE_TOUR_URL = 'Services/Consent.svc/Rest/Consent_VirtualJurny_Url_GetByProjectID';
+
+var GET_DENTAL_INSTRUCTIONS = 'Services/OUTPs.svc/Rest/getProcedureNotification';
+
 //PAYFORT
 var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails";
 var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";

lib/config/localized_values.dart

@@ -116,13 +116,13 @@ const Map localizedValues = {
   "national-id-number": {"en": "National ID Number", "ar": "رقم الهوية الوطنية / الاقامة"},
   "medical-file-number": {"en": "Medical File Number", "ar": "رقم الملف الطبي"},
   'login': {'en': 'Login', 'ar': 'دخول'},
-  'loginregister': {'en': 'Login / Register', 'ar': 'دخول/ تسجيل'},
+  'loginregister': {'en': 'Login', 'ar': 'دخول'},
   'poweredBy': {'en': 'Powered by', 'ar': 'مشغل بواسطة'},
   "welcome": {"en": "Welcome", "ar": "مرحبا بكم"},
   "welcome-to": {"en": "Welcome to", "ar": "مرحبا بك في"},
   "patient-app": {"en": "Patient App", "ar": "تطبيق المراجعين"},
   "welcome_text": {"en": "Dr. Sulaiman Al Habib Mobile Application", "ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف"},
-  "dr-sulaiman-text": {"en": "Dr. Sulaiman Al Habib", "ar": "د. سليمان الحبيب"},
+  "king-khalid-university": {"en": "King Khalid University", "ar": "جامعة الملك خالد"},
   'welcome_text2': {'en': 'Have you previously visited the hospitals or medical centers of Dr. Sulaiman Al Habib?', 'ar': 'هل قمت مسبقا بزيارة مستشفيات او مراكز الدكتور سليمان الحبيب الطبية ؟'},
   'yes': {'en': 'Yes', 'ar': 'نعم'},
   'no': {'en': 'No', 'ar': 'لا'},
@@ -269,6 +269,7 @@ const Map localizedValues = {
   "register-info-family": {"en": "How would like to add the new member?", "ar": "كيف ترغب باضافة العضو الجديد؟"},
   "remove-family-member": {"en": "Remove this member?", "ar": "إزالة ملف العضو؟"},
   "MyMedicalFile": {"en": "My Medical File", 'ar': 'الملف الطبي الالكتروني'},
+  "MyMedicalFiles": {"en": "Medical File", 'ar': 'الملف الطبي'},
   "myMedicalFileSubTitle": {"en": "All your medical records", 'ar': 'جميع سجلاتك الطبية'},
   "viewMore": {"en": "View More", 'ar': 'عرض المزيد'},
   "homeHealthCareService": {"en": "Home Health Care Service", 'ar': 'الرعاية الصحية المنزلية'},
@@ -493,7 +494,7 @@ const Map localizedValues = {
     "ar":
         "توفر هذه الخدمة مجموعه من خدمات الرعايه الصحيه المنزلية و متابعه مستمره وشامله للذين لا يستطيعون الوصول للمنشات الصحيه في اماكن اقامتهم (التحاليل المخبرية – الاشعة – التطعيمات – العلاج الطبيعي) ... "
   },
-  "LoginRegister": {"en": "Login/Register", "ar": "دخول / تسجيل"},
+  "LoginRegister": {"en": "Login", "ar": "دخول"},
   "OrderLog": {"en": "Order Log", "ar": " سجل الطلبات"},
   "info-lab": {
     "en": "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.",
@@ -538,6 +539,7 @@ const Map localizedValues = {
   "review": {"en": " reviews", "ar": "تقييمات"},
   "viewMedicalFile": {"en": "View Details", "ar": "عرض الملف الطبي"},
   "viewAllServices": {"en": "View All Services", "ar": "عرض جميع الخدمات"},
+  "allServices": {"en": "All Services", "ar": "جميع الخدمات"},
   "medicalFile": {"en": "Medical File", "ar": "ملفي الطبي"},
   "verified": {"en": "Verified", "ar": "تم التحقق"},
   "checkup": {"en": "Checkup", "ar": "فحص"},
@@ -549,8 +551,8 @@ const Map localizedValues = {
   "emergency": {"en": "Emergency", "ar": "الطوارئ"},
   "erservices": {"en": "Emergency", "ar": "الطوارئ"},
   "services2": {"en": "Services", "ar": "خدمات"},
-  "cantSeeProfile": {"en": "To view your medical profile, please log in or register now", "ar": "للتصفح ملفك الطبي الرجاء تسجيل الدخول أو التسجيل الآن"},
-  "loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"},
+  "cantSeeProfile": {"en": "To view your medical profile, please log in or register now", "ar": "لتصفح ملفك الطبي الرجاء تسجيل الدخول أو التسجيل الآن"},
+  "loginRegisterNow": {"en": "Login Now", "ar": "تسجيل الدخول الآن"},
   "HMGPharmacy": {"en": "HMG Pharmacy", "ar": "صيدلية HMG"},
   "ecommerceSolution": {"en": "Ecommerce Solution", "ar": "حل التجارة الإلكترونية"},
   "comprehensive": {"en": "Comprehensive", "ar": "شامل"},
@@ -1813,37 +1815,37 @@ const Map localizedValues = {
     "ar": "الرجاء السماح لتطبيق مجموعة الحبيب الطبية للظهورعلى سطح الشاشة عند استلام الاتصال من الطبيب لخدمة اللايف كير"
   },
   "cameraPermissionDialog": {
-    "en": "Dr. Al Habib app needs to access Camera to enable virtual consultation between patient & doctor, attach images and scan QR for parking service.",
-    "ar": "يحتاج تطبيق دكتور الحبيب الى صلاحية الوصول إلى الكاميرا لخدمة الاستشارة الافتراضية بين المراجع والطبيب وإرفاق الصور ومسح رمز الاستجابة السريع لخدمة مواقف السيارات."
+    "en": "King Khalid University app needs to access Camera to enable virtual consultation between patient & doctor, attach images and scan QR for parking service.",
+    "ar": "يحتاج تطبيق جامعة الملك خالد إلى الوصول إلى الكاميرا لتمكين الاستشارة الافتراضية بين المريض والطبيب ، وإرفاق الصور ومسح QR لخدمة وقوف السيارات."
   },
   "galleryPermission": {
-    "en": "Dr. Al Habib app needs to access Read & write external storage to upload images & documents in the E-Referral module and renew and update the insurance cards.",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى صلاحية الوصول إلى معرض الصور وذلك لتحميل الصور والمستندات لخدمة الإحالة الإلكترونية وكذلك لخدمة تجديد بطاقات التأمين وتحديثها."
+    "en": "King Khalid University app needs to access Read & write external storage to upload images & documents in the E-Referral module and renew and update the insurance cards.",
+    "ar": "يحتاج تطبيق جامعة الملك خالد إلى الوصول إلى وحدة التخزين الخارجية للقراءة والكتابة لتحميل الصور والمستندات في وحدة الإحالة الإلكترونية وتجديد وتحديث بطاقات التأمين."
   },
   "locationPermissionDialog": {
     "en":
-        "Dr. Al Habib app collects location data to show the nearest HMG hospitals and ER Locations and provides health care services to your location and Health weather indicators service and the medication delivery.",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى صلاحية الوصول الى الموقع لإظهار أقرب مستشفيات المجموعة، مواقع الطوارئ، تقديم خدمات الرعاية الصحية إلى موقعك، خدمة مؤشرات الطقس الصحية وكذلك خدمة توصيل الأدوية."
+        "King Khalid University app collects location data to show the nearest HMG hospitals and ER Locations and provides health care services to your location and Health weather indicators service and the medication delivery.",
+    "ar": "يجمع تطبيق جامعة الملك خالد بيانات الموقع لإظهار أقرب مستشفيات المجموعة ومواقع الطوارئ ويوفر خدمات الرعاية الصحية لموقعك وخدمة مؤشرات الطقس الصحي وتوصيل الأدوية."
   },
   "calendarPermission": {
-    "en": "Dr. Al Habib app collects calendar data to modify and set reminders for Appointments",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى صلاحية الوصول الى التقويم وذلك لاضافة تذكيرات بالمواعيد في التقويم."
+    "en": "King Khalid University app collects calendar data to modify and set reminders for Appointments",
+    "ar": "يقوم تطبيق جامعة الملك خالد بجمع بيانات التقويم لتعديل وتعيين تذكيرات للمواعيد"
   },
   "recordAudioPermission": {
-    "en": "Dr. Al Habib app needs audio permission to enable voice command features.",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى صلاحية الوصول الى الصوت لتفعيل خدمة الأوامر الصوتية."
+    "en": "King Khalid University app needs audio permission to enable voice command features.",
+    "ar": "يحتاج تطبيق جامعة الملك خالد إلى إذن صوتي لتمكين ميزات الأوامر الصوتية."
   },
   "wifiPermission": {
-    "en": "Dr. Al Habib app needs to access WiFi state permission to connect to the HMG WiFi network from within the app when you visit the hospital.",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى الوصول إلى الواي فاي للاتصال بشبكة الواي فاي في المجموعة عند زيارة المستشفى."
+    "en": "King Khalid University app needs to access WiFi state permission to connect to the HMG WiFi network from within the app when you visit the hospital.",
+    "ar": "يحتاج تطبيق جامعة الملك خالد إلى الوصول إلى إذن حالة WiFi للاتصال بشبكة HMG WiFi من داخل التطبيق عند زيارة المستشفى."
   },
   "physicalActivityPermission": {
-    "en": "Dr. Al Habib app collects physical activity data to read heart rate, steps & distance from your smartwatch & send it to your doctor.",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى الوصول إلى بيانات النشاط البدني لقراءة معدل ضربات القلب والخطوات والمسافة من ساعتك الذكية وتحميلها على ملفك الطبي حتى يتمكن الطبيب من الاطلاع عليها."
+    "en": "King Khalid University app collects physical activity data to read heart rate, steps & distance from your smartwatch & send it to your doctor.",
+    "ar": "يجمع تطبيق جامعة الملك خالد بيانات النشاط البدني لقراءة معدل ضربات القلب والخطوات والمسافة من ساعتك الذكية وإرسالها إلى طبيبك."
   },
   "bluetoothPermission": {
-    "en": "Dr. Al Habib app needs to access Bluetooth permission to connect blood pressure & blood sugar devices with the app to analyze the data",
-    "ar": "يحتاج تطبيق دكتور الحبيب إلى الوصول إلى البلوتوث لربط أجهزة ضغط الدم وسكر الدم بالتطبيق لتحليل البيانات وتحميلها على ملفك الطبي حتى يتمكن الطبيب من الاطلاع عليها."
+    "en": "King Khalid University app needs to access Bluetooth permission to connect blood pressure & blood sugar devices with the app to analyze the data",
+    "ar": "يحتاج تطبيق جامعة الملك خالد إلى الحصول على إذن Bluetooth لتوصيل أجهزة ضغط الدم وسكر الدم بالتطبيق لتحليل البيانات"
   },
   "privacyPolicy": {"en": "Privacy Policy", "ar": "سياسة الخصوصية"},
   "termsConditions": {"en": "Terms & Conditions", "ar": "الأحكام والشروط"},
@@ -1974,4 +1976,6 @@ const Map localizedValues = {
   "locationTimeoutError": {"en": "Unable to fetch your location, Please try again.", "ar": "غير قادر على جلب موقعك، يرجى المحاولة مرة أخرى."},
   "loadMore": {"en": "Load More", "ar": "تحميل المزيد"},
   "selectHospitalBloodDonation": {"en": "Please select the hospital you want to book an appointment with: ", "ar": "يرجى اختيار المستشفى الذي تريد حجز موعد معه:"},
+  "wecare": {"en": "We Care", "ar": "نحن نهتم"},
+  "myinstructions": {"en": "My Instructions", "ar": "تعليماتي"},
 };

lib/core/service/client/base_app_client.dart

@@ -12,6 +12,7 @@ import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.
 import 'package:diplomaticquarterapp/pages/appUpdatePage/app_update_page.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
+import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:flutter/material.dart';
@@ -192,7 +193,7 @@ class BaseAppClient {
 
       // body['IdentificationNo'] = 1023854217;
       // body['MobileNo'] = "531940021";  //0560717232
-      // body['PatientID'] = 3300938; //4609100
+      // body['PatientID'] = 283093; //4609100
       // body['TokenID'] = "@dm!n";
 
       // Patient ID: 3027574
@@ -202,9 +203,9 @@ class BaseAppClient {
       body.removeWhere((key, value) => key == null || value == null);
 
       // if (AppGlobal.isNetworkDebugEnabled) {
-      print("URL : $url");
-      final jsonBody = json.encode(body);
-      print(jsonBody);
+        print("URL : $url");
+        final jsonBody = json.encode(body);
+        print(jsonBody);
       // }
 
       if (await Utils.checkConnection(
@@ -559,7 +560,7 @@ class BaseAppClient {
 
   Future navigateToAppUpdate(context, String text) async {
     Navigator.pushAndRemoveUntil(
-      context,
+        locator<NavigationService>().navigatorKey.currentContext!,
       MaterialPageRoute(builder: (context) => AppUpdatePage(appUpdateText: text)),
           (Route<dynamic> route) => false,
     );

lib/core/service/medical/reports_service.dart

@@ -13,7 +13,7 @@ class ReportsService extends BaseService {
   List<AdmissionMedicalReport> admissionsMedicalReport = [];
 
   String userAgreementContent = "";
-  RequestReports _requestReports = RequestReports(isReport: true, encounterType: 1, requestType: 1, patientOutSA: 0, projectID: 0);
+  RequestReports _requestReports = RequestReports(isReport: true, encounterType: 1, requestType: 1, projectID: 0);
 
   Future getReports() async {
     hasError = false;

lib/main.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/core/viewModels/PharmacyPagesViewModel.dart';
 import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
@@ -7,18 +8,14 @@ import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/payfort_services/payfort_view_model.dart';
 import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart';
-import 'package:diplomaticquarterapp/splashPage.dart';
 import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
 import 'package:diplomaticquarterapp/theme/theme_value.dart';
-import 'package:diplomaticquarterapp/uitl/LocalNotification.dart';
 import 'package:diplomaticquarterapp/uitl/PlatformBridge.dart';
 import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:logger/logger.dart';
 import 'package:provider/provider.dart';
 
 import 'config/size_config.dart';
@@ -90,6 +87,7 @@ class _MyApp extends State<MyApp> {
   @override
   Widget build(BuildContext context) {
     PlatformBridge.init(context);
+    AppGlobal.context = context;
 
     // SystemChrome.setPreferredOrientations([
     //   DeviceOrientation.portraitUp,
@@ -97,6 +95,7 @@ class _MyApp extends State<MyApp> {
     // ]);
     // final themeNotifier = Provider.of<ThemeNotifier>(context);
     precacheImage(AssetImage('assets/images/powerd-by.jpg'), context);
+
     return LayoutBuilder(
       builder: (context, constraints) {
         return OrientationBuilder(

lib/models/Appointments/DoctorListResponse.dart

@@ -41,6 +41,7 @@ class DoctorList {
   dynamic serviceID;
   String? setupID;
   List<String>? speciality;
+  List<String>? specialityN;
   dynamic workingHours;
   dynamic decimalDoctorRate;
 
@@ -87,6 +88,7 @@ class DoctorList {
       this.serviceID,
       this.setupID,
       this.speciality,
+      this.specialityN,
       this.workingHours,
       this.decimalDoctorRate});
 
@@ -133,6 +135,7 @@ class DoctorList {
     serviceID = json['ServiceID'];
     setupID = json['SetupID'];
     if (json.containsKey('Speciality') && json['Speciality'] != null) speciality = json['Speciality'].cast<String>();
+    if (json.containsKey('SpecialityN') && json['SpecialityN'] != null) specialityN = json['SpecialityN'].cast<String>();
     workingHours = json['WorkingHours'];
     decimalDoctorRate = json['DecimalDoctorRate'];
   }
@@ -180,6 +183,7 @@ class DoctorList {
     data['ServiceID'] = this.serviceID;
     data['SetupID'] = this.setupID;
     data['Speciality'] = this.speciality;
+    data['SpecialityN'] = this.specialityN;
     data['WorkingHours'] = this.workingHours;
     data['DecimalDoctorRate'] = this.decimalDoctorRate;
     return data;

lib/models/LiveCare/IncomingCallData.dart

@@ -10,7 +10,7 @@ class IncomingCallData {
   String? title;
   String? projectID;
   String? notificationType;
-  String? background;
+  String? background; // 0 for Zoom, 1 for OpenTok
   String? doctorname;
   String? clinicname;
   String? speciality;

lib/models/get_dental_instructions_response_model.dart

@@ -0,0 +1,77 @@
+class GetDentalInstructionsResponseModel {
+  List<Data>? data;
+  dynamic message;
+  int? status;
+
+  GetDentalInstructionsResponseModel({this.data, this.message, this.status});
+
+  GetDentalInstructionsResponseModel.fromJson(Map<String, dynamic> json) {
+    if (json['Data'] != null) {
+      data = <Data>[];
+      json['Data'].forEach((v) {
+        data!.add(new Data.fromJson(v));
+      });
+    }
+    message = json['message'];
+    status = json['status'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    if (this.data != null) {
+      data['Data'] = this.data!.map((v) => v.toJson()).toList();
+    }
+    data['message'] = this.message;
+    data['status'] = this.status;
+    return data;
+  }
+}
+
+class Data {
+  String? createdOn;
+  String? mobileNo;
+  int? patientId;
+  int? procedureId;
+  int? projectId;
+  String? setupId;
+  String? smsContent;
+  int? sourceReferenceNo;
+  String? sourceType;
+
+  Data(
+      {this.createdOn,
+        this.mobileNo,
+        this.patientId,
+        this.procedureId,
+        this.projectId,
+        this.setupId,
+        this.smsContent,
+        this.sourceReferenceNo,
+        this.sourceType});
+
+  Data.fromJson(Map<String, dynamic> json) {
+    createdOn = json['createdOn'];
+    mobileNo = json['mobileNo'];
+    patientId = json['patientId'];
+    procedureId = json['procedureId'];
+    projectId = json['projectId'];
+    setupId = json['setupId'];
+    smsContent = json['smsContent'];
+    sourceReferenceNo = json['sourceReferenceNo'];
+    sourceType = json['sourceType'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['createdOn'] = this.createdOn;
+    data['mobileNo'] = this.mobileNo;
+    data['patientId'] = this.patientId;
+    data['procedureId'] = this.procedureId;
+    data['projectId'] = this.projectId;
+    data['setupId'] = this.setupId;
+    data['smsContent'] = this.smsContent;
+    data['sourceReferenceNo'] = this.sourceReferenceNo;
+    data['sourceType'] = this.sourceType;
+    return data;
+  }
+}

lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart

@@ -25,6 +25,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../../../../theme/theme_value.dart';
 import '../dialogs/select_city_dialog.dart';
 
 class NewEReferralStepThreePage extends StatefulWidget {
@@ -161,7 +162,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
                                         fontSize: 14,
                                         letterSpacing: -0.56,
                                         decoration: TextDecoration.underline,
-                                        color: CustomColors.accentColor,
+                                        color: appColor,
                                       ),
                                     ),
                                   ),
@@ -248,7 +249,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
                                 children: [
                                   Checkbox(
                                       value: isPatientInsured,
-                                      activeColor: CustomColors.accentColor,
+                                      activeColor: CustomColors.primaryColor,
                                       onChanged: (bool? newValue) {
                                         setState(() {
                                           isPatientInsured = newValue!;
@@ -342,7 +343,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
                                           fontSize: 14,
                                           letterSpacing: -0.56,
                                           decoration: TextDecoration.underline,
-                                          color: CustomColors.accentColor,
+                                          color: CustomColors.primaryColor,
                                         ),
                                       ),
                                     ),

lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart

@@ -669,6 +669,7 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
           payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
           currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
           onFailed: (failureResult) async {
+            GifLoaderDialogUtils.hideDialog(context);
             log("failureResult: ${failureResult.toString()}");
             AppToast.showErrorToast(message: failureResult.toString());
           },

lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart

@@ -174,7 +174,7 @@ class _BMICalculatorState extends State<BMICalculator> {
             padding: EdgeInsets.all(16),
             child: SecondaryButton(
               label: TranslationBase.of(context).calculate,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 setState(() {
                   calculateBMI();

lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart

@@ -220,7 +220,7 @@ class _BmrCalculatorState extends State<BmrCalculator> {
                                           child: Container(
                                             width: double.infinity,
                                             height: double.infinity,
-                                            decoration: containerRadius(!isMale ? CustomColors.accentColor : Colors.white, 100),
+                                            decoration: containerRadius(!isMale ? CustomColors.primaryColor : Colors.white, 100),
                                           ),
                                         ),
                                         mWidth(12),
@@ -254,7 +254,7 @@ class _BmrCalculatorState extends State<BmrCalculator> {
                                           child: Container(
                                             width: double.infinity,
                                             height: double.infinity,
-                                            decoration: containerRadius(isMale ? CustomColors.accentColor : Colors.white, 100),
+                                            decoration: containerRadius(isMale ? CustomColors.primaryColor : Colors.white, 100),
                                           ),
                                         ),
                                         mWidth(12),
@@ -410,7 +410,7 @@ class _BmrCalculatorState extends State<BmrCalculator> {
               color: Colors.white,
               child: SecondaryButton(
                 label: TranslationBase.of(context).calculate,
-                color: CustomColors.accentColor,
+                color: CustomColors.primaryColor,
                 onTap: () {
                   setState(() {
                     calculateBmr();

lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart

@@ -74,7 +74,7 @@ class BmrResultPage extends StatelessWidget {
                         ),
                       ],
                     ),
-                    progressColor: CustomColors.accentColor,
+                    progressColor: CustomColors.primaryColor,
                     backgroundColor: Colors.white,
                   ),
                 ),
@@ -98,7 +98,7 @@ class BmrResultPage extends StatelessWidget {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).viewDocList,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 getDoctorsList(context);
               },

lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart

@@ -327,7 +327,7 @@ class _BodyFatState extends State<BodyFat> {
                                     child: Container(
                                       width: double.infinity,
                                       height: double.infinity,
-                                      decoration: containerRadius(!isMale ? CustomColors.accentColor : Colors.white, 100),
+                                      decoration: containerRadius(!isMale ? CustomColors.primaryColor : Colors.white, 100),
                                     ),
                                   ),
                                   mWidth(12),
@@ -361,7 +361,7 @@ class _BodyFatState extends State<BodyFat> {
                                     child: Container(
                                       width: double.infinity,
                                       height: double.infinity,
-                                      decoration: containerRadius(isMale ? CustomColors.accentColor : Colors.white, 100),
+                                      decoration: containerRadius(isMale ? CustomColors.primaryColor : Colors.white, 100),
                                     ),
                                   ),
                                   mWidth(12),
@@ -493,7 +493,7 @@ class _BodyFatState extends State<BodyFat> {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).calculate,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 setState(() {
                   calculateBodyFat();

lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat_result_page.dart

@@ -78,7 +78,7 @@ class FatResult extends StatelessWidget {
                         ),
                       ],
                     ),
-                    progressColor: CustomColors.accentColor,
+                    progressColor: CustomColors.primaryColor,
                     backgroundColor: Colors.white,
                   ),
                 ),
@@ -96,7 +96,7 @@ class FatResult extends StatelessWidget {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).viewDocList,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 getDoctorsList(context);
               },

lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart

@@ -156,7 +156,7 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
                                     child: Container(
                                       width: double.infinity,
                                       height: double.infinity,
-                                      decoration: containerRadius(!isMale ? CustomColors.accentColor : Colors.white, 100),
+                                      decoration: containerRadius(!isMale ? CustomColors.primaryColor : Colors.white, 100),
                                     ),
                                   ),
                                   mWidth(12),
@@ -190,7 +190,7 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
                                     child: Container(
                                       width: double.infinity,
                                       height: double.infinity,
-                                      decoration: containerRadius(isMale ? CustomColors.accentColor : Colors.white, 100),
+                                      decoration: containerRadius(isMale ? CustomColors.primaryColor : Colors.white, 100),
                                     ),
                                   ),
                                   mWidth(12),
@@ -344,7 +344,7 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).calculate,
-              color: ageController.text.isNotEmpty ? int.parse(ageController.text) >120 ? Colors.grey : CustomColors.accentColor : CustomColors.accentColor,
+              color: ageController.text.isNotEmpty ? int.parse(ageController.text) >120 ? Colors.grey : CustomColors.primaryColor : CustomColors.accentColor,
               onTap: () {
                 if(ageController.text.isNotEmpty &&  int.parse(ageController.text) <121 &&  int.parse(_heightController.text)<250 && int.parse(_weightController.text) <200)
                 setState(() {

lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart

@@ -76,7 +76,7 @@ class CalorieResultPage extends StatelessWidget {
                         ),
                       ],
                     ),
-                    progressColor: CustomColors.accentColor,
+                    progressColor: CustomColors.primaryColor,
                     backgroundColor: Colors.white,
                   ),
                 ),
@@ -99,7 +99,7 @@ class CalorieResultPage extends StatelessWidget {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).viewDocList,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 getDoctorsList(context);
               },

lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart

@@ -137,7 +137,7 @@ class _CarbsState extends State<Carbs> {
                             padding: const EdgeInsets.all(12.0),
                             child: Text(
                               TranslationBase.of(context).notSure,
-                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, letterSpacing: -0.56, color: CustomColors.accentColor, decoration: TextDecoration.underline),
+                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, letterSpacing: -0.56, color: CustomColors.primaryColor, decoration: TextDecoration.underline),
                             ),
                           ),
                         )
@@ -230,7 +230,7 @@ class _CarbsState extends State<Carbs> {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).calculate,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 setState(() {
                   {

lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs_result_page.dart

@@ -74,7 +74,7 @@ class CarbsResult extends StatelessWidget {
             color: Colors.white,
             child: SecondaryButton(
               label: TranslationBase.of(context).seeListOfDoctor,
-              color: CustomColors.accentColor,
+              color: CustomColors.primaryColor,
               onTap: () {
                 getDoctorsList(context);
               },

lib/pages/BookAppointment/BookSuccess.dart

@@ -711,6 +711,7 @@ class _BookSuccessState extends State<BookSuccess> {
               payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
               currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
               onFailed: (failureResult) async {
+                GifLoaderDialogUtils.hideDialog(context);
                 log("failureResult: ${failureResult.toString()}");
                 AppToast.showErrorToast(message: failureResult.toString());
               },

lib/pages/BookAppointment/DoctorProfile.dart

@@ -569,11 +569,15 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
     });
   }
 
-  navigateToLogin() {
+  navigateToLogin() async {
     ConfirmDialog.closeAlertDialog(context);
-    Navigator.of(context).pushNamed(
-      WELCOME_LOGIN,
-    );
+    var data = await sharedPref.getObject(IMEI_USER_DATA);
+    sharedPref.remove(REGISTER_DATA_FOR_LOGIIN);
+    if (data != null) {
+      Navigator.of(context).pushNamed(CONFIRM_LOGIN);
+    } else {
+      Navigator.of(context).pushNamed(LOGIN_TYPE);
+    }
   }
 
   Future navigateToBookConfirm(context) async {

lib/pages/BookAppointment/Search.dart

@@ -28,14 +28,14 @@ class _SearchState extends State<Search> with TickerProviderStateMixin {
 
   @override
   void initState() {
-    _tabController = new TabController(length: 2, vsync: this, initialIndex: widget.type);
+    _tabController = new TabController(length: 2, vsync: this, initialIndex: widget.type, );
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
     AppGlobal.context = context;
-    ProjectViewModel projectViewModel = Provider.of(context);
+  //  ProjectViewModel projectViewModel = Provider.of(context);
     GAnalytics.TREATMENT_TYPE = null; // reset treatment type on start new booking
 
     return AppScaffold(
@@ -56,13 +56,13 @@ class _SearchState extends State<Search> with TickerProviderStateMixin {
             unselectedLabelColor: Color(0xff575757),
             labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
             labelStyle: TextStyle(
-              fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
+              fontFamily: context.read<ProjectViewModel>().isArabic ? 'Cairo' : 'Poppins',
               fontSize: 16,
               fontWeight: FontWeight.w600,
               letterSpacing: -0.48,
             ),
             unselectedLabelStyle: TextStyle(
-              fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
+              fontFamily:  context.read<ProjectViewModel>().isArabic ? 'Cairo' : 'Poppins',
               fontSize: 16,
               fontWeight: FontWeight.w600,
               letterSpacing: -0.48,
@@ -70,13 +70,14 @@ class _SearchState extends State<Search> with TickerProviderStateMixin {
             tabs: [Text(TranslationBase.of(context).clinicName), Text(TranslationBase.of(context).doctorName)],
             onTap: (idx) {
               if (idx == 0)
-                projectViewModel.analytics.appointment.book_appointment_by_clinic();
+                context.read<ProjectViewModel>().analytics.appointment.book_appointment_by_clinic();
               else
-                projectViewModel.analytics.appointment.book_appointment_by_doctor();
+                context.read<ProjectViewModel>().analytics.appointment.book_appointment_by_doctor();
             },
           ),
           Expanded(
             child: TabBarView(
+
               physics: NeverScrollableScrollPhysics(),
               children: [
                 SearchByClinic(clnicIds: widget.clnicIds),

lib/pages/BookAppointment/SearchResults.dart

@@ -10,7 +10,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class SearchResults extends StatefulWidget {
+class SearchResults extends StatelessWidget {
   List<DoctorList> doctorsList = [];
   List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital;
   bool isLiveCareAppointment;
@@ -18,19 +18,16 @@ class SearchResults extends StatefulWidget {
   bool isDoctorNameSearch;
   OBGyneProcedureListResponse? obGyneProcedureListResponse;
 
-  SearchResults({required this.doctorsList, required this.patientDoctorAppointmentListHospital, this.isObGyneAppointment = false, this.isDoctorNameSearch = false, required this.isLiveCareAppointment,  this.obGyneProcedureListResponse});
-
-  @override
-  _SearchResultsState createState() => _SearchResultsState();
-}
-
-class _SearchResultsState extends State<SearchResults> {
-  List<DoctorList> tempList = [];
-  late ProjectViewModel projectViewModel;
+  SearchResults(
+      {required this.doctorsList,
+      required this.patientDoctorAppointmentListHospital,
+      this.isObGyneAppointment = false,
+      this.isDoctorNameSearch = false,
+      required this.isLiveCareAppointment,
+      this.obGyneProcedureListResponse});
 
   @override
   Widget build(BuildContext context) {
-    projectViewModel = Provider.of(context);
     return AppScaffold(
       appBarTitle: TranslationBase.of(context).bookAppo,
       isShowDecPage: false,
@@ -38,44 +35,47 @@ class _SearchResultsState extends State<SearchResults> {
       showNewAppBarTitle: true,
       showNewAppBar: true,
       backgroundColor: CustomColors.appBackgroudGrey2Color,
-      body: widget.patientDoctorAppointmentListHospital.isNotEmpty ? ListView.separated(
-        physics: BouncingScrollPhysics(),
-        separatorBuilder: (context, index) {
-          return Container(
-            height: 12,
-            margin: EdgeInsets.only(left: 21, right: 21),
-          );
-        },
-        itemBuilder: (context, index) {
-          return AppExpandableNotifier(
-            title: (widget.patientDoctorAppointmentListHospital[index].distanceInKMs != "0")
-                ? widget.patientDoctorAppointmentListHospital[index].filterName! + " - " + widget.patientDoctorAppointmentListHospital[index].distanceInKMs! + " " + TranslationBase.of(context).km
-                : widget.patientDoctorAppointmentListHospital[index].filterName,
-            isTitleSingleLine: false,
-            isExpand: widget.patientDoctorAppointmentListHospital.length == 1 ? true : false,
-            bodyWidget: ListView.separated(
-                shrinkWrap: true,
-                physics: NeverScrollableScrollPhysics(),
-                padding: EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
-                itemBuilder: (context, _index) {
-                  final doctor = widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList![_index];
-                  return DoctorView(
-                      doctor: doctor,
-                      isLiveCareAppointment: widget.isLiveCareAppointment,
-                      isObGyneAppointment: widget.isObGyneAppointment,
-                      isDoctorNameSearch: widget.isDoctorNameSearch,
-                      obGyneProcedureListResponse: widget.obGyneProcedureListResponse,
-                      isShowDate: false,
-                      onTap: () {
-                        projectViewModel.analytics.appointment.book_appointment_select_doctor(appointment_type: 'regular', doctor: doctor);
-                      });
-                },
-                separatorBuilder: (context, index) => SizedBox(height: 14),
-                itemCount: widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList!.length),
-          );
-        },
-        itemCount: widget.patientDoctorAppointmentListHospital.length,
-      ) : getNoDataWidget(context),
+      body: patientDoctorAppointmentListHospital.isNotEmpty
+          ? ListView.separated(
+              addAutomaticKeepAlives: true,
+              physics: BouncingScrollPhysics(),
+              separatorBuilder: (context, index) {
+                return Container(
+                  height: 12,
+                  margin: EdgeInsets.only(left: 21, right: 21),
+                );
+              },
+              itemBuilder: (context, index) {
+                return AppExpandableNotifier(
+                  title: (patientDoctorAppointmentListHospital[index].distanceInKMs != "0")
+                      ? patientDoctorAppointmentListHospital[index].filterName! + " - " + patientDoctorAppointmentListHospital[index].distanceInKMs! + " " + TranslationBase.of(context).km
+                      : patientDoctorAppointmentListHospital[index].filterName,
+                  isTitleSingleLine: false,
+                  isExpand: patientDoctorAppointmentListHospital.length == 1 ? true : false,
+                  bodyWidget: ListView.separated(
+                      shrinkWrap: true,
+                      physics: NeverScrollableScrollPhysics(),
+                      padding: EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
+                      itemBuilder: (context, _index) {
+                        final doctor = patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList![_index];
+                        return DoctorView(
+                            doctor: doctor,
+                            isLiveCareAppointment: isLiveCareAppointment,
+                            isObGyneAppointment: isObGyneAppointment,
+                            isDoctorNameSearch: isDoctorNameSearch,
+                            obGyneProcedureListResponse: obGyneProcedureListResponse,
+                            isShowDate: false,
+                            onTap: () {
+                              context.read<ProjectViewModel>().analytics.appointment.book_appointment_select_doctor(appointment_type: 'regular', doctor: doctor);
+                            });
+                      },
+                      separatorBuilder: (context, index) => SizedBox(height: 14),
+                      itemCount: patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList!.length),
+                );
+              },
+              itemCount: patientDoctorAppointmentListHospital.length,
+            )
+          : getNoDataWidget(context),
     );
   }
 }

lib/pages/BookAppointment/book_reminder_page.dart

@@ -4,6 +4,8 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart
 import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart';
 import 'package:diplomaticquarterapp/models/header_model.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/reminder_dialog.dart';
+import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
+import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart';
 import 'package:diplomaticquarterapp/theme/colors.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@@ -17,6 +19,7 @@ import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 
+import '../MyAppointments/MyAppointments.dart';
 import 'BookSuccess.dart';
 
 class BookReminderPage extends StatefulWidget {
@@ -206,18 +209,13 @@ class _BookReminderPageState extends State<BookReminderPage> {
   }
 
   Future navigateToBookSuccess(BuildContext context) async {
-    Navigator.push(
+    Navigator.pop(context, null);
+    Navigator.pushAndRemoveUntil(
       context,
-      FadePage(
-        page: BookSuccess(
-          docObject: widget.docObject,
-          patientShareResponse: widget.patientShareResponse,
-          appoDateFormatted: widget.appoDateFormatted,
-          appoTimeFormatted: widget.appoTimeFormatted,
-          isCash: widget.isCash,
-        ),
-      ),
+      MaterialPageRoute(builder: (context) => LandingPage()),
+          (Route<dynamic> route) => false,
     );
+    Navigator.push(context, FadePage(page: MyAppointments()));
   }
 
   Future<Map<Permission, PermissionStatus>> requestPermissions() async {

lib/pages/BookAppointment/components/DocAvailableAppointments.dart

@@ -395,6 +395,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
       GifLoaderDialogUtils.hideDialog(context);
       if (res['MessageStatus'] == 1) {
         if (res['PatientER_DoctorFreeSlots'].length != 0) {
+          DocAvailableAppointments.initialSlotDuration = res['InitialSlotDuration'];
           DocAvailableAppointments.areAppointmentsAvailable = true;
           freeSlotsResponse = res['PatientER_DoctorFreeSlots'];
           _getJSONSlots().then((value) => {

lib/pages/BookAppointment/components/LaserClinic.dart

@@ -205,7 +205,7 @@ class _LaserClinicState extends State<LaserClinic> with SingleTickerProviderStat
 
   callDoctorsSearchAPI() {
     int languageID = projectViewModel.isArabic ? 1 : 2;
-    GifLoaderDialogUtils.showMyDialog(context);
+    GifLoaderDialogUtils.showMyDialog(context, barrierDismissible: false);
     List<DoctorList> doctorsList = [];
     List<String> arr = [];
     List<String> arrDistance = [];

lib/pages/BookAppointment/components/LiveCareBookAppointment.dart

@@ -69,7 +69,7 @@ class _LiveCareBookAppointmentState extends State<LiveCareBookAppointment> {
                             width: 150.0),
                       ),
                       Container(
-                        margin: EdgeInsets.only(left: 10.0, right: 10.0),
+                        margin: EdgeInsets.only(left: 10.0, right: 8.0),
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [

lib/pages/BookAppointment/components/SearchByClinic.dart

@@ -60,7 +60,6 @@ class _SearchByClinicState extends State<SearchByClinic> {
   final GlobalKey clinicDropdownKey = GlobalKey();
   final GlobalKey projectDropdownKey = GlobalKey();
   TextEditingController ageController = new TextEditingController();
-  late ProjectViewModel projectViewModel;
 
   String radioValue = "";
 
@@ -70,15 +69,14 @@ class _SearchByClinicState extends State<SearchByClinic> {
   void initState() {
     locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
     WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList());
+    checkPVM();
     super.initState();
   }
 
-  @override
-  Widget build(BuildContext context) {
-    projectViewModel = Provider.of(context);
-    if (projectViewModel.isLogin) {
+  void checkPVM(){
+    if (context.read<ProjectViewModel>().isLogin) {
       if (radioValue == null) {
-        if (projectViewModel.user.gender == 1) {
+        if (context.read<ProjectViewModel>().user.gender == 1) {
           radioValue = TranslationBase.of(context).male;
         } else {
           radioValue = TranslationBase.of(context).female;
@@ -88,16 +86,20 @@ class _SearchByClinicState extends State<SearchByClinic> {
       radioValue = TranslationBase.of(context).female;
     }
     if (ageController.text.isEmpty) {
-      ageController.text = projectViewModel.isLogin ? projectViewModel.user!.age.toString() : "";
+      ageController.text = context.read<ProjectViewModel>().isLogin ? context.read<ProjectViewModel>().user!.age.toString() : "";
       ageController.selection = TextSelection.fromPosition(TextPosition(offset: ageController.text.length));
     }
 
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return Container(
       child: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            if (projectViewModel.isLogin)
+            if (context.read<ProjectViewModel>().isLogin)
               Column(
                 children: [
                   Padding(
@@ -246,7 +248,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
                             if (!nearestAppo) getDoctorsList(context);
                           } else {}
                         });
-                        projectViewModel.analytics.appointment.book_appointment_select_clinic(appointment_type: 'regular', clinic: clincs.clinicDescription);
+                        context.read<ProjectViewModel>().analytics.appointment.book_appointment_select_clinic(appointment_type: 'regular', clinic: clincs.clinicDescription);
                       });
                     },
                     child: Container(
@@ -330,7 +332,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
                                         }).toList(),
                                         onChanged: (HospitalsModel? newValue) async {
                                           setState(() {
-                                           HospitalsModel tempselectedHospital = new HospitalsModel.fromJson(newValue!.toJson());
+                                            HospitalsModel tempselectedHospital = new HospitalsModel.fromJson(newValue!.toJson());
                                             projectDropdownValue = newValue.mainProjectID.toString();
                                             if (dropdownValue!.split("-")[0] == "253") {
                                               Navigator.push(
@@ -495,7 +497,6 @@ class _SearchByClinicState extends State<SearchByClinic> {
   }
 
   getClinicsList() async {
-    GifLoaderDialogUtils.showMyDialog(context);
     if (await sharedPref.getObject(CLINICS_LIST) != null) {
       dynamic res = await sharedPref.getObject(CLINICS_LIST);
       setState(() {
@@ -505,8 +506,9 @@ class _SearchByClinicState extends State<SearchByClinic> {
         });
       });
       getProjectsList();
-      GifLoaderDialogUtils.hideDialog(context);
+      // GifLoaderDialogUtils.hideDialog(context);
     } else {
+      GifLoaderDialogUtils.showMyDialog(context);
       ClinicListService service = new ClinicListService();
       service.getClinicsList(context).then((res) {
         if (res['MessageStatus'] == 1) {
@@ -527,7 +529,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
   }
 
   getProjectsList() {
-    int languageID = projectViewModel.isArabic ? 1 : 2;
+    int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
     ClinicListService service = new ClinicListService();
     List<HospitalsModel> projectsListLocal = [];
     service
@@ -563,8 +565,8 @@ class _SearchByClinicState extends State<SearchByClinic> {
       searchInfo.clinic = selectedClinic;
       searchInfo.date = DateTime.now();
 
-      if (projectViewModel.isLogin) {
-        if (projectViewModel.user.age! > 12) {
+      if (context.read<ProjectViewModel>().isLogin) {
+        if (context.read<ProjectViewModel>().user.age! > 12) {
           navigateToDentalComplaints(context, searchInfo);
         } else {
           callDoctorsSearchAPI(17);
@@ -601,7 +603,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
   }
 
   callDoctorsSearchAPI(int clinicID) {
-    int languageID = projectViewModel.isArabic ? 1 : 2;
+    int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
     GifLoaderDialogUtils.showMyDialog(context);
     List<DoctorList> doctorsList = [];
     List<String> arr = [];

lib/pages/BookAppointment/components/SearchByDoctor.dart

@@ -20,7 +20,6 @@ class SearchByDoctor extends StatefulWidget {
 class _SearchByDoctorState extends State<SearchByDoctor> {
   TextEditingController doctorNameController = new TextEditingController();
   late bool _isButtonDisabled;
-  late ProjectViewModel projectViewModel;
 
   @override
   void initState() {
@@ -30,7 +29,6 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
 
   @override
   Widget build(BuildContext context) {
-    projectViewModel = Provider.of(context);
     return Column(
       children: [
         Expanded(
@@ -73,7 +71,7 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
         minWidth: MediaQuery.of(context).size.width,
         height: 45.0,
         child: CustomTextButton(
-          backgroundColor: CustomColors.accentColor,
+          backgroundColor: CustomColors.primaryColor,
           elevation: 0,
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(6),
@@ -90,7 +88,7 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
   }
 
   getDoctorsList(BuildContext context) {
-    int languageID = projectViewModel.isArabic ? 1 : 2;
+    int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
     GifLoaderDialogUtils.showMyDialog(context);
     List<DoctorList> doctorsList = [];
     DoctorsListService service = new DoctorsListService();
@@ -150,7 +148,7 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
 
   _searchDoctor(BuildContext context) {
     getDoctorsList(context);
-    projectViewModel.analytics.appointment.book_appointment_doctor_search(query: doctorNameController.text);
+    context.read<ProjectViewModel>().analytics.appointment.book_appointment_doctor_search(query: doctorNameController.text);
   }
 
   navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) {

lib/pages/BookAppointment/widgets/DoctorView.dart

@@ -23,7 +23,7 @@ import 'package:provider/provider.dart';
 
 import '../DoctorProfile.dart';
 
-class DoctorView extends StatelessWidget {
+class DoctorView extends StatefulWidget {
   final DoctorList doctor;
   bool? isLiveCareAppointment;
   bool isObGyneAppointment;
@@ -36,7 +36,7 @@ class DoctorView extends StatelessWidget {
 
   DoctorView(
       {required this.doctor,
-       this.isLiveCareAppointment,
+      this.isLiveCareAppointment,
       this.isObGyneAppointment = false,
       this.isDoctorNameSearch = false,
       this.isContinueDentalPlan = false,
@@ -45,23 +45,29 @@ class DoctorView extends StatelessWidget {
       this.onTap,
       this.obGyneProcedureListResponse});
 
+  @override
+  State<DoctorView> createState() => _DoctorViewState();
+}
+
+class _DoctorViewState extends State<DoctorView> with AutomaticKeepAliveClientMixin {
   late ProjectViewModel projectViewModel;
 
   @override
   Widget build(BuildContext context) {
     projectViewModel = Provider.of(context);
+    super.build(context);
     return InkWell(
       onTap: () {
-        if (isObGyneAppointment) {
+        if (widget.isObGyneAppointment) {
           next(context);
         } else {
           // if (doctor.clinicID == 17 && isDoctorNameSearch) {
           //   showDentalChiefComplaintsList(context);
           // } else
-          if (isShowFlag) {
-            getDoctorsProfile(context, doctor, isAppo: true, isContinueDentalPlan: isContinueDentalPlan);
+          if (widget.isShowFlag) {
+            getDoctorsProfile(context, widget.doctor, isAppo: true, isContinueDentalPlan: widget.isContinueDentalPlan);
           }
-          (onTap ?? () {})(); // For log analytics of doctor click from book appointment
+          (widget.onTap ?? () {})(); // For log analytics of doctor click from book appointment
         }
       },
       child: Container(
@@ -88,23 +94,25 @@ class DoctorView extends StatelessWidget {
                 children: [
                   Expanded(
                     child: Text(
-                      doctor.name!,
+                      widget.doctor.name ?? "",
                       style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
                     ),
                   ),
-                  isShowDate ? Text(
-                    DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(doctor.date)),
-                    style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
-                  ) : Container(),
+                  widget.isShowDate
+                      ? Text(
+                          DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(widget.doctor.date)),
+                          style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
+                        )
+                      : Container(),
                 ],
               ),
-              if (doctor.doctorTitle != null) SizedBox(height: 6),
+              if (widget.doctor.doctorTitle != null) SizedBox(height: 6),
               Row(
                 mainAxisSize: MainAxisSize.min,
                 children: <Widget>[
                   LargeAvatar(
-                    name: doctor.name!,
-                    url: doctor.doctorImageURL!,
+                    name: widget.doctor.name ?? "",
+                    url: widget.doctor.doctorImageURL!,
                     width: 48,
                     height: 48,
                   ),
@@ -114,17 +122,25 @@ class DoctorView extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       mainAxisSize: MainAxisSize.min,
                       children: <Widget>[
-                        if (doctor.clinicName != null) MyRichText(TranslationBase.of(context).clinic + ":", doctor.clinicName!, projectViewModel.isArabic),
-                        if (doctor.projectName != null) MyRichText(TranslationBase.of(context).branch, doctor.projectName!, projectViewModel.isArabic),
-                        if (doctor.speciality != null && doctor.speciality!.length > 0)
-                          Text(
-                            this.doctor.speciality![0].trim(),
-                            // getDoctorSpeciality(this.doctor.speciality).trim(),
-                            style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 18 / 12),
-                          ),
-                        if (doctor.nearestFreeSlot != null)
+                        if (widget.doctor.clinicName != null) MyRichText(TranslationBase.of(context).clinic + ":", widget.doctor.clinicName!, context.read<ProjectViewModel>().isArabic),
+                        if (widget.doctor.projectName != null) MyRichText(TranslationBase.of(context).branch, widget.doctor.projectName!, context.read<ProjectViewModel>().isArabic),
+                        if (!projectViewModel.isArabic)
+                          if (widget.doctor.speciality != null && widget.doctor.speciality!.length > 0)
+                            Text(
+                              this.widget.doctor.speciality![0].trim(),
+                              // getDoctorSpeciality(this.doctor.speciality).trim(),
+                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 18 / 12),
+                            ),
+                        if (projectViewModel.isArabic)
+                          if (widget.doctor.specialityN != null && widget.doctor.specialityN!.length > 0)
+                            Text(
+                              this.widget.doctor.specialityN![0].trim(),
+                              // getDoctorSpeciality(this.doctor.speciality).trim(),
+                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 18 / 12),
+                            ),
+                        if (widget.doctor.nearestFreeSlot != null)
                           Text(
-                            getDate(doctor.nearestFreeSlot),
+                            getDate(widget.doctor.nearestFreeSlot),
                             style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff359846), letterSpacing: -0.48, height: 18 / 12),
                           ),
                         Row(
@@ -140,9 +156,18 @@ class DoctorView extends StatelessWidget {
                               itemSize: 20,
                               ignoreGestures: true,
                               ratingWidget: RatingWidget(
-                                full: Icon(Icons.star,  color: CustomColors.accentColor,),
-                                half: Icon(Icons.star_half,  color: CustomColors.accentColor,),
-                                empty: Icon(Icons.star,  color: CustomColors.accentColor,),
+                                full: Icon(
+                                  Icons.star,
+                                  color: CustomColors.accentColor,
+                                ),
+                                half: Icon(
+                                  Icons.star_half,
+                                  color: CustomColors.accentColor,
+                                ),
+                                empty: Icon(
+                                  Icons.star,
+                                  color: CustomColors.accentColor,
+                                ),
                               ),
                               tapOnlyMode: true,
                               itemPadding: EdgeInsets.symmetric(horizontal: 4.0),
@@ -161,7 +186,7 @@ class DoctorView extends StatelessWidget {
                             //   filledIcon: Icons.star,
                             //   emptyIcon: Icons.star_border,
                             // ),
-                            if (isShowFlag)
+                            if (widget.isShowFlag)
                               Icon(
                                 Icons.arrow_forward,
                                 color: Theme.of(context).primaryColor,
@@ -183,13 +208,13 @@ class DoctorView extends StatelessWidget {
 
   showDentalChiefComplaintsList(BuildContext context) {
     HospitalsModel selectedHospital = new HospitalsModel();
-    selectedHospital.name = doctor.projectName;
+    selectedHospital.name = widget.doctor.projectName;
     ListClinicCentralized selectedClinic = new ListClinicCentralized();
-    selectedClinic.clinicDescription = doctor.clinicName;
+    selectedClinic.clinicDescription = widget.doctor.clinicName;
 
     SearchInfo searchInfo = new SearchInfo();
-    searchInfo.ProjectID = doctor.projectID;
-    searchInfo.ClinicID = doctor.clinicID;
+    searchInfo.ProjectID = widget.doctor.projectID;
+    searchInfo.ClinicID = widget.doctor.clinicID;
     searchInfo.date = DateTime.now();
     searchInfo.hospital = selectedHospital;
     searchInfo.clinic = selectedClinic;
@@ -231,7 +256,7 @@ class DoctorView extends StatelessWidget {
       }
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);
-      AppToast.showErrorToast(message: err);
+      AppToast.showErrorToast(message: err, localContext: context);
       print(err);
     });
   }
@@ -260,8 +285,14 @@ class DoctorView extends StatelessWidget {
   }
 
   void next(BuildContext context) {
-    Navigator.push(context,
-        FadePage(page: ObGyneTimeSlots(projectID: doctor.projectID!, selectedClinicID: doctor.clinicID!, selectedDoctorID: doctor.doctorID!, obGyneProcedureListResponse: obGyneProcedureListResponse!)));
+    Navigator.push(
+        context,
+        FadePage(
+            page: ObGyneTimeSlots(
+                projectID: widget.doctor.projectID!,
+                selectedClinicID: widget.doctor.clinicID!,
+                selectedDoctorID: widget.doctor.doctorID!,
+                obGyneProcedureListResponse: widget.obGyneProcedureListResponse!)));
   }
 
   Future navigateToDoctorProfile(context, docObject, docProfile, {isAppo, bool isContinueDentalPlan = false}) async {
@@ -270,13 +301,17 @@ class DoctorView extends StatelessWidget {
       FadePage(
         page: DoctorProfile(
           doctor: docObject,
-          isLiveCareAppointment: isLiveCareAppointment!,
+          isLiveCareAppointment: widget.isLiveCareAppointment!,
           docProfileList: docProfile,
           isOpenAppt: isAppo,
-          isDoctorNameSearch: isDoctorNameSearch,
+          isDoctorNameSearch: widget.isDoctorNameSearch,
           isContinueDentalPlan: isContinueDentalPlan,
         ),
       ),
     );
   }
+
+  @override
+  // TODO: implement wantKeepAlive
+  bool get wantKeepAlive => true;
 }

lib/pages/BookAppointment/widgets/reminder_dialog.dart

@@ -5,6 +5,8 @@ import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/services/permission/permission_service.dart';
 import 'package:diplomaticquarterapp/theme/colors.dart';
 import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@@ -19,16 +21,16 @@ Future<Map<Permission, PermissionStatus>> requestPermissions() async {
 }
 
 showReminderDialog(BuildContext context, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted,
-    {required Function onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess}) async {
+    {required Function() onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool isMultiAllowed = false}) async {
   if (Platform.isAndroid) {
     if (await PermissionService.isCalendarPermissionEnabled()) {
       _showReminderDialog(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted,
-          onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess ?? (int) {});
+          onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed);
     } else {
       Utils.showPermissionConsentDialog(context, TranslationBase.of(context).calendarPermission, () async {
         if (await Permission.calendarFullAccess.request().isGranted) {
           _showReminderDialog(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted,
-              onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess ?? (int) {});
+              onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed);
         }
       });
     }
@@ -36,14 +38,14 @@ showReminderDialog(BuildContext context, DateTime dateTime, String doctorName, S
     if (await Permission.calendarWriteOnly.request().isGranted) {
       if (await Permission.calendarFullAccess.request().isGranted) {
         _showReminderDialog(context, dateTime, doctorName, eventId, appoDateFormatted, appoTimeFormatted,
-            onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess ?? (int) {});
+            onSuccess: onSuccess, title: title, description: description, onMultiDateSuccess: onMultiDateSuccess, isMultiAllowed: isMultiAllowed);
       }
     }
   }
 }
 
 Future<void> _showReminderDialog(BuildContext context, DateTime dateTime, String doctorName, String eventId, String appoDateFormatted, String appoTimeFormatted,
-    {required Function onSuccess, String? title, String? description, required Function(int) onMultiDateSuccess}) async {
+    {required Function onSuccess, String? title, String? description, Function(int)? onMultiDateSuccess, bool? isMultiAllowed}) async {
   return showDialog<void>(
     context: context,
     barrierDismissible: true, // user must tap button!
@@ -52,6 +54,7 @@ Future<void> _showReminderDialog(BuildContext context, DateTime dateTime, String
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0.0)),
         insetPadding: EdgeInsets.all(21),
         child: ReminderDialog(
+          shouldPop: false,
           onClick: (int i) async {
             String text = "";
             if (i == 0) {
@@ -75,22 +78,19 @@ Future<void> _showReminderDialog(BuildContext context, DateTime dateTime, String
               dateTime = Jiffy.parseFromDateTime(dateTime).subtract(hours: 2).dateTime;
               text = "2 hours";
             }
-
-            if (onMultiDateSuccess.call(i) == null) {
-              try {
+            if (!isMultiAllowed!) {
+              if (onMultiDateSuccess == null) {
                 CalendarUtils calendarUtils = await CalendarUtils.getInstance();
                 await calendarUtils.createOrUpdateEvent(
                     title: title ?? TranslationBase.of(context).reminderTitle + " " + doctorName,
                     description: description ?? "At " + appoDateFormatted + " " + appoTimeFormatted,
                     scheduleDateTime: dateTime,
                     eventId: eventId);
-
+                Navigator.of(context).pop();
                 onSuccess();
-              } catch (e) {
-                print(e);
               }
             } else {
-              onMultiDateSuccess(i);
+              onMultiDateSuccess!(i);
             }
             locator<GAnalytics>().appointment.appointment_reminder_time(reminde_before: text);
           },
@@ -102,8 +102,9 @@ Future<void> _showReminderDialog(BuildContext context, DateTime dateTime, String
 
 class ReminderDialog extends StatefulWidget {
   Function? onClick;
+  bool? shouldPop;
 
-  ReminderDialog({this.onClick});
+  ReminderDialog({this.onClick, this.shouldPop = true});
 
   @override
   _ReminderDialogState createState() => _ReminderDialogState();
@@ -249,7 +250,9 @@ class _ReminderDialogState extends State<ReminderDialog> {
             TranslationBase.of(context).save,
             () {
               widget.onClick!(i);
-              Navigator.pop(context);
+              if(widget.shouldPop == true) {
+                Navigator.pop(context);
+              }
             },
             color: CustomColors.green,
           ),

lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart

@@ -1,6 +1,7 @@
 import 'package:diplomaticquarterapp/core/viewModels/contactus/livechat_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/theme/theme_value.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -110,7 +111,7 @@ class _HospitalsLiveChatPageState extends State<HospitalsLiveChatPage> {
                 TranslationBase.of(context).start,
                 //Changed By Aamir URL
                 chat!.isEmpty ? null : () => {launch(chat!)},
-                color: Color(0xffD02127),
+                color: appColor,
                 textColor: chat!.isEmpty ? Color(0xff000000) : Colors.white,
                 disabledColor: Color(0xffEAEAEA),
               ),

lib/pages/DrawerPages/family/my-family.dart

@@ -462,7 +462,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     // Utils.showProgressDialog(context);
     this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, languageID, mainUser: user is AuthenticatedUser).then((value) => loginAfter(value, context)).catchError((err) {
       print("err:$err");
-      AppToast.showErrorToast(message: err.toString());
+      AppToast.showErrorToast(message: err.toString(), localContext: context);
       Navigator.of(context).pop();
     });
   }
@@ -476,7 +476,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     var mainUser = await sharedPref.getObject(MAIN_USER);
     var loginType = await sharedPref.getInt(LAST_LOGIN);
     var pushToken = await sharedPref.getString(PUSH_TOKEN);
-    var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN);
+    // var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN ?? "");
     this.sharedPref.clear();
     if (mainUser["PatientID"] != result.list.patientID) {
       result.list.isFamily = true;
@@ -484,7 +484,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     this.sharedPref.setString(APP_LANGUAGE, currentLang);
     this.sharedPref.setString(BLOOD_TYPE, bloodType);
     this.sharedPref.setString(PUSH_TOKEN, pushToken);
-    this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
+    // this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
     this.sharedPref.setInt(LAST_LOGIN, loginType ?? 1);
     await this.sharedPref.setObject(MAIN_USER, mainUser);
     await this.sharedPref.setObject(USER_PROFILE, result.list);
@@ -497,6 +497,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     Provider.of<ProjectViewModel>(context, listen: false).setUser(result.list);
     Provider.of<ProjectViewModel>(context, listen: false).authenticatedUserObject.user = result.list;
 
+    await this.sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
+
     try {
       // await appointmentRateViewModel.getIsLastAppointmentRatedList();
       await getToDoCount();

lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart

@@ -243,7 +243,7 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
                                 width: 8,
                                 height: 8,
                                 decoration: containerRadius(
-                                  CustomColors.accentColor,
+                                  CustomColors.primaryColor,
                                   100,
                                 ),
                               ),

lib/pages/ErService/OrderLogPage.dart

@@ -226,7 +226,7 @@ class OrderLogPage extends StatelessWidget {
                               width: 8,
                               height: 8,
                               decoration: containerRadius(
-                                CustomColors.accentColor,
+                                CustomColors.primaryColor,
                                 100,
                               ),
                             ),

lib/pages/ErService/rapid-response-team/rrt-request-page.dart

@@ -366,7 +366,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
                 else
                   AppToast.showErrorToast(message: TranslationBase.of(context).pleaseAcceptTerms);
               },
-              color: acceptTerms ? CustomColors.accentColor : Colors.grey,
+              color: acceptTerms ? CustomColors.primaryColor : Colors.grey,
             ),
           ),
         ],

lib/pages/MyAppointments/AppointmentDetails.dart

@@ -14,6 +14,7 @@ import 'package:diplomaticquarterapp/pages/MyAppointments/SchedulePage.dart';
 import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
 import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
 import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/theme/theme_value.dart';
 import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@@ -120,6 +121,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
                       widget.appo.clinicID == 23 ||
                       widget.appo.clinicID == 265 ||
                       widget.appo.clinicID == 134 ||
+                      widget.appo.clinicID == 253 ||
                       widget.appo.isExecludeDoctor! ||
                       widget.appo.isLiveCareAppointment!)
                   ? false
@@ -158,6 +160,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
                           widget.appo.clinicID == 253 ||
                           widget.appo.clinicID == 265 ||
                           widget.appo.clinicID == 134 ||
+                          widget.appo.clinicID == 253 ||
                           widget.appo.isExecludeDoctor! ||
                           widget.appo.isLiveCareAppointment!) {
                         _tabController!.index = _tabController!.previousIndex;
@@ -175,6 +178,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
                           widget.appo.clinicID == 47 ||
                           widget.appo.clinicID == 265 ||
                           widget.appo.clinicID == 253 ||
+                          widget.appo.clinicID == 134 ||
                           widget.appo!.isExecludeDoctor! ||
                           widget.appo!.isLiveCareAppointment!
                       ? Tab(
@@ -269,7 +273,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
               TranslationBase.of(context).reviewAppointment,
               goToBookConfirm,
               // DocAvailableAppointments.areSlotsAvailable ? goToBookConfirm : null,
-              color: Color(0xFFD02127),
+              color: appColor,
               disabledColor: Color(0xff28323A).withOpacity(0.3),
             ),
           ),
@@ -386,15 +390,15 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
                                 ratingWidget: RatingWidget(
                                   full: Icon(
                                     Icons.star,
-                                    color: CustomColors.accentColor,
+                                    color: CustomColors.primaryColor,
                                   ),
                                   half: Icon(
                                     Icons.star_half,
-                                    color: CustomColors.accentColor,
+                                    color: CustomColors.primaryColor,
                                   ),
                                   empty: Icon(
                                     Icons.star,
-                                    color: CustomColors.accentColor,
+                                    color: CustomColors.primaryColor,
                                   ),
                                 ),
                                 tapOnlyMode: true,

lib/pages/MyAppointments/MyAppointments.dart

@@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.
 import 'package:diplomaticquarterapp/pages/MyAppointments/models/AppointmentType.dart';
 import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
 import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
+import 'package:diplomaticquarterapp/theme/theme_value.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
@@ -507,7 +508,7 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
             height: 22,
             child: Radio(
               value: _value,
-              activeColor: _value == _currentPage ? Color(0xffD02127) : Color(0xffE8E8E8),
+              activeColor: _value == _currentPage ? appColor : Color(0xffE8E8E8),
               groupValue: _currentPage,
               onChanged: (index) {
                 setState(() {

lib/pages/MyAppointments/SchedulePage.dart

@@ -66,7 +66,7 @@ class _SchedulePageState extends State<SchedulePage> {
 
                 this.generateWeeksSchedules();
               } else if (model2.freeSlots.length == 0 && model2.state == ViewState.Idle) {
-                AppToast.showErrorToast(message: TranslationBase.of(context).emptySchedule);
+                AppToast.showErrorToast(message: TranslationBase.of(context).emptySchedule, localContext: context);
                 Navigator.pop(context);
               }
               return AppScaffold(

lib/pages/MyAppointments/models/ArrivedButtons.dart

@@ -21,35 +21,11 @@ class ArrivedButtons {
       "icon": 'lab_result.svg',
       "caller": "labResult",
     },
-    {
-      "title": TranslationBase.of(AppGlobal.context).vitalSigns,
-      "subtitle": TranslationBase.of(AppGlobal.context).vitalSignsSubtitle,
-      "icon": 'vital_signs.svg',
-      "caller": "VitalSigns",
-    },
-    {
-      "title": TranslationBase.of(AppGlobal.context).raise,
-      "subtitle": TranslationBase.of(AppGlobal.context).complaint,
-      "icon": "raise_comp.svg",
-      "caller": "insertComplaint",
-    },
-    {
-      "title": TranslationBase.of(AppGlobal.context).insuranceApproval,
-      "subtitle": TranslationBase.of(AppGlobal.context).insuranceApprovalSubtitle,
-      "icon": 'insurance_approval.svg',
-      "caller": "Insurance",
-    },
     {
       "title": TranslationBase.of(AppGlobal.context).askDoctor,
       "subtitle": TranslationBase.of(AppGlobal.context).service,
       "icon": 'ask_doctor.svg',
       "caller": "askDoc",
     },
-    {
-      "title": TranslationBase.of(AppGlobal.context).service,
-      "subtitle": TranslationBase.of(AppGlobal.context).appoSurvey,
-      "icon": "survey.svg",
-      "caller": "Survey",
-    }
   ];
 }

lib/pages/MyAppointments/widgets/AppointmentActions.dart

@@ -80,11 +80,12 @@ class _AppointmentActionsState extends State<AppointmentActions> {
       shrinkWrap: true,
       itemBuilder: (context, index) {
         // bool shouldEnable = ((widget.appo.clinicID == 17 || widget.appo.clinicID == 47) || (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc") || appoButtonsList[index].caller == "openReschedule");
-        bool shouldEnable = (((widget.appo.clinicID == 17 || widget.appo.clinicID == 47 || widget.appo.clinicID == 134) && appoButtonsList[index].caller == "openReschedule") ||
-            (widget.appo.isLiveCareAppointment! && appoButtonsList[index].caller == "askDoc") ||
-            (Utils.isVidaPlusProject(projectViewModel, widget.appo.projectID) &&
-                widget.appo.clinicID == 10 &&
-                (appoButtonsList[index].caller == "prescriptions" || appoButtonsList[index].caller == "radiology" || appoButtonsList[index].caller == "labResult")));
+        bool shouldEnable =
+            (((widget.appo.clinicID == 17 || widget.appo.clinicID == 47 || widget.appo.clinicID == 134 || widget.appo.clinicID == 253) && appoButtonsList[index].caller == "openReschedule") ||
+                (widget.appo.isLiveCareAppointment! && appoButtonsList[index].caller == "askDoc") ||
+                (Utils.isVidaPlusProject(projectViewModel, widget.appo.projectID) &&
+                    widget.appo.clinicID == 10 &&
+                    (appoButtonsList[index].caller == "prescriptions" || appoButtonsList[index].caller == "radiology" || appoButtonsList[index].caller == "labResult")));
         return InkWell(
           onTap: shouldEnable
               ? null
@@ -424,7 +425,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);
       print(err);
-      AppToast.showErrorToast(message: TranslationBase.of(context).noResultFound);
+      AppToast.showErrorToast(message: TranslationBase.of(context).noResultFound, localContext: context);
     });
   }
 
@@ -499,7 +500,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
         if (res['PatientDoctorAppointmentResultList'].length != 0) {
           getCallRequestType();
         } else {
-          AppToast.showErrorToast(message: TranslationBase.of(context).askDocNotAllowed);
+          AppToast.showErrorToast(message: TranslationBase.of(context).askDocNotAllowed, localContext: context);
         }
       }).catchError((err) {
         GifLoaderDialogUtils.hideDialog(context);

lib/pages/ToDoList/ToDo.dart

@@ -55,6 +55,7 @@ import 'package:provider/provider.dart';
 class ToDo extends StatefulWidget {
   PatientShareResponse? patientShareResponse;
   var languageID;
+
   // MyInAppBrowser? browser;
   bool? isShowAppBar = true;
   Function()? onBackClick;
@@ -176,189 +177,206 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
                           title: TranslationBase.of(context).appointments,
                           bodyWidget: appoList.length != 0
                               ? ListView.builder(
-                            scrollDirection: Axis.vertical,
-                            shrinkWrap: true,
-                            physics: ScrollPhysics(),
-                            padding: EdgeInsets.all(0.0),
-                            itemCount: appoList.length,
-                            itemBuilder: (context, index) {
-                              return Container(
-                                width: double.infinity,
-                                margin: EdgeInsets.only(left: 12.0, right: 12.0, top: 12.0),
-                                decoration: cardRadius(12),
-                                padding: EdgeInsets.all(16),
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Row(
-                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                      children: [
-                                        Expanded(
-                                          flex: 2,
-                                          child: Row(
-                                            crossAxisAlignment: CrossAxisAlignment.start,
+                                  scrollDirection: Axis.vertical,
+                                  shrinkWrap: true,
+                                  physics: ScrollPhysics(),
+                                  padding: EdgeInsets.all(0.0),
+                                  itemCount: appoList.length,
+                                  itemBuilder: (context, index) {
+                                    return Container(
+                                      width: double.infinity,
+                                      margin: EdgeInsets.only(left: 12.0, right: 12.0, top: 12.0),
+                                      decoration: cardRadius(12),
+                                      padding: EdgeInsets.all(16),
+                                      child: Column(
+                                        crossAxisAlignment: CrossAxisAlignment.start,
+                                        children: [
+                                          Row(
+                                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                             children: [
-                                              Padding(
-                                                padding: const EdgeInsets.only(top: 4.0),
-                                                child: appoList[index].clinicID == 265
-                                                    ? Container(
-                                                  margin: EdgeInsets.only(left: 5.0, right: 5.0),
-                                                  child: SvgPicture.asset("assets/images/new/CoronaIcon.svg", width: 35.0, height: 35.0),
-                                                )
-                                                    : appoList[index].isLiveCareAppointment!
-                                                    ? SvgPicture.asset("assets/images/new/virtual.svg")
-                                                    : SvgPicture.asset("assets/images/new/hospital-visit.svg"),
+                                              Expanded(
+                                                flex: 2,
+                                                child: Row(
+                                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                                  children: [
+                                                    Padding(
+                                                      padding: const EdgeInsets.only(top: 4.0),
+                                                      child: appoList[index].clinicID == 265
+                                                          ? Container(
+                                                              margin: EdgeInsets.only(left: 5.0, right: 5.0),
+                                                              child: SvgPicture.asset("assets/images/new/CoronaIcon.svg", width: 35.0, height: 35.0),
+                                                            )
+                                                          : appoList[index].isLiveCareAppointment!
+                                                              ? SvgPicture.asset("assets/images/new/virtual.svg")
+                                                              : SvgPicture.asset("assets/images/new/hospital-visit.svg"),
+                                                    ),
+                                                    Column(
+                                                      crossAxisAlignment: CrossAxisAlignment.start,
+                                                      children: [
+                                                        Padding(
+                                                          padding: const EdgeInsets.only(left: 8.0, right: 8.0),
+                                                          child: Text(
+                                                              appoList[index].clinicID == 265
+                                                                  ? TranslationBase.of(context).covidTestTodo
+                                                                  : appoList[index].isLiveCareAppointment!
+                                                                      ? TranslationBase.of(context).liveCareAppo
+                                                                      : TranslationBase.of(context).walkinAppo,
+                                                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48)),
+                                                        ),
+                                                        Padding(
+                                                          padding: const EdgeInsets.only(left: 8.0, right: 8.0),
+                                                          child: CountdownTimer(
+                                                            controller:
+                                                                new CountdownTimerController(endTime: DateTime.now().millisecondsSinceEpoch + (appoList[index].remaniningHoursTocanPay! * 1000) * 60),
+                                                            widgetBuilder: (_, CurrentRemainingTime? time) {
+                                                              return time != null
+                                                                  ? Text(
+                                                                      '${time.days != null ? time.days : "0"}:${time.hours != null ? time.hours.toString().length == 1 ? "0" + time.hours.toString() : time.hours : "00"}:${time.min}:${time.sec} \n' +
+                                                                          TranslationBase.of(context).upcomingTimeLeft,
+                                                                      style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: CustomColors.accentColor, letterSpacing: -0.48))
+                                                                  : Container();
+                                                            },
+                                                          ),
+                                                        ),
+                                                      ],
+                                                    ),
+                                                  ],
+                                                ),
                                               ),
-                                              Column(
-                                                crossAxisAlignment: CrossAxisAlignment.start,
-                                                children: [
-                                                  Padding(
-                                                    padding: const EdgeInsets.only(left: 8.0, right: 8.0),
-                                                    child: Text(
-                                                        appoList[index].clinicID == 265
-                                                            ? TranslationBase.of(context).covidTestTodo
-                                                            : appoList[index].isLiveCareAppointment!
-                                                            ? TranslationBase.of(context).liveCareAppo
-                                                            : TranslationBase.of(context).walkinAppo,
-                                                        style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48)),
-                                                  ),
-                                                  Padding(
-                                                    padding: const EdgeInsets.only(left: 8.0, right: 8.0),
-                                                    child: CountdownTimer(
-                                                      controller:
-                                                      new CountdownTimerController(endTime: DateTime.now().millisecondsSinceEpoch + (appoList[index].remaniningHoursTocanPay! * 1000) * 60),
-                                                      widgetBuilder: (_, CurrentRemainingTime? time) {
-                                                        return time != null
-                                                            ? Text(
-                                                            '${time.days != null ? time.days : "0"}:${time.hours != null ? time.hours.toString().length == 1 ? "0" + time.hours.toString() : time.hours : "00"}:${time.min}:${time.sec} \n' +
-                                                                TranslationBase.of(context).upcomingTimeLeft,
-                                                            style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: CustomColors.accentColor, letterSpacing: -0.48))
-                                                            : Container();
-                                                      },
+                                              Expanded(
+                                                child: Container(
+                                                  child: InkWell(
+                                                    onTap: () {
+                                                      performNextAction(appoList[index]);
+                                                    },
+                                                    child: Container(
+                                                      padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
+                                                      decoration: BoxDecoration(
+                                                        color: getNextActionButtonColor(appoList[index].nextAction),
+                                                        border: Border.all(color: Colors.white, width: 1),
+                                                        borderRadius: BorderRadius.circular(6),
+                                                      ),
+                                                      child: Text(
+                                                        getNextActionText(appoList[index].nextAction),
+                                                        textAlign: TextAlign.center,
+                                                        style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.4),
+                                                      ),
                                                     ),
                                                   ),
-                                                ],
+                                                ),
                                               ),
                                             ],
                                           ),
-                                        ),
-                                        Expanded(
-                                          child: Container(
-                                            child: InkWell(
-                                              onTap: () {
-                                                performNextAction(appoList[index]);
-                                              },
-                                              child: Container(
-                                                padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
-                                                decoration: BoxDecoration(
-                                                  color: getNextActionButtonColor(appoList[index].nextAction),
-                                                  border: Border.all(color: Colors.white, width: 1),
-                                                  borderRadius: BorderRadius.circular(6),
-                                                ),
-                                                child: Text(
-                                                  getNextActionText(appoList[index].nextAction),
-                                                  textAlign: TextAlign.center,
-                                                  style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.4),
-                                                ),
-                                              ),
+                                          Padding(
+                                            padding: const EdgeInsets.only(top: 8.0),
+                                            child: Text(
+                                              appoList[index].doctorTitle! + " " + appoList[index].doctorNameObj!,
+                                              style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
                                             ),
                                           ),
-                                        ),
-                                      ],
-                                    ),
-                                    Padding(
-                                      padding: const EdgeInsets.only(top: 8.0),
-                                      child: Text(
-                                        appoList[index].doctorTitle! + " " + appoList[index].doctorNameObj!,
-                                        style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
-                                      ),
-                                    ),
-                                    Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: <Widget>[
-                                        LargeAvatar(
-                                          name: appoList[index].doctorTitle! + " " + appoList[index].doctorNameObj!,
-                                          url: appoList[index].doctorImageURL,
-                                          width: 52,
-                                          height: 52,
-                                        ),
-                                        SizedBox(width: 11),
-                                        Expanded(
-                                          child: Column(
-                                            crossAxisAlignment: CrossAxisAlignment.start,
+                                          Row(
                                             mainAxisSize: MainAxisSize.min,
                                             children: <Widget>[
-                                              MyRichText(TranslationBase.of(context).clinic + ": ", appoList[index].clinicName!, projectViewModel.isArabic),
-                                              // MyRichText(TranslationBase.of(context).appointmentDate + ": ",
-                                              //     DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(appoList[index].appointmentDate)) + " " + appoList[index].startTime.substring(0, 5), projectViewModel.isArabic),
-
-                                              // Timezone changes
-                                              appoList[index].isLiveCareAppointment!
-                                                  ? MyRichText(
-                                                  TranslationBase.of(context).appointmentDate + ": ",
-                                                  DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(appoList[index].appointmentDate)) +
-                                                      " " +
-                                                      DateUtil.convertStringToDate(appoList[index].appointmentDate).toString().split(" ")[1].substring(0, 5),
-                                                  projectViewModel.isArabic)
-                                                  : MyRichText(
-                                                  TranslationBase.of(context).appointmentDate + ": ",
-                                                  DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(appoList[index].appointmentDate)) +
-                                                      " " +
-                                                      appoList[index].startTime!.substring(0, 5),
-                                                  projectViewModel.isArabic),
-
-                                              MyRichText(TranslationBase.of(context).branch, appoList[index].projectName!, projectViewModel.isArabic),
-                                              Row(
-                                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                                mainAxisSize: MainAxisSize.max,
-                                                children: <Widget>[
-                                                  RatingBar(
-                                                    initialRating: appoList[index].actualDoctorRate.toDouble(),
-                                                    itemSize: 16.0,
-                                                    glowColor: Color(0XFFD02127),
-                                                    unratedColor: Color(0XFFD02127),
-                                                    allowHalfRating: true, ratingWidget: RatingWidget(full:Icon(Icons.star), half: Icon(Icons.star_half), empty: Icon( Icons.star_border)), onRatingUpdate: (double value) {  },
-                                                    // : Icons.star_half,
-                                                    // ic: Icons.star,
-                                                    // emptyIcon: Icons.star_border, itemBuilder: (BuildContext context, int index) {  },
-                                                  ),
-                                                ],
+                                              LargeAvatar(
+                                                name: appoList[index].doctorTitle! + " " + appoList[index].doctorNameObj!,
+                                                url: appoList[index].doctorImageURL,
+                                                width: 52,
+                                                height: 52,
+                                              ),
+                                              SizedBox(width: 11),
+                                              Expanded(
+                                                child: Column(
+                                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                                  mainAxisSize: MainAxisSize.min,
+                                                  children: <Widget>[
+                                                    MyRichText(TranslationBase.of(context).clinic + ": ", appoList[index].clinicName!, projectViewModel.isArabic),
+                                                    // MyRichText(TranslationBase.of(context).appointmentDate + ": ",
+                                                    //     DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(appoList[index].appointmentDate)) + " " + appoList[index].startTime.substring(0, 5), projectViewModel.isArabic),
+
+                                                    // Timezone changes
+                                                    appoList[index].isLiveCareAppointment!
+                                                        ? MyRichText(
+                                                            TranslationBase.of(context).appointmentDate + ": ",
+                                                            DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(appoList[index].appointmentDate)) +
+                                                                " " +
+                                                                DateUtil.convertStringToDate(appoList[index].appointmentDate).toString().split(" ")[1].substring(0, 5),
+                                                            projectViewModel.isArabic)
+                                                        : MyRichText(
+                                                            TranslationBase.of(context).appointmentDate + ": ",
+                                                            DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(appoList[index].appointmentDate)) +
+                                                                " " +
+                                                                appoList[index].startTime!.substring(0, 5),
+                                                            projectViewModel.isArabic),
+
+                                                    MyRichText(TranslationBase.of(context).branch, appoList[index].projectName!, projectViewModel.isArabic),
+                                                    Row(
+                                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                                      mainAxisSize: MainAxisSize.max,
+                                                      children: <Widget>[
+                                                        RatingBar(
+                                                          initialRating: appoList[index].actualDoctorRate.toDouble(),
+                                                          itemSize: 16.0,
+                                                          glowColor: Color(0XFFD02127),
+                                                          unratedColor: Color(0XFFD02127),
+                                                          ignoreGestures: true,
+                                                          ratingWidget: RatingWidget(
+                                                            full: Icon(
+                                                              Icons.star,
+                                                              color: CustomColors.accentColor,
+                                                            ),
+                                                            half: Icon(
+                                                              Icons.star_half,
+                                                              color: CustomColors.accentColor,
+                                                            ),
+                                                            empty: Icon(
+                                                              Icons.star,
+                                                              color: CustomColors.accentColor,
+                                                            ),
+                                                          ),
+                                                          tapOnlyMode: true,
+                                                          allowHalfRating: true,
+                                                          onRatingUpdate: (double value) {},
+                                                          // : Icons.star_half,
+                                                          // ic: Icons.star,
+                                                          // emptyIcon: Icons.star_border, itemBuilder: (BuildContext context, int index) {  },
+                                                        ),
+                                                      ],
+                                                    ),
+                                                  ],
+                                                ),
                                               ),
                                             ],
                                           ),
-                                        ),
-                                      ],
-                                    ),
-                                    Padding(
-                                      padding: const EdgeInsets.only(top: 12.0),
-                                      child: Text(
-                                        getNextActionDescription(appoList[index].nextAction),
-                                        style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 25 / 16),
-                                      ),
-                                    ),
-                                    InkWell(
-                                      onTap: () {
-                                        navigateToAppointmentDetails(context, appoList[index]);
-                                      },
-                                      child: Padding(
-                                        padding: const EdgeInsets.only(top: 0.0),
-                                        child: Text(
-                                          TranslationBase.of(context).moreDetails,
-                                          style: TextStyle(
-                                              fontSize: 10,
-                                              fontWeight: FontWeight.w600,
-                                              color: CustomColors.accentColor,
-                                              letterSpacing: -0.48,
-                                              height: 25 / 16,
-                                              decoration: TextDecoration.underline),
-                                        ),
+                                          Padding(
+                                            padding: const EdgeInsets.only(top: 12.0),
+                                            child: Text(
+                                              getNextActionDescription(appoList[index].nextAction),
+                                              style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 25 / 16),
+                                            ),
+                                          ),
+                                          InkWell(
+                                            onTap: () {
+                                              navigateToAppointmentDetails(context, appoList[index]);
+                                            },
+                                            child: Padding(
+                                              padding: const EdgeInsets.only(top: 0.0),
+                                              child: Text(
+                                                TranslationBase.of(context).moreDetails,
+                                                style: TextStyle(
+                                                    fontSize: 10,
+                                                    fontWeight: FontWeight.w600,
+                                                    color: CustomColors.accentColor,
+                                                    letterSpacing: -0.48,
+                                                    height: 25 / 16,
+                                                    decoration: TextDecoration.underline),
+                                              ),
+                                            ),
+                                          ),
+                                        ],
                                       ),
-                                    ),
-                                  ],
-                                ),
-                              );
-                            },
-                          )
+                                    );
+                                  },
+                                )
                               : getNoDataWidget(context),
                         ),
                       ),
@@ -371,28 +389,28 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
                             title: TranslationBase.of(context).anicllaryOrders,
                             bodyWidget: ancillaryLists.length != 0
                                 ? Container(
-                              padding: EdgeInsets.all(12),
-                              child: ListView.separated(
-                                shrinkWrap: true,
-                                physics: NeverScrollableScrollPhysics(),
-                                reverse: true,
-                                itemBuilder: (context, index) {
-                                  return DoctorCard(
-                                    onTap: () => ancillaryOrdersDetails(ancillaryLists[0].ancillaryOrderList![index], ancillaryLists[0].projectID),
-                                    isInOutPatient: true,
-                                    name: TranslationBase.of(context).dr.toString() + " " + (ancillaryLists[0].ancillaryOrderList![index].doctorName ?? ""),
-                                    billNo: ancillaryLists[0].ancillaryOrderList![index].orderNo.toString(),
-                                    profileUrl: "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
-                                    subName: ancillaryLists[0].projectName,
-                                    isLiveCareAppointment: false,
-                                    date: DateUtil.convertStringToDate(ancillaryLists[0].ancillaryOrderList![index].orderDate),
-                                    isSortByClinic: true,
-                                  );
-                                },
-                                itemCount: ancillaryLists[0].ancillaryOrderList!.length,
-                                separatorBuilder: (context, index) => SizedBox(height: 14),
-                              ),
-                            )
+                                    padding: EdgeInsets.all(12),
+                                    child: ListView.separated(
+                                      shrinkWrap: true,
+                                      physics: NeverScrollableScrollPhysics(),
+                                      reverse: true,
+                                      itemBuilder: (context, index) {
+                                        return DoctorCard(
+                                          onTap: () => ancillaryOrdersDetails(ancillaryLists[0].ancillaryOrderList![index], ancillaryLists[0].projectID),
+                                          isInOutPatient: true,
+                                          name: TranslationBase.of(context).dr.toString() + " " + (ancillaryLists[0].ancillaryOrderList![index].doctorName ?? ""),
+                                          billNo: ancillaryLists[0].ancillaryOrderList![index].orderNo.toString(),
+                                          profileUrl: "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
+                                          subName: ancillaryLists[0].projectName,
+                                          isLiveCareAppointment: false,
+                                          date: DateUtil.convertStringToDate(ancillaryLists[0].ancillaryOrderList![index].orderDate),
+                                          isSortByClinic: true,
+                                        );
+                                      },
+                                      itemCount: ancillaryLists[0].ancillaryOrderList!.length,
+                                      separatorBuilder: (context, index) => SizedBox(height: 14),
+                                    ),
+                                  )
                                 : getNoDataWidget(context),
                           )),
                     ],
@@ -401,104 +419,104 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
                 Container(
                   child: obGyneAppoList.length != 0
                       ? ListView.builder(
-                    scrollDirection: Axis.vertical,
-                    shrinkWrap: true,
-                    physics: ScrollPhysics(),
-                    padding: EdgeInsets.all(0.0),
-                    itemCount: obGyneAppoList.length,
-                    itemBuilder: (context, index) {
-                      return Container(
-                        width: double.infinity,
-                        margin: EdgeInsets.only(left: 12.0, right: 12.0, top: 12.0),
-                        decoration: cardRadius(12),
-                        padding: EdgeInsets.all(16),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Row(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Padding(
-                                      padding: const EdgeInsets.only(top: 0.0),
-                                      child: Container(
-                                        margin: EdgeInsets.only(left: 5.0, right: 5.0),
-                                        child: SvgPicture.asset("assets/images/new/ultrasound.svg", width: 20.0, height: 20.0),
+                          scrollDirection: Axis.vertical,
+                          shrinkWrap: true,
+                          physics: ScrollPhysics(),
+                          padding: EdgeInsets.all(0.0),
+                          itemCount: obGyneAppoList.length,
+                          itemBuilder: (context, index) {
+                            return Container(
+                              width: double.infinity,
+                              margin: EdgeInsets.only(left: 12.0, right: 12.0, top: 12.0),
+                              decoration: cardRadius(12),
+                              padding: EdgeInsets.all(16),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Row(
+                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                    children: [
+                                      Row(
+                                        crossAxisAlignment: CrossAxisAlignment.start,
+                                        children: [
+                                          Padding(
+                                            padding: const EdgeInsets.only(top: 0.0),
+                                            child: Container(
+                                              margin: EdgeInsets.only(left: 5.0, right: 5.0),
+                                              child: SvgPicture.asset("assets/images/new/ultrasound.svg", width: 20.0, height: 20.0),
+                                            ),
+                                          ),
+                                          Column(
+                                            crossAxisAlignment: CrossAxisAlignment.start,
+                                            children: [
+                                              Padding(
+                                                padding: const EdgeInsets.only(left: 8.0, right: 8.0),
+                                                child: Text(TranslationBase.of(context).walkinAppo,
+                                                    style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48)),
+                                              ),
+                                            ],
+                                          ),
+                                        ],
                                       ),
-                                    ),
-                                    Column(
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [
-                                        Padding(
-                                          padding: const EdgeInsets.only(left: 8.0, right: 8.0),
-                                          child: Text(TranslationBase.of(context).walkinAppo,
-                                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48)),
+                                      Container(
+                                        child: InkWell(
+                                          onTap: () {
+                                            getOBGyneDoctorsList(obGyneAppoList[index].projectID!, obGyneAppoList[index].setupID!, obGyneAppoList[index]);
+                                          },
+                                          child: Container(
+                                            padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
+                                            decoration: BoxDecoration(
+                                              color: CustomColors.green,
+                                              border: Border.all(color: Colors.white, width: 1),
+                                              borderRadius: BorderRadius.circular(6),
+                                            ),
+                                            child: Text(
+                                              TranslationBase.of(context).bookNow,
+                                              style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.4),
+                                            ),
+                                          ),
                                         ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                                Container(
-                                  child: InkWell(
-                                    onTap: () {
-                                      getOBGyneDoctorsList(obGyneAppoList[index].projectID!, obGyneAppoList[index].setupID!, obGyneAppoList[index]);
-                                    },
-                                    child: Container(
-                                      padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
-                                      decoration: BoxDecoration(
-                                        color: CustomColors.green,
-                                        border: Border.all(color: Colors.white, width: 1),
-                                        borderRadius: BorderRadius.circular(6),
-                                      ),
-                                      child: Text(
-                                        TranslationBase.of(context).bookNow,
-                                        style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.4),
                                       ),
+                                    ],
+                                  ),
+                                  Padding(
+                                    padding: const EdgeInsets.only(top: 8.0),
+                                    child: Text(
+                                      TranslationBase.of(context).dr + " " + obGyneAppoList[index].doctorName!,
+                                      style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
                                     ),
                                   ),
-                                ),
-                              ],
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.only(top: 8.0),
-                              child: Text(
-                                TranslationBase.of(context).dr + " " + obGyneAppoList[index].doctorName!,
-                                style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
-                              ),
-                            ),
-                            Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: <Widget>[
-                                LargeAvatar(
-                                  name: TranslationBase.of(context).dr + " " + obGyneAppoList[index].doctorName!,
-                                  url: "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
-                                  width: 52,
-                                  height: 52,
-                                ),
-                                SizedBox(width: 11),
-                                Expanded(
-                                  child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                  Row(
                                     mainAxisSize: MainAxisSize.min,
                                     children: <Widget>[
-                                      MyRichText(TranslationBase.of(context).clinic + ": ", obGyneAppoList[index].clinicDescription!, projectViewModel.isArabic),
-                                      MyRichText(
-                                          TranslationBase.of(context).orderDate + ": ",
-                                          DateUtil.getDayMonthYearHourMinuteDateFormatted(DateUtil.convertStringToDate(obGyneAppoList[index].orderDate)).split(" ")[0],
-                                          projectViewModel.isArabic),
-                                      MyRichText(TranslationBase.of(context).branch, obGyneAppoList[index].projectDescription!, projectViewModel.isArabic),
+                                      LargeAvatar(
+                                        name: TranslationBase.of(context).dr + " " + obGyneAppoList[index].doctorName!,
+                                        url: "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
+                                        width: 52,
+                                        height: 52,
+                                      ),
+                                      SizedBox(width: 11),
+                                      Expanded(
+                                        child: Column(
+                                          crossAxisAlignment: CrossAxisAlignment.start,
+                                          mainAxisSize: MainAxisSize.min,
+                                          children: <Widget>[
+                                            MyRichText(TranslationBase.of(context).clinic + ": ", obGyneAppoList[index].clinicDescription!, projectViewModel.isArabic),
+                                            MyRichText(
+                                                TranslationBase.of(context).orderDate + ": ",
+                                                DateUtil.getDayMonthYearHourMinuteDateFormatted(DateUtil.convertStringToDate(obGyneAppoList[index].orderDate)).split(" ")[0],
+                                                projectViewModel.isArabic),
+                                            MyRichText(TranslationBase.of(context).branch, obGyneAppoList[index].projectDescription!, projectViewModel.isArabic),
+                                          ],
+                                        ),
+                                      ),
                                     ],
                                   ),
-                                ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      );
-                    },
-                  )
+                                ],
+                              ),
+                            );
+                          },
+                        )
                       : getNoDataWidget(context),
                 ),
               ],
@@ -552,7 +570,7 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
   performNextAction(AppoitmentAllHistoryResultList appo) {
     switch (appo.nextAction) {
       case 0:
-      // getAppoQR(context, appo);
+        // getAppoQR(context, appo);
         break;
       case 10:
         confirmAppointment(appo);
@@ -1075,7 +1093,12 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
             transform: Matrix4.translationValues(0.0, curvedValue * 200, 0.0),
             child: Opacity(
               opacity: a1.value,
-              child: PaymentDialog(appo: appo, patientShareResponse: patientShareResponse, isCashPatient: isCash, onPaymentMethodSelected: (){},),
+              child: PaymentDialog(
+                appo: appo,
+                patientShareResponse: patientShareResponse,
+                isCashPatient: isCash,
+                onPaymentMethodSelected: () {},
+              ),
             ),
           );
         },
@@ -1083,8 +1106,7 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
         barrierDismissible: false,
         barrierLabel: '',
         context: context,
-        pageBuilder: (context, animation1, animation2) =>SizedBox())
-        .then((value) {
+        pageBuilder: (context, animation1, animation2) => SizedBox()).then((value) {
       if (value != null) {
         navigateToPaymentMethod(context, value as PatientShareResponse, appo);
         projectViewModel.analytics.todoList.to_do_list_confirm_payment_details(appo);
@@ -1328,13 +1350,13 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
 
   Future navigateToPaymentMethod(context, PatientShareResponse patientShareResponse, AppoitmentAllHistoryResultList appo) async {
     Navigator.push(
-        context,
-        FadePage(
-            page: PaymentMethod(
-                onSelectedMethod: (String metohd, [String? selectedInstallmentPlan]) {
-                  setState(() {});
-                },
-                patientShare: widget.patientShareResponse!.patientShareWithTax)))
+            context,
+            FadePage(
+                page: PaymentMethod(
+                    onSelectedMethod: (String metohd, [String? selectedInstallmentPlan]) {
+                      setState(() {});
+                    },
+                    patientShare: widget.patientShareResponse!.patientShareWithTax)))
         .then((value) {
       print(value);
       selectedPaymentMethod = value[0] ?? "";
@@ -1414,26 +1436,27 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
     service.applePayInsertRequest(applePayInsertRequest, context).then((res) async {
       if (res["MessageStatus"] == 1) {
         await context.read<PayfortViewModel>().initiateApplePayWithPayfort(
-          customerName: projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!,
-          // customerEmail: projectViewModel.authenticatedUserObject.user.emailAddress,
-          customerEmail: "CustID_${projectViewModel.user.patientID}@HMG.com",
-          orderDescription: "Appointment Payment",
-          orderAmount: double.parse(patientShareResponse.patientShareWithTax.toString()),
-          merchantReference: transID,
-          payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
-          currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
-          onFailed: (failureResult) async {
-            log("failureResult: ${failureResult.toString()}");
-            AppToast.showErrorToast(message: failureResult.toString());
-          },
-          onSuccess: (successResult) async {
-            log("Payfort: ${successResult.responseMessage}");
-            await context.read<PayfortViewModel>().addPayfortApplePayResponse(projectViewModel.user.patientID!, result: successResult);
-            checkPaymentStatus(appo);
-          },
-          projectId: appo.projectID,
-          serviceTypeEnum: ServiceTypeEnum.appointmentPayment,
-        );
+              customerName: projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!,
+              // customerEmail: projectViewModel.authenticatedUserObject.user.emailAddress,
+              customerEmail: "CustID_${projectViewModel.user.patientID}@HMG.com",
+              orderDescription: "Appointment Payment",
+              orderAmount: double.parse(patientShareResponse.patientShareWithTax.toString()),
+              merchantReference: transID,
+              payfortProjectDetailsRespModel: payfortProjectDetailsRespModel,
+              currency: projectViewModel.user.outSA == 1 ? "AED" : "SAR",
+              onFailed: (failureResult) async {
+                GifLoaderDialogUtils.hideDialog(context);
+                log("failureResult: ${failureResult.toString()}");
+                AppToast.showErrorToast(message: failureResult.toString());
+              },
+              onSuccess: (successResult) async {
+                log("Payfort: ${successResult.responseMessage}");
+                await context.read<PayfortViewModel>().addPayfortApplePayResponse(projectViewModel.user.patientID!, result: successResult);
+                checkPaymentStatus(appo);
+              },
+              projectId: appo.projectID,
+              serviceTypeEnum: ServiceTypeEnum.appointmentPayment,
+            );
       } else {
         GifLoaderDialogUtils.hideDialog(context);
         AppToast.showErrorToast(message: "An error occurred while processing your request");
@@ -1472,7 +1495,7 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
     DoctorsListService service = new DoctorsListService();
     service
         .insertVIDARequest(appo.appointmentNo, appo.clinicID, appo.projectID, appo.serviceID, appo.doctorID, appo.appointmentDate!,
-        Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), projectViewModel.isArabic ? 1 : 2, context)
+            Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), projectViewModel.isArabic ? 1 : 2, context)
         .then((res) {
       GifLoaderDialogUtils.hideDialog(context);
       if (res['MessageStatus'] == 1) {

lib/pages/ToDoList/payment_method_select.dart

@@ -87,7 +87,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
                               Container(
                                 width: 24,
                                 height: 24,
-                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "MADA" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
+                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "MADA" ? CustomColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
                               ),
                               mWidth(12),
                               Container(
@@ -137,7 +137,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
                               Container(
                                 width: 24,
                                 height: 24,
-                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "VISA" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
+                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "VISA" ? CustomColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
                               ),
                               mWidth(12),
                               Container(
@@ -187,7 +187,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
                               Container(
                                 width: 24,
                                 height: 24,
-                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "MASTERCARD" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
+                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "MASTERCARD" ? CustomColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
                               ),
                               mWidth(12),
                               Container(
@@ -237,7 +237,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
                               Container(
                                 width: 24,
                                 height: 24,
-                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "TAMARA" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
+                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "TAMARA" ? CustomColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
                               ),
                               mWidth(12),
                               Container(
@@ -287,7 +287,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
                               Container(
                                 width: 24,
                                 height: 24,
-                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "Installment" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
+                                decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "Installment" ? CustomColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
                               ),
                               mWidth(12),
                               Container(
@@ -338,7 +338,7 @@ class _PaymentMethodState extends State<PaymentMethod> {
                                   Container(
                                     width: 24,
                                     height: 24,
-                                    decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "ApplePay" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
+                                    decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "ApplePay" ? CustomColors.primaryColor : Colors.transparent, 100, Colors.grey, 0.5),
                                   ),
                                   mWidth(12),
                                   Container(

lib/pages/ToDoList/widgets/paymentDialog.dart

@@ -80,7 +80,7 @@ class _PaymentDialogState extends State<PaymentDialog> {
           SizedBox(height: 12),
           Text(
             TranslationBase.of(context).appoPaymentConfirm,
-            style: TextStyle(fontSize: 14.0, color: CustomColors.accentColor, fontWeight: FontWeight.w600, letterSpacing: -0.56),
+            style: TextStyle(fontSize: 14.0, color: CustomColors.primaryColor, fontWeight: FontWeight.w600, letterSpacing: -0.56),
           ),
           SizedBox(height: 12),
           Container(

lib/pages/ToDoList/widgets/upcomingCard.dart

@@ -55,7 +55,7 @@ class _TodoListCardState extends State<TodoListCard> {
                       ),
                       Padding(
                         padding: const EdgeInsets.only(left: 8.0, right: 8.0),
-                        child: Text("01:23:22 " + TranslationBase.of(context).upcomingTimeLeft, style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: CustomColors.accentColor, letterSpacing: -0.48)),
+                        child: Text("01:23:22 " + TranslationBase.of(context).upcomingTimeLeft, style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: CustomColors.primaryColor, letterSpacing: -0.48)),
                       ),
                     ],
                   ),
@@ -119,9 +119,9 @@ class _TodoListCardState extends State<TodoListCard> {
                           itemSize: 20,
                           ignoreGestures: true,
                           ratingWidget: RatingWidget(
-                            full: Icon(Icons.star, color: CustomColors.accentColor,),
-                            half: Icon(Icons.star_half, color: CustomColors.accentColor,),
-                            empty: Icon(Icons.star, color: CustomColors.accentColor,),
+                            full: Icon(Icons.star, color: CustomColors.primaryColor,),
+                            half: Icon(Icons.star_half, color: CustomColors.primaryColor,),
+                            empty: Icon(Icons.star, color: CustomColors.primaryColor,),
                           ),
                           tapOnlyMode: true,
                           unratedColor: Colors.grey[500],
@@ -158,7 +158,7 @@ class _TodoListCardState extends State<TodoListCard> {
             padding: const EdgeInsets.only(top: 0.0),
             child: Text(
               "More Details",
-              style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: CustomColors.accentColor, letterSpacing: -0.48, height: 25 / 16, decoration: TextDecoration.underline),
+              style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: CustomColors.primaryColor, letterSpacing: -0.48, height: 25 / 16, decoration: TextDecoration.underline),
             ),
           ),
         ],

lib/pages/appUpdatePage/app_update_page.dart

@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:in_app_update/in_app_update.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AppUpdatePage extends StatefulWidget {
@@ -57,10 +58,10 @@ class _AppUpdatePageState extends State<AppUpdatePage> {
                   minWidth: MediaQuery.of(context).size.width,
                   height: 45.0,
                   child: CustomTextButton(
-                      backgroundColor: Colors.red[800]!,
-                      disabledForegroundColor: Color(0xFFbcc2c4).withOpacity(0.38),
-                      disabledBackgroundColor: Color(0xFFbcc2c4).withOpacity(0.12),
-                      elevation: 0,
+                    backgroundColor: Colors.red[800]!,
+                    disabledForegroundColor: Color(0xFFbcc2c4).withOpacity(0.38),
+                    disabledBackgroundColor: Color(0xFFbcc2c4).withOpacity(0.12),
+                    elevation: 0,
                     onPressed: () {
                       openAppUpdateLink();
                     },
@@ -78,16 +79,17 @@ class _AppUpdatePageState extends State<AppUpdatePage> {
   openAppUpdateLink() {
     if (Platform.isAndroid) {
       // _launchURL("https://play.google.com/store/apps/details?id=com.ejada.hmg");
-      // InAppUpdate.checkForUpdate().then((info) {
-      //   print("checkForUpdate!!!");
-      //   print(info.toString());
-      //   if (info.immediateUpdateAllowed) {
-      //     print("Immediate Allowed!!!");
-      //     InAppUpdate.performImmediateUpdate().then((value) {}).catchError((e) => print(e.toString()));
-      //   }
-      // }).catchError((e) {
-      //   print(e.toString());
-      // });
+      InAppUpdate.checkForUpdate().then((info) {
+        print("checkForUpdate!!!");
+        print(info.toString());
+        if (info.immediateUpdateAllowed) {
+          print("Immediate Allowed!!!");
+          InAppUpdate.performImmediateUpdate().then((value) {}).catchError((e) => print(e.toString()));
+        }
+      }).catchError((e) {
+        print(e.toString());
+        _launchURL("https://play.google.com/store/apps/details?id=com.ejada.hmg");
+      });
     }
     if (Platform.isIOS) {
       _launchURL("https://itunes.apple.com/app/id733503978");