Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info

Conflicts: lib/config/localized_values.dart lib/pages/medical/balance/advance_payment_page.dart lib/pages/medical/balance/my_balance_page.dart lib/uitl/translations_delegate_base.dart
4 years ago · ced86de9fe
parent 269f682bd5 76a9b7b9e2
commit ced86de9fe
55 changed files with 625 additions and 384 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -26,6 +26,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
    compileSdkVersion 30

@ -34,7 +40,9 @@ android {
    }

    lintOptions {
-        disable 'InvalidPackage'
+//        disable 'InvalidPackage'
+        checkReleaseBuilds false
+        abortOnError false
    }

    defaultConfig {
@ -48,21 +56,35 @@ android {

    }

+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
    buildTypes {
        debug {}
        release {
            // TODO: Add your own signing config for the release build.
            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-        staging {
-            // Specifies a sorted list of fallback build types that the
-            // plugin should try to use when a dependency does not include a
-            // "staging" build type. You may specify as many fallbacks as you
-            // like, and the plugin selects the first build type that's
-            // available in the dependency.
-            matchingFallbacks = ['debug', 'qa', 'release']
+//            signingConfig signingConfigs.debug
+//            useProguard true
+
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            signingConfigs.release
        }
+//        staging {
+//            // Specifies a sorted list of fallback build types that the
+//            // plugin should try to use when a dependency does not include a
+//            // "staging" build type. You may specify as many fallbacks as you
+//            // like, and the plugin selects the first build type that's
+//            // available in the dependency.
+//            matchingFallbacks = ['debug', 'qa', 'release']
+//        }
    }
 }

--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@ -1,39 +1,37 @@
 {
  "project_info": {
-    "project_number": "815750722565",
-    "firebase_url": "https://api-project-815750722565.firebaseio.com",
-    "project_id": "api-project-815750722565",
-    "storage_bucket": "api-project-815750722565.appspot.com"
+    "project_number": "864393916058",
+    "firebase_url": "https://diplomaticquarter-d2385.firebaseio.com",
+    "project_id": "diplomaticquarter-d2385",
+    "storage_bucket": "diplomaticquarter-d2385.appspot.com"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063",
+        "mobilesdk_app_id": "1:864393916058:android:5b5a65cd6d8c18b4b97923",
        "android_client_info": {
          "package_name": "com.cloud.diplomaticquarterapp"
        }
      },
      "oauth_client": [
        {
-          "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
+          "client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
          "client_type": 3
        }
      ],
      "api_key": [
        {
-          "current_key": "AIzaSyDUfg6AKM1-00WyzpvLImUBC46wFrq9-qw"
+          "current_key": "AIzaSyBdV3mos1BPhUzNKCj2KANJtiO3o2zh9IM"
        }
      ],
      "services": {
-        "analytics_service": {
-          "status": 1
-        },
        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
+          "other_platform_oauth_client": [
+            {
+              "client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
        }
      }
    }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -24,7 +24,7 @@
        android:name="io.flutter.app.FlutterApplication"
        android:icon="@mipmap/ic_launcher"
        android:usesCleartextTraffic="true"
-        android:label="diplomaticquarterapp">
+        android:label="Dr. Alhabib MC">
        <activity
            android:name=".MainActivity"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/build.gradle
+++ b/android/build.gradle
@ -6,7 +6,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath 'com.google.gms:google-services:4.3.2'
    }
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Thu Sep 03 16:26:30 EEST 2020
+#Wed Nov 25 14:25:50 AST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
--- a/ios/Flutter/.last_build_id
+++ b/ios/Flutter/.last_build_id
@ -1 +1 @@
-f4a819c27119d0f472892c1088ad1ca3
+a30437b5671472a3d6a8672edcfc504b
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
--- a/ios/GoogleService-Info.plist
+++ b/ios/GoogleService-Info.plist
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r</string>
-	<key>API_KEY</key>
-	<string>AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs</string>
-	<key>GCM_SENDER_ID</key>
-	<string>864393916058</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.cloud.diplomaticquarterapp</string>
-	<key>PROJECT_ID</key>
-	<string>diplomaticquarter-d2385</string>
-	<key>STORAGE_BUCKET</key>
-	<string>diplomaticquarter-d2385.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:864393916058:ios:13f787bbfe6051f8b97923</string>
-	<key>DATABASE_URL</key>
-	<string>https://diplomaticquarter-d2385.firebaseio.com</string>
-</dict>
-</plist>
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '11.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@ -10,82 +10,32 @@ project 'Runner', {
  'Release' => :release,
 }

-# pod 'FBSDKCoreKit'
-# pod 'FBSDKLoginKit'
-
-def parse_KV_file(file, separator='=')
-  file_abs_path = File.expand_path(file)
-  if !File.exists? file_abs_path
-    return [];
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
  end
-  generated_key_values = {}
-  skip_line_start_symbols = ["#", "/"]
-  File.foreach(file_abs_path) do |line|
-    next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
-    plugin = line.split(pattern=separator)
-    if plugin.length == 2
-      podname = plugin[0].strip()
-      path = plugin[1].strip()
-      podpath = File.expand_path("#{path}", file_abs_path)
-      generated_key_values[podname] = podpath
-    else
-      puts "Invalid plugin specification: #{line}"
-    end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
  end
-  generated_key_values
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end

+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
 target 'Runner' do
  use_frameworks!
  use_modular_headers!

-  # Flutter Pod
-
-  copied_flutter_dir = File.join(__dir__, 'Flutter')
-  copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
-  copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
-  unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
-    # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
-    # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
-    # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
-
-    generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
-    unless File.exist?(generated_xcode_build_settings_path)
-      raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-    end
-    generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
-    cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
-
-    unless File.exist?(copied_framework_path)
-      FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
-    end
-    unless File.exist?(copied_podspec_path)
-      FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
-    end
-  end
-
-  # Keep pod path relative so it can be checked into Podfile.lock.
-  pod 'Flutter', :path => 'Flutter'
-
-  # Plugin Pods
-
-  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
-  # referring to absolute paths on developers' machines.
-  system('rm -rf .symlinks')
-  system('mkdir -p .symlinks/plugins')
-  plugin_pods = parse_KV_file('../.flutter-plugins')
-  plugin_pods.each do |name, path|
-    symlink = File.join('.symlinks', 'plugins', name)
-    File.symlink(path, symlink)
-    pod name, :path => File.join(symlink, 'ios')
-  end
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end

 post_install do |installer|
  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['ENABLE_BITCODE'] = 'NO'
-    end
+    flutter_additional_ios_build_settings(target)
  end
-end
-
+end
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@ -27,8 +27,6 @@
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
@ -38,8 +36,8 @@
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
@ -61,8 +59,6 @@
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Profile"
--- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>DisableBuildSystemDeprecationWarning</key>
+	<true/>
 	<key>PreviewsEnabled</key>
 	<false/>
 </dict>
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@ -1,6 +1,5 @@
 import UIKit
 import Flutter
-import GoogleMaps

@UIApplicationMain
@objc class AppDelegate: FlutterAppDelegate {
@ -8,7 +7,6 @@ import GoogleMaps
    _ application: UIApplication,
    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
  ) -> Bool {
-    GMSServices.provideAPIKey("AIzaSyCiiJiHkocPbcziHt9O8rGWavDrxHRQys8")
    GeneratedPluginRegistrant.register(with: self)
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
--- a/ios/Runner/Base.lproj/Main.storyboard
+++ b/ios/Runner/Base.lproj/Main.storyboard
@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
    </dependencies>
    <scenes>
        <!--Flutter View Controller-->
@ -16,14 +14,13 @@
                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="96" y="-21"/>
        </scene>
    </scenes>
 </document>
--- a/ios/Runner/GoogleService-Info.plist
+++ b/ios/Runner/GoogleService-Info.plist
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r</string>
-	<key>API_KEY</key>
-	<string>AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs</string>
-	<key>GCM_SENDER_ID</key>
-	<string>864393916058</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.cloud.diplomaticquarterapp</string>
-	<key>PROJECT_ID</key>
-	<string>diplomaticquarter-d2385</string>
-	<key>STORAGE_BUCKET</key>
-	<string>diplomaticquarter-d2385.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:864393916058:ios:13f787bbfe6051f8b97923</string>
-	<key>DATABASE_URL</key>
-	<string>https://diplomaticquarter-d2385.firebaseio.com</string>
-</dict>
-</plist>
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Dr. Alhabib MC</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@ -11,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>diplomaticquarterapp</string>
+	<string>DiplomaticQuarter</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@ -22,27 +24,47 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-    <key>io.flutter.embedded_views_preview</key>
-    <true/>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>This App requires access to Bluetooth to connect blood pressure &amp; blood sugar devices with the app to analyze the data.</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>This App requires access to Bluetooth to connect blood pressure &amp; blood sugar devices with the app to analyze the data.</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>This app requires calendar access to set reminders for Virtual &amp; Normal Appointments.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This app requires camera access to enable virtual consultation between patient &amp; doctor</string>
+	<key>NSContactsUsageDescription</key>
+	<string>This app requires contacts access to show incoming virtual consultation request.</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>This app requires Face ID to allow biometric authentication for app login.</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>This App requires access to your location to show the nearest hospitals &amp; ER Locations from your location.</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>This App requires access to your location to show the nearest hospitals from your location.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This App requires access to your location to show the nearest hospitals from your location.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>This app requires microphone access to enable virtual consultation between patient &amp; doctor</string>
+	<key>NSMotionUsageDescription</key>
+	<string>This app requires motion detection access to function properly.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires photo library access to select image as document &amp; upload it.</string>
+	<key>NSRemindersUsageDescription</key>
+	<string>This app requires calendar access to set reminders for Virtual &amp; Normal Appointments.</string>
+    <key>NSSpeechRecognitionUsageDescription</key>
+    <string>This app requires access to speech recognition to identify which words are spoken into the microphone.</string>
+    <key>NSAppleMusicUsageDescription</key>
+    <string>Required usage description for a Flutter dependency</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>Need microphone access for uploading videos</string>
-    <key>NSCameraUsageDescription</key>
-    <string>Need camera access for uploading images</string>
-    <key>NSLocationUsageDescription</key>
-    <string>Need location access for updating nearby friends</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>This app will use your location to show cool stuffs near you.</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>Need photo library access for uploading images</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
@ -53,5 +75,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>io.flutter.embedded_views_preview</key>
+	<true/>
 </dict>
 </plist>
--- a/key.properties
+++ b/key.properties
@ -1,4 +1,4 @@
 storePassword=HmGsa123
 keyPassword=HmGsa123
-keyAlias=DQKey
+keyAlias=key
 storeFile=DQKey.jks
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@ -6,8 +6,9 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';

 const MAX_SMALL_SCREEN = 660;

-const BASE_URL = 'https://uat.hmgwebservices.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
+
+ // const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
 const GET_PROJECT = 'Services/Lists.svc/REST/GetProject';

 //weather
@ -17,6 +18,8 @@ const WEATHER_INDICATOR = 'Services/Weather.svc/REST/GetCityInfo';
 const GET_MY_DOCTOR =
    'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
 const GET_DOCTOR_PROFILE = 'Services/Doctors.svc/REST/GetDocProfiles';
+const GET_DOCTOR_RATING_NOTES = 'Services/Doctors.svc/REST/dr_GetNotesDoctorRating';
+const GET_DOCTOR_RATING_DETAILS = 'Services/Doctors.svc/REST/dr_GetDoctorRatingDetails';
 const GET_DOCTOR_RATING = 'Services/Doctors.svc/REST/dr_GetAvgDoctorRating';

 ///Prescriptions
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@ -1043,7 +1043,34 @@ const Map localizedValues = {
    "en": "Survey",
    "ar": "إستبيان"
  },
-
+  "labResults": {
+    "en": "Lab Result",
+    "ar": "نتيجة المختبر"
+  },
+  "doctorRating": {
+    "en": "Doctor Rating",
+    "ar": "تقييم الطبيب"
+  },
+  "good": {
+    "en": "Good",
+    "ar": "جيد"
+  },
+  "v-good": {
+    "en": "Very Good",
+    "ar": "جيد جدا"
+  },
+  "excellent": {
+    "en": "Excellent",
+    "ar": "ممتاز"
+  },
+  "average": {
+    "en": "Average",
+    "ar": "متوسط"
+  },
+  "below-average": {
+    "en": "Below Average",
+    "ar": "أقل من المتوسط"
+  },
  "info-signs": {
    "en": "This service allows you to view all vital signs were performed in the Habib Medical Group, e.x (height, weight, body mass index, heart rate, etc.)   as well shows some statistics charts.",
    "ar": "خدمة المؤشرات الحيوية: هذه الخدمة تمكنك من الاطلاع على جميع المؤشرات الحيوية على سبيل المثال (الطول، الوزن، مؤشر كتلة الجسم، معدل نبضات القلب الخ..) التي تمت في مجموعة الحبيب الطبية وكذلك رسوم بيانية على مستوى المؤشر."
@ -1180,4 +1207,21 @@ const Map localizedValues = {
    "en": "Directions",
    "ar": "الاتجاهات"
  },
+  "info-my-appointments": {
+    "en": "This service allows you to see all the appointment you have visited in Al Habib Medical Group, and through this service:",
+    "ar": "خدمة مواعيدي: هذه الخدمة تمكنك من الاطلاع على جميع المواعيد التي قمت بزيارتهم في مجموعة الحبيب الطبية, كما تستطيع من خلال هذه الخدمة:"
+  },
+  "info-advance-payment": {
+    "en": "This service designed so that you can deposit an amount in advance either in your account or in someone else's account with Al Habib Medical Group.",
+    "ar": "تم تصميم هذه الخدمة حتى تتمكن من دفع مبلغ مقدما او تحت الحساب سواء في حسابك او في حساب شخص اخر لدى مجموعة الحبيب الطبية."
+  },
+  "info-todo": {
+    "en": "This service is designed to enable you to have a quick link to the list of tasks that need to be done",
+    "ar": "هذه الخدمة تم تصميمها لتمكنك من الوصول الى رابط سريع لقائمة المهام التي يجب القيام بها"
+  },
+  "info-my-balance": {
+    "en": "This service allows you to check your balance in all branchs",
+    "ar": "هذه الخدمه تتيح لك الاطلاع رصيدك في كل الفروع"
+  },
+
 };
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@ -54,9 +54,9 @@ class BaseAppClient {
              : languageID == 'ar'
                  ? 1
                  : 2
-          : languageID == 'ar'
-              ? 1
-              : 2;
+          : languageID == 'en'
+              ? 2
+              : 1;

      body['IPAdress'] = IP_ADDRESS;
      body['generalid'] = GENERAL_ID;
--- a/lib/models/Appointments/DoctorRateDetails.dart
+++ b/lib/models/Appointments/DoctorRateDetails.dart
@ -0,0 +1,32 @@
+class DoctorRateDetails {
+  dynamic doctorID;
+  dynamic projectID;
+  dynamic clinicID;
+  dynamic rate;
+  dynamic patientNumber;
+
+  DoctorRateDetails(
+      {this.doctorID,
+        this.projectID,
+        this.clinicID,
+        this.rate,
+        this.patientNumber});
+
+  DoctorRateDetails.fromJson(Map<String, dynamic> json) {
+    doctorID = json['DoctorID'];
+    projectID = json['ProjectID'];
+    clinicID = json['ClinicID'];
+    rate = json['Rate'];
+    patientNumber = json['PatientNumber'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['DoctorID'] = this.doctorID;
+    data['ProjectID'] = this.projectID;
+    data['ClinicID'] = this.clinicID;
+    data['Rate'] = this.rate;
+    data['PatientNumber'] = this.patientNumber;
+    return data;
+  }
+}
--- a/lib/pages/BookAppointment/DoctorProfile.dart
+++ b/lib/pages/BookAppointment/DoctorProfile.dart
@ -1,11 +1,14 @@
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
 import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart';
+import 'package:diplomaticquarterapp/models/Appointments/DoctorRateDetails.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
 import 'package:diplomaticquarterapp/routes.dart';
+import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
 import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -42,6 +45,8 @@ class _DoctorProfileState extends State<DoctorProfile>

  AppSharedPreferences sharedPref = AppSharedPreferences();

+  List<DoctorRateDetails> doctorDetailsList = List();
+
  @override
  void initState() {
    _tabController = new TabController(
@ -150,19 +155,26 @@ class _DoctorProfileState extends State<DoctorProfile>
                        emptyIcon: Icons.star,
                      ),
                    ),
-                    Container(
-                      margin: EdgeInsets.only(top: 5.0),
-                      alignment: Alignment.center,
-                      child: Text(
-                          "(" +
-                              widget.doctor.noOfPatientsRate.toString() +
-                              " " + TranslationBase.of(context).reviews + ")",
-                          style: TextStyle(
-                            fontSize: 14.0,
-                            color: Colors.blue[800],
-                            letterSpacing: 1.0,
-                            decoration: TextDecoration.underline,
-                          )),
+                    InkWell(
+                      onTap: () {
+                        getDoctorRatingsDetails();
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(top: 5.0),
+                        alignment: Alignment.center,
+                        child: Text(
+                            "(" +
+                                widget.doctor.noOfPatientsRate.toString() +
+                                " " +
+                                TranslationBase.of(context).reviews +
+                                ")",
+                            style: TextStyle(
+                              fontSize: 14.0,
+                              color: Colors.blue[800],
+                              letterSpacing: 1.0,
+                              decoration: TextDecoration.underline,
+                            )),
+                      ),
                    ),
                    Container(
                      margin: EdgeInsets.only(top: 10.0),
@ -213,6 +225,279 @@ class _DoctorProfileState extends State<DoctorProfile>
    );
  }

+  getDoctorRatings() {
+    GifLoaderDialogUtils.showMyDialog(context);
+    DoctorsListService service = new DoctorsListService();
+    service.getDoctorsRating(widget.doctor.doctorID, context).then((res) {
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        print(res['NotesDoctorRatingList']);
+      } else {
+        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
+      print(err);
+    });
+  }
+
+  getDoctorRatingsDetails() {
+    GifLoaderDialogUtils.showMyDialog(context);
+    DoctorsListService service = new DoctorsListService();
+    service
+        .getDoctorsRatingDetails(widget.doctor.doctorID, context)
+        .then((res) {
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        doctorDetailsList.clear();
+        res['DoctorRatingDetailsList'].forEach((v) {
+          doctorDetailsList.add(new DoctorRateDetails.fromJson(v));
+        });
+        showRatingDialog(doctorDetailsList);
+      } else {
+        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
+      print(err);
+    });
+  }
+
+  void showRatingDialog(List<DoctorRateDetails> doctorDetailsList) {
+    showGeneralDialog(
+        barrierColor: Colors.black.withOpacity(0.5),
+        transitionBuilder: (context, a1, a2, widget) {
+          final curvedValue = Curves.easeInOutBack.transform(a1.value) - 1.0;
+          return Transform(
+            transform: Matrix4.translationValues(0.0, curvedValue * 200, 0.0),
+            child: Opacity(
+              opacity: a1.value,
+              child: Dialog(
+                child: Container(
+                  height: 400.0,
+                  width: MediaQuery.of(context).size.width * 0.8,
+                  color: Colors.white,
+                  child: Column(
+                    children: [
+                      Container(
+                          alignment: Alignment.center,
+                          width: MediaQuery.of(context).size.width,
+                          color: Theme.of(context).primaryColor,
+                          margin: EdgeInsets.only(bottom: 5.0),
+                          padding: EdgeInsets.all(10.0),
+                          child: Text(TranslationBase.of(context).doctorRating,
+                              style: TextStyle(
+                                  fontSize: 22.0, color: Colors.white))),
+                      Container(
+                          margin: EdgeInsets.only(top: 0.0),
+                          child: Text(
+                              this
+                                  .widget
+                                  .doctor
+                                  .actualDoctorRate
+                                  .ceilToDouble()
+                                  .toString(),
+                              style: TextStyle(
+                                  fontSize: 32.0, color: Colors.black))),
+                      Container(
+                        margin: EdgeInsets.only(top: 5.0),
+                        alignment: Alignment.center,
+                        child: RatingBar.readOnly(
+                          initialRating:
+                              this.widget.doctor.actualDoctorRate.toDouble(),
+                          size: 35.0,
+                          filledColor: Colors.yellow[700],
+                          emptyColor: Colors.grey[500],
+                          isHalfAllowed: true,
+                          halfFilledIcon: Icons.star_half,
+                          filledIcon: Icons.star,
+                          emptyIcon: Icons.star,
+                        ),
+                      ),
+                      Container(
+                          margin: EdgeInsets.only(top: 10.0),
+                          child: Text(
+                              this.widget.doctor.noOfPatientsRate.toString() +
+                                  " " +
+                                  TranslationBase.of(context).reviews,
+                              style: TextStyle(
+                                  fontSize: 14.0, color: Colors.black))),
+                      Container(
+                        margin: EdgeInsets.only(top: 10.0),
+                        child: Row(
+                          children: [
+                            Container(
+                                width: 100.0,
+                                margin: EdgeInsets.only(
+                                    top: 10.0, left: 15.0, right: 15.0),
+                                child: Text(
+                                    TranslationBase.of(context).excellent,
+                                    style: TextStyle(
+                                        fontSize: 13.0, color: Colors.black))),
+                            Container(
+                              margin: EdgeInsets.only(top: 10.0),
+                              child: SizedBox(
+                                width: getRatingWidth(
+                                    doctorDetailsList[0].patientNumber),
+                                height: 6.0,
+                                child: Container(
+                                  color: Colors.green[700],
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Container(
+                        child: Row(
+                          children: [
+                            Container(
+                                width: 100.0,
+                                margin: EdgeInsets.only(
+                                    top: 10.0, left: 15.0, right: 15.0),
+                                child: Text(TranslationBase.of(context).v_good,
+                                    style: TextStyle(
+                                        fontSize: 13.0, color: Colors.black))),
+                            Container(
+                              margin: EdgeInsets.only(top: 10.0),
+                              child: SizedBox(
+                                width: getRatingWidth(
+                                    doctorDetailsList[1].patientNumber),
+                                height: 6.0,
+                                child: Container(
+                                  color: Color(0xffB7B723),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Container(
+                        child: Row(
+                          children: [
+                            Container(
+                                width: 100.0,
+                                margin: EdgeInsets.only(
+                                    top: 10.0, left: 15.0, right: 15.0),
+                                child: Text(TranslationBase.of(context).good,
+                                    style: TextStyle(
+                                        fontSize: 13.0, color: Colors.black))),
+                            Container(
+                              margin: EdgeInsets.only(top: 10.0),
+                              child: SizedBox(
+                                width: getRatingWidth(
+                                    doctorDetailsList[2].patientNumber),
+                                height: 6.0,
+                                child: Container(
+                                  color: Color(0xffEBA727),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Container(
+                        child: Row(
+                          children: [
+                            Container(
+                                width: 100.0,
+                                margin: EdgeInsets.only(
+                                    top: 10.0, left: 15.0, right: 15.0),
+                                child: Text(TranslationBase.of(context).average,
+                                    style: TextStyle(
+                                        fontSize: 13.0, color: Colors.black))),
+                            Container(
+                              margin: EdgeInsets.only(top: 10.0),
+                              child: SizedBox(
+                                width: getRatingWidth(
+                                    doctorDetailsList[3].patientNumber),
+                                height: 6.0,
+                                child: Container(
+                                  color: Color(0xffEB7227),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Container(
+                        child: Row(
+                          children: [
+                            Container(
+                                width: 100.0,
+                                margin: EdgeInsets.only(
+                                    top: 10.0, left: 15.0, right: 15.0),
+                                child: Text(
+                                    TranslationBase.of(context).below_average,
+                                    style: TextStyle(
+                                        fontSize: 13.0, color: Colors.black))),
+                            Container(
+                              margin: EdgeInsets.only(top: 10.0),
+                              child: SizedBox(
+                                width: getRatingWidth(
+                                    doctorDetailsList[4].patientNumber),
+                                height: 6.0,
+                                child: Container(
+                                  color: Color(0xffE20C0C),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Container(
+                          margin: EdgeInsets.only(top: 40.0), child: Divider()),
+                      Container(
+                        margin: EdgeInsets.only(top: 0.0),
+                        child: Align(
+                          alignment: FractionalOffset.bottomCenter,
+                          child: ButtonTheme(
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(10.0),
+                            ),
+                            minWidth: MediaQuery.of(context).size.width,
+                            height: 40.0,
+                            child: RaisedButton(
+                              elevation: 0.0,
+                              color: Colors.white,
+                              textColor: Colors.red,
+                              hoverColor: Colors.transparent,
+                              focusColor: Colors.transparent,
+                              highlightColor: Colors.transparent,
+                              disabledColor: new Color(0xFFbcc2c4),
+                              onPressed: () {
+                                Navigator.of(context).pop();
+                              },
+                              child: Text(TranslationBase.of(context).cancel,
+                                  style: TextStyle(fontSize: 18.0)),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          );
+        },
+        transitionDuration: Duration(milliseconds: 500),
+        barrierDismissible: true,
+        barrierLabel: '',
+        context: context,
+        pageBuilder: (context, animation1, animation2) {});
+  }
+
+  double getRatingWidth(int patientNumber) {
+    print(patientNumber);
+    print(this.widget.doctor.noOfPatientsRate);
+    var width = (patientNumber / this.widget.doctor.noOfPatientsRate) * 100;
+    print(width);
+    return width;
+  }
+
  getPatientData() async {
    if (await sharedPref.getObject(USER_PROFILE) != null) {
      var data =
--- a/lib/pages/MyAppointments/MyAppointments.dart
+++ b/lib/pages/MyAppointments/MyAppointments.dart
@ -1,4 +1,5 @@
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
@ -40,12 +41,16 @@ class _MyAppointmentsState extends State<MyAppointments>
  AuthenticatedUserObject authenticatedUserObject =
      locator<AuthenticatedUserObject>();

+  List<ImagesInfo> imagesInfo = List();
+
  @override
  void initState() {
    _tabController = new TabController(length: 3, vsync: this);
    WidgetsBinding.instance.addPostFrameCallback((_) {
      if (Provider.of<ProjectViewModel>(context, listen: false).isLogin) getPatientAppointmentHistory();
    });
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/ar/1.png'));
    super.initState();
  }

@ -54,6 +59,8 @@ class _MyAppointmentsState extends State<MyAppointments>
    return AppScaffold(
      appBarTitle: TranslationBase.of(context).myAppointments,
      isShowAppBar: true,
+      imagesInfo: imagesInfo,
+      description: TranslationBase.of(context).infoMyAppointments,
      body: Container(
        child: Column(children: [
          TabBar(
--- a/lib/pages/ToDoList/ToDo.dart
+++ b/lib/pages/ToDoList/ToDo.dart
@ -1,4 +1,5 @@
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
@ -38,19 +39,29 @@ class _ToDoState extends State<ToDo> {
  AuthenticatedUserObject authenticatedUserObject =
      locator<AuthenticatedUserObject>();

+  List<ImagesInfo> imagesInfo = List();
+
  @override
  void initState() {
    widget.patientShareResponse = new PatientShareResponse();
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (authenticatedUserObject.isLogin) getPatientAppointmentHistory();
+      if (authenticatedUserObject.isLogin) getPatientData();
    });
    super.initState();
+    imagesInfo.add(ImagesInfo(
+        imageEn:
+            'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/en/0.png',
+        imageAr:
+            'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/ar/0.png'));
  }

  @override
  Widget build(BuildContext context) {
    return AppScaffold(
      appBarTitle: TranslationBase.of(context).todoList,
+      imagesInfo: imagesInfo,
+      isShowAppBar: true,
+      description: TranslationBase.of(context).infoTodo,
      body: SingleChildScrollView(
        child: Column(
          children: <Widget>[
@ -426,7 +437,8 @@ class _ToDoState extends State<ToDo> {
  }

  getLanguageID() async {
-    var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+    var languageID =
+        await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
    setState(() {
      widget.languageID = languageID;
    });
@ -666,8 +678,8 @@ class _ToDoState extends State<ToDo> {
    DoctorsListService service = new DoctorsListService();
    String paymentReference = res['Fort_id'].toString();
    service
-        .createAdvancePayment(
-            appo, appo.projectID.toString(), res['Amount'], res['Fort_id'], res['PaymentMethod'], context)
+        .createAdvancePayment(appo, appo.projectID.toString(), res['Amount'],
+            res['Fort_id'], res['PaymentMethod'], context)
        .then((res) {
      GifLoaderDialogUtils.hideDialog(context);
      print(res['OnlineCheckInAppointments'][0]['AdvanceNumber']);
@ -699,6 +711,19 @@ class _ToDoState extends State<ToDo> {
    });
  }

+  getPatientData() async {
+    AppSharedPreferences sharedPref = AppSharedPreferences();
+    if (await sharedPref.getObject(USER_PROFILE) != null) {
+      var data =
+          AuthenticatedUser.fromJson(await sharedPref.getObject(USER_PROFILE));
+      setState(() {
+        print(data);
+        authUser = data;
+      });
+      getPatientAppointmentHistory();
+    }
+  }
+
  Future navigateToPaymentMethod(
      context,
      PatientShareResponse patientShareResponse,
--- a/lib/pages/medical/balance/advance_payment_page.dart
+++ b/lib/pages/medical/balance/advance_payment_page.dart
@ -49,23 +49,25 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {

  AppSharedPreferences sharedPref = AppSharedPreferences();
  AuthenticatedUser authUser;
+
  List<ImagesInfo> imagesInfo = List();
+
  @override
  void initState() {
    super.initState();
    getAuthUser();
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/ar/0.png'));
  }

  @override
  Widget build(BuildContext context) {
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/ar/0.png'));
    return BaseView<MyBalanceViewModel>(
      onModelReady: (model) => model.getHospitals(),
      builder: (_, model, w) => AppScaffold(
          isShowAppBar: true,
+          imagesInfo: imagesInfo,
          appBarTitle: TranslationBase.of(context).advancePayment,
          description: TranslationBase.of(context).infoAdvancePayment,
-          imagesInfo: imagesInfo,
          body: SingleChildScrollView(
            physics: ScrollPhysics(),
            child: Container(
@ -211,7 +213,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
                  ),
                  NewTextFields(
                    hintText: TranslationBase.of(context).depositorEmail,
-                    initialValue: model.user?.emailAddress,
+                    initialValue: model.user.emailAddress,
                    onChanged: (value) {
                      email = value;
                    },
--- a/lib/pages/medical/balance/my_balance_page.dart
+++ b/lib/pages/medical/balance/my_balance_page.dart
@ -13,20 +13,20 @@ import 'package:hexcolor/hexcolor.dart';
 import 'advance_payment_page.dart';

 class MyBalancePage extends StatelessWidget {
+
  List<ImagesInfo> imagesInfo = List();

  @override
  Widget build(BuildContext context) {
    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/ar/0.png'));
-
    return BaseView<MyBalanceViewModel>(
      onModelReady: (model) => model.getPatientAdvanceBalanceAmount(),
      builder: (_, model, w) => AppScaffold(
        baseViewModel: model,
        isShowAppBar: true,
        appBarTitle: TranslationBase.of(context).myBalances,
-        description: TranslationBase.of(context).infoMyBalance,
        imagesInfo: imagesInfo,
+        description: TranslationBase.of(context).infoMyBalance,
        body: Container(
          margin: EdgeInsets.all(12),
          child: Column(
--- a/lib/pages/medical/labs/laboratory_result_page.dart
+++ b/lib/pages/medical/labs/laboratory_result_page.dart
@ -1,6 +1,7 @@
 import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart';
 import 'package:diplomaticquarterapp/core/viewModels/medical/labs_view_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/medical/laboratory_result_widget.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
@ -21,7 +22,7 @@ class LaboratoryResultPage extends StatelessWidget {
          orderNo: patientLabOrders.orderNo),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: true,
-        appBarTitle: 'Laboratory result',
+        appBarTitle: TranslationBase.of(context).labResults,
        baseViewModel: model,
        body: Scaffold(
          body: ListView.builder(
--- a/lib/services/appointment_services/GetDoctorsList.dart
+++ b/lib/services/appointment_services/GetDoctorsList.dart
@ -177,6 +177,72 @@ class DoctorsListService extends BaseService {
    return Future.value(localRes);
  }

+  Future<Map> getDoctorsRating(
+      int docID, context) async {
+    Map<String, dynamic> request;
+    var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+    Request req = appGlobal.getPublicRequest();
+    request = {
+      "LanguageID": languageID == 'ar' ? 1 : 2,
+      "IPAdress": "10.20.10.20",
+      "VersionID": req.VersionID,
+      "Channel": req.Channel,
+      "generalid": 'Cs2020@2016\$2958',
+      "PatientOutSA": authUser.outSA,
+      "TokenID": "",
+      "DeviceTypeID": req.DeviceTypeID,
+      "SessionID": null,
+      "doctorID": docID,
+      "PatientID": 0,
+      "License": true,
+      "IsRegistered": true,
+      "isDentalAllowedBackend": false
+    };
+
+    dynamic localRes;
+
+    await baseAppClient.post(GET_DOCTOR_RATING_NOTES,
+        onSuccess: (response, statusCode) async {
+          localRes = response;
+        }, onFailure: (String error, int statusCode) {
+          throw error;
+        }, body: request);
+    return Future.value(localRes);
+  }
+
+  Future<Map> getDoctorsRatingDetails(
+      int docID, context) async {
+    Map<String, dynamic> request;
+    var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+    Request req = appGlobal.getPublicRequest();
+    request = {
+      "LanguageID": languageID == 'ar' ? 1 : 2,
+      "IPAdress": "10.20.10.20",
+      "VersionID": req.VersionID,
+      "Channel": req.Channel,
+      "generalid": 'Cs2020@2016\$2958',
+      "PatientOutSA": authUser.outSA,
+      "TokenID": "",
+      "DeviceTypeID": req.DeviceTypeID,
+      "SessionID": null,
+      "DoctorID": docID,
+      "PatientID": 0,
+      "License": true,
+      "IsRegistered": true,
+      "isDentalAllowedBackend": false
+    };
+
+    dynamic localRes;
+
+    await baseAppClient.post(GET_DOCTOR_RATING_DETAILS,
+        onSuccess: (response, statusCode) async {
+          localRes = response;
+        }, onFailure: (String error, int statusCode) {
+          throw error;
+        }, body: request);
+    return Future.value(localRes);
+  }
+
  Future<Map> getDoctorFreeSlots(
      int docID, int clinicID, int projectID, BuildContext context) async {
    Map<String, dynamic> request;
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@ -867,6 +867,12 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
  String get openRad => localizedValues['open-rad'][locale.languageCode];
  String get sendCopyRad => localizedValues['send-copy'][locale.languageCode];
  String get appoSurvey => localizedValues['appoSurvey'][locale.languageCode];
+  String get labResults => localizedValues['labResults'][locale.languageCode];
+  String get doctorRating => localizedValues['doctorRating'][locale.languageCode];
+  String get good => localizedValues['good'][locale.languageCode];
+  String get v_good => localizedValues['v-good'][locale.languageCode];
+  String get excellent => localizedValues['excellent'][locale.languageCode];
+  String get below_average => localizedValues['below-average'][locale.languageCode];
  String get infoSigns => localizedValues['info-signs'][locale.languageCode];
  String get infoAdvancePayment => localizedValues['info-advance-payment'][locale.languageCode];
  String get infoMyBalance => localizedValues['info-my-balance'][locale.languageCode];
@ -902,6 +908,10 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
  String get transportMethod => localizedValues['transport-method'][locale.languageCode];
  String get directions => localizedValues['directions'][locale.languageCode];

+  String get infoMyAppointments => localizedValues['info-my-appointments'][locale.languageCode];
+  String get infoAdvancePayment => localizedValues['info-advance-payment'][locale.languageCode];
+  String get infoTodo => localizedValues['info-todo'][locale.languageCode];
+  String get infoMyBalance => localizedValues['info-my-balance'][locale.languageCode];

 }

--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -2,7 +2,7 @@ name: diplomaticquarterapp
 description: A new Flutter application.


-version: 1.0.0+1
+version: 1.0.4+5

 environment:
  sdk: ">=2.6.0 <3.0.0"
@ -150,7 +150,7 @@ dependencies:
 #  recase: ^3.0.0
  wakelock: ^0.1.4
  after_layout: ^1.0.7
-  twilio_programmable_video: ^0.5.0+3
+  twilio_programmable_video: ^0.6.3+1
  flutter_tts: ^1.2.6
  vibration: ^1.7.2
  speech_to_text: