diff --git a/android/app/agconnect-services.json b/android/app/agconnect-services.json
new file mode 100644
index 00000000..cfdaf83b
--- /dev/null
+++ b/android/app/agconnect-services.json
@@ -0,0 +1,14 @@
+{
+ "client":{
+ "appType":"1",
+ "cp_id":"2640966000002322881",
+ "product_id":"736430079244816567",
+ "client_id":"563735388191982656",
+ "client_secret":"650C7C799812AFFD53A10C7756CF05FB9F215A7E49032ABA8EBF3E14B77535CF",
+ "project_id":"736430079244816567",
+ "app_id":"102857389",
+ "api_key":"CgB6e3x9DJzMgRCmnT6dyUEkp6UsIfddb6l3w0ZEXzeiRMHEFi3400Z5fJ5qaHneU0OrAI/JRpk+DMGVs3QpUxlI",
+ "package_name":"com.ejada.hmg"
+ },
+ "configuration_version":"1.0"
+}
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5fd11eb3..bfe7fde4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,6 +22,7 @@ if (flutterVersionName == null) {
}
apply plugin: 'com.android.application'
+apply plugin: 'com.huawei.agconnect'
apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7d2259c5..867a4e03 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -22,6 +22,8 @@
+
+
diff --git a/android/build.gradle b/android/build.gradle
index c0fc03b3..4ef0d731 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,6 +3,8 @@ buildscript {
repositories {
google()
jcenter()
+ maven { url 'https://developer.huawei.com/repo/' }
+
// maven {
// url "https://dl.bintray.com/kotlin/kotlin-eap/"
// }
@@ -12,6 +14,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.8'
+ classpath 'com.huawei.agconnect:agcp:1.4.2.301'
}
}
@@ -20,6 +23,7 @@ allprojects {
google()
// jcenter()
mavenCentral()
+ maven { url 'https://developer.huawei.com/repo/' }
}
}
diff --git a/assets/images/1.png b/assets/images/1.png
deleted file mode 100644
index c90aa190..00000000
Binary files a/assets/images/1.png and /dev/null differ
diff --git a/assets/images/2.png b/assets/images/2.png
deleted file mode 100644
index 48891b32..00000000
Binary files a/assets/images/2.png and /dev/null differ
diff --git a/assets/images/3.png b/assets/images/3.png
deleted file mode 100644
index 721f6e6c..00000000
Binary files a/assets/images/3.png and /dev/null differ
diff --git a/assets/images/4.png b/assets/images/4.png
deleted file mode 100644
index 6d61b45f..00000000
Binary files a/assets/images/4.png and /dev/null differ
diff --git a/assets/images/5.png b/assets/images/5.png
deleted file mode 100644
index e45f432c..00000000
Binary files a/assets/images/5.png and /dev/null differ
diff --git a/assets/images/AlHabibMedicalService/health_calculator/bmr.png b/assets/images/AlHabibMedicalService/health_calculator/bmr.png
deleted file mode 100644
index db31ed43..00000000
Binary files a/assets/images/AlHabibMedicalService/health_calculator/bmr.png and /dev/null differ
diff --git a/assets/images/AlHabibMedicalService/health_calculator/body-fat.png b/assets/images/AlHabibMedicalService/health_calculator/body-fat.png
deleted file mode 100644
index 97b05df3..00000000
Binary files a/assets/images/AlHabibMedicalService/health_calculator/body-fat.png and /dev/null differ
diff --git a/assets/images/BMI/BMIChart_AR.png b/assets/images/BMI/BMIChart_AR.png
deleted file mode 100644
index 405574c0..00000000
Binary files a/assets/images/BMI/BMIChart_AR.png and /dev/null differ
diff --git a/assets/images/BMI/BMIChart_EN.png b/assets/images/BMI/BMIChart_EN.png
deleted file mode 100644
index 2432e888..00000000
Binary files a/assets/images/BMI/BMIChart_EN.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_blue_female_ar.png b/assets/images/BMI/bmi_blue_female_ar.png
deleted file mode 100644
index 483cb664..00000000
Binary files a/assets/images/BMI/bmi_blue_female_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_blue_female_en.png b/assets/images/BMI/bmi_blue_female_en.png
deleted file mode 100644
index 9984736e..00000000
Binary files a/assets/images/BMI/bmi_blue_female_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_blue_male_ar.png b/assets/images/BMI/bmi_blue_male_ar.png
deleted file mode 100644
index d4ff734c..00000000
Binary files a/assets/images/BMI/bmi_blue_male_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_blue_male_en.png b/assets/images/BMI/bmi_blue_male_en.png
deleted file mode 100644
index ec50a0c6..00000000
Binary files a/assets/images/BMI/bmi_blue_male_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_green_female_ar.png b/assets/images/BMI/bmi_green_female_ar.png
deleted file mode 100644
index f8dc4759..00000000
Binary files a/assets/images/BMI/bmi_green_female_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_green_female_en.png b/assets/images/BMI/bmi_green_female_en.png
deleted file mode 100644
index b4eb32e0..00000000
Binary files a/assets/images/BMI/bmi_green_female_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_green_male_ar.png b/assets/images/BMI/bmi_green_male_ar.png
deleted file mode 100644
index 380d8384..00000000
Binary files a/assets/images/BMI/bmi_green_male_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_green_male_en.png b/assets/images/BMI/bmi_green_male_en.png
deleted file mode 100644
index 78693310..00000000
Binary files a/assets/images/BMI/bmi_green_male_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_orange_female_ar.png b/assets/images/BMI/bmi_orange_female_ar.png
deleted file mode 100644
index b2437c14..00000000
Binary files a/assets/images/BMI/bmi_orange_female_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_orange_female_en.png b/assets/images/BMI/bmi_orange_female_en.png
deleted file mode 100644
index 31779cd3..00000000
Binary files a/assets/images/BMI/bmi_orange_female_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_orange_male_ar.png b/assets/images/BMI/bmi_orange_male_ar.png
deleted file mode 100644
index 291b316e..00000000
Binary files a/assets/images/BMI/bmi_orange_male_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_orange_male_en.png b/assets/images/BMI/bmi_orange_male_en.png
deleted file mode 100644
index c6ebb5eb..00000000
Binary files a/assets/images/BMI/bmi_orange_male_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_red_female_ar.png b/assets/images/BMI/bmi_red_female_ar.png
deleted file mode 100644
index 0e4d7339..00000000
Binary files a/assets/images/BMI/bmi_red_female_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_red_female_en.png b/assets/images/BMI/bmi_red_female_en.png
deleted file mode 100644
index 0d5dfe80..00000000
Binary files a/assets/images/BMI/bmi_red_female_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_red_male_ar.png b/assets/images/BMI/bmi_red_male_ar.png
deleted file mode 100644
index 86a47cb2..00000000
Binary files a/assets/images/BMI/bmi_red_male_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_red_male_en.png b/assets/images/BMI/bmi_red_male_en.png
deleted file mode 100644
index 452aa4f3..00000000
Binary files a/assets/images/BMI/bmi_red_male_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_yellow_female_ar.png b/assets/images/BMI/bmi_yellow_female_ar.png
deleted file mode 100644
index 7453a642..00000000
Binary files a/assets/images/BMI/bmi_yellow_female_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_yellow_female_en.png b/assets/images/BMI/bmi_yellow_female_en.png
deleted file mode 100644
index d2374c22..00000000
Binary files a/assets/images/BMI/bmi_yellow_female_en.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_yellow_male_ar.png b/assets/images/BMI/bmi_yellow_male_ar.png
deleted file mode 100644
index 754cf6ea..00000000
Binary files a/assets/images/BMI/bmi_yellow_male_ar.png and /dev/null differ
diff --git a/assets/images/BMI/bmi_yellow_male_en.png b/assets/images/BMI/bmi_yellow_male_en.png
deleted file mode 100644
index f64decfe..00000000
Binary files a/assets/images/BMI/bmi_yellow_male_en.png and /dev/null differ
diff --git a/assets/images/CloseIcon.png b/assets/images/CloseIcon.png
deleted file mode 100644
index b8e68fea..00000000
Binary files a/assets/images/CloseIcon.png and /dev/null differ
diff --git a/assets/images/DQ/DQ_logo.png b/assets/images/DQ/DQ_logo.png
deleted file mode 100644
index 993a1bd3..00000000
Binary files a/assets/images/DQ/DQ_logo.png and /dev/null differ
diff --git a/assets/images/DQ/dq_logo_icon.png b/assets/images/DQ/dq_logo_icon.png
deleted file mode 100644
index 71626bd8..00000000
Binary files a/assets/images/DQ/dq_logo_icon.png and /dev/null differ
diff --git a/assets/images/DQ/logo_big.png b/assets/images/DQ/logo_big.png
deleted file mode 100644
index 0d9e4a56..00000000
Binary files a/assets/images/DQ/logo_big.png and /dev/null differ
diff --git a/assets/images/Dr_Schedule_report.png b/assets/images/Dr_Schedule_report.png
deleted file mode 100644
index 9519f719..00000000
Binary files a/assets/images/Dr_Schedule_report.png and /dev/null differ
diff --git a/assets/images/SmartWatches/fossil-sport.png b/assets/images/SmartWatches/fossil-sport.png
deleted file mode 100644
index 207bbbe3..00000000
Binary files a/assets/images/SmartWatches/fossil-sport.png and /dev/null differ
diff --git a/assets/images/al-habib_onlne_pharmacy_bg.png b/assets/images/al-habib_onlne_pharmacy_bg.png
deleted file mode 100644
index d8809570..00000000
Binary files a/assets/images/al-habib_onlne_pharmacy_bg.png and /dev/null differ
diff --git a/assets/images/appointment_booking.png b/assets/images/appointment_booking.png
deleted file mode 100644
index 14db8d89..00000000
Binary files a/assets/images/appointment_booking.png and /dev/null differ
diff --git a/assets/images/ask_doctor.png b/assets/images/ask_doctor.png
deleted file mode 100644
index f74ac6a8..00000000
Binary files a/assets/images/ask_doctor.png and /dev/null differ
diff --git a/assets/images/ask_doctor_bg.png b/assets/images/ask_doctor_bg.png
deleted file mode 100644
index 16e8e9d7..00000000
Binary files a/assets/images/ask_doctor_bg.png and /dev/null differ
diff --git a/assets/images/bg_graphic.png b/assets/images/bg_graphic.png
deleted file mode 100644
index 01525404..00000000
Binary files a/assets/images/bg_graphic.png and /dev/null differ
diff --git a/assets/images/blood-drop.png b/assets/images/blood-drop.png
deleted file mode 100644
index a981e3d3..00000000
Binary files a/assets/images/blood-drop.png and /dev/null differ
diff --git a/assets/images/bn_offer.png b/assets/images/bn_offer.png
deleted file mode 100644
index 7eca85cb..00000000
Binary files a/assets/images/bn_offer.png and /dev/null differ
diff --git a/assets/images/bn_offer.svg b/assets/images/bn_offer.svg
deleted file mode 100644
index 9bbcbadf..00000000
--- a/assets/images/bn_offer.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-
diff --git a/assets/images/book_appointment_arabic.png b/assets/images/book_appointment_arabic.png
deleted file mode 100644
index f0bc5aff..00000000
Binary files a/assets/images/book_appointment_arabic.png and /dev/null differ
diff --git a/assets/images/booking_ar.png b/assets/images/booking_ar.png
deleted file mode 100644
index b562f288..00000000
Binary files a/assets/images/booking_ar.png and /dev/null differ
diff --git a/assets/images/booking_en.png b/assets/images/booking_en.png
deleted file mode 100644
index a3ffa8be..00000000
Binary files a/assets/images/booking_en.png and /dev/null differ
diff --git a/assets/images/contact_us_bg.png b/assets/images/contact_us_bg.png
deleted file mode 100644
index 40564039..00000000
Binary files a/assets/images/contact_us_bg.png and /dev/null differ
diff --git a/assets/images/covid_bg_transparent.png b/assets/images/covid_bg_transparent.png
deleted file mode 100644
index cd5f12f1..00000000
Binary files a/assets/images/covid_bg_transparent.png and /dev/null differ
diff --git a/assets/images/cs_logo_container.png b/assets/images/cs_logo_container.png
deleted file mode 100644
index 5f938580..00000000
Binary files a/assets/images/cs_logo_container.png and /dev/null differ
diff --git a/assets/images/dashboard_top_bg.png b/assets/images/dashboard_top_bg.png
deleted file mode 100644
index 98b4c943..00000000
Binary files a/assets/images/dashboard_top_bg.png and /dev/null differ
diff --git a/assets/images/discount_ar.png b/assets/images/discount_ar.png
deleted file mode 100644
index 854d1c1f..00000000
Binary files a/assets/images/discount_ar.png and /dev/null differ
diff --git a/assets/images/discount_en.png b/assets/images/discount_en.png
deleted file mode 100644
index 2af52865..00000000
Binary files a/assets/images/discount_en.png and /dev/null differ
diff --git a/assets/images/dq_home_page_bg_image.png b/assets/images/dq_home_page_bg_image.png
deleted file mode 100644
index f70df2ae..00000000
Binary files a/assets/images/dq_home_page_bg_image.png and /dev/null differ
diff --git a/assets/images/drSchedul.png b/assets/images/drSchedul.png
deleted file mode 100644
index 4bb95607..00000000
Binary files a/assets/images/drSchedul.png and /dev/null differ
diff --git a/assets/images/heartbeat.png b/assets/images/heartbeat.png
deleted file mode 100644
index 3a83ddee..00000000
Binary files a/assets/images/heartbeat.png and /dev/null differ
diff --git a/assets/images/height_icon.png b/assets/images/height_icon.png
deleted file mode 100644
index cca88ac0..00000000
Binary files a/assets/images/height_icon.png and /dev/null differ
diff --git a/assets/images/hmg_services_bg .png b/assets/images/hmg_services_bg .png
deleted file mode 100644
index 508f9a0d..00000000
Binary files a/assets/images/hmg_services_bg .png and /dev/null differ
diff --git a/assets/images/home_health_care_icon.png b/assets/images/home_health_care_icon.png
deleted file mode 100644
index d80ec015..00000000
Binary files a/assets/images/home_health_care_icon.png and /dev/null differ
diff --git a/assets/images/home_healthcare_service_bg.png b/assets/images/home_healthcare_service_bg.png
deleted file mode 100644
index 2765b47e..00000000
Binary files a/assets/images/home_healthcare_service_bg.png and /dev/null differ
diff --git a/assets/images/livecare_white_logo.png b/assets/images/livecare_white_logo.png
deleted file mode 100644
index dc223965..00000000
Binary files a/assets/images/livecare_white_logo.png and /dev/null differ
diff --git a/assets/images/login/101.png b/assets/images/login/101.png
deleted file mode 100644
index 90c1c575..00000000
Binary files a/assets/images/login/101.png and /dev/null differ
diff --git a/assets/images/login/102.png b/assets/images/login/102.png
deleted file mode 100644
index 8502d197..00000000
Binary files a/assets/images/login/102.png and /dev/null differ
diff --git a/assets/images/login/104.png b/assets/images/login/104.png
deleted file mode 100644
index ad55ff74..00000000
Binary files a/assets/images/login/104.png and /dev/null differ
diff --git a/assets/images/login/fileNum.png b/assets/images/login/fileNum.png
deleted file mode 100644
index 386299b7..00000000
Binary files a/assets/images/login/fileNum.png and /dev/null differ
diff --git a/assets/images/login/forget.png b/assets/images/login/forget.png
deleted file mode 100644
index 57aa7ccc..00000000
Binary files a/assets/images/login/forget.png and /dev/null differ
diff --git a/assets/images/login/id.png b/assets/images/login/id.png
deleted file mode 100644
index 9260cf11..00000000
Binary files a/assets/images/login/id.png and /dev/null differ
diff --git a/assets/images/login/nationalID.png b/assets/images/login/nationalID.png
deleted file mode 100644
index 5779d562..00000000
Binary files a/assets/images/login/nationalID.png and /dev/null differ
diff --git a/assets/images/logo_HMG.png b/assets/images/logo_HMG.png
deleted file mode 100644
index 0d9e4a56..00000000
Binary files a/assets/images/logo_HMG.png and /dev/null differ
diff --git a/assets/images/map_markers/driver-pin.png b/assets/images/map_markers/driver-pin.png
deleted file mode 100644
index 9d16ceca..00000000
Binary files a/assets/images/map_markers/driver-pin.png and /dev/null differ
diff --git a/assets/images/medical/my_appointment_icon.png b/assets/images/medical/my_appointment_icon.png
deleted file mode 100644
index f5e4c7d4..00000000
Binary files a/assets/images/medical/my_appointment_icon.png and /dev/null differ
diff --git a/assets/images/medical/radiology_icon.png b/assets/images/medical/radiology_icon.png
deleted file mode 100644
index 9e760d65..00000000
Binary files a/assets/images/medical/radiology_icon.png and /dev/null differ
diff --git a/assets/images/medical/vital_sign_icon.png b/assets/images/medical/vital_sign_icon.png
deleted file mode 100644
index fbd0908b..00000000
Binary files a/assets/images/medical/vital_sign_icon.png and /dev/null differ
diff --git a/assets/images/new-design/add_user_icon.png b/assets/images/new-design/add_user_icon.png
deleted file mode 100644
index b8a1d795..00000000
Binary files a/assets/images/new-design/add_user_icon.png and /dev/null differ
diff --git a/assets/images/new-design/advance_payment.png b/assets/images/new-design/advance_payment.png
deleted file mode 100644
index 2889e6fc..00000000
Binary files a/assets/images/new-design/advance_payment.png and /dev/null differ
diff --git a/assets/images/new-design/alert_top-bar_icon.png b/assets/images/new-design/alert_top-bar_icon.png
deleted file mode 100644
index c275fca9..00000000
Binary files a/assets/images/new-design/alert_top-bar_icon.png and /dev/null differ
diff --git a/assets/images/new-design/alert_top-bar_icon_red.png b/assets/images/new-design/alert_top-bar_icon_red.png
deleted file mode 100644
index 881ab3ac..00000000
Binary files a/assets/images/new-design/alert_top-bar_icon_red.png and /dev/null differ
diff --git a/assets/images/new-design/ambulance.png b/assets/images/new-design/ambulance.png
deleted file mode 100644
index 7d8a26c8..00000000
Binary files a/assets/images/new-design/ambulance.png and /dev/null differ
diff --git a/assets/images/new-design/appointment_booking.png b/assets/images/new-design/appointment_booking.png
deleted file mode 100644
index 14db8d89..00000000
Binary files a/assets/images/new-design/appointment_booking.png and /dev/null differ
diff --git a/assets/images/new-design/appointment_info.png b/assets/images/new-design/appointment_info.png
deleted file mode 100644
index 9f2b8c50..00000000
Binary files a/assets/images/new-design/appointment_info.png and /dev/null differ
diff --git a/assets/images/new-design/arrow.png b/assets/images/new-design/arrow.png
deleted file mode 100644
index 19af7c0b..00000000
Binary files a/assets/images/new-design/arrow.png and /dev/null differ
diff --git a/assets/images/new-design/arrow_black.png b/assets/images/new-design/arrow_black.png
deleted file mode 100644
index c2132d3e..00000000
Binary files a/assets/images/new-design/arrow_black.png and /dev/null differ
diff --git a/assets/images/new-design/arrow_menu_red.png b/assets/images/new-design/arrow_menu_red.png
deleted file mode 100644
index de7639ea..00000000
Binary files a/assets/images/new-design/arrow_menu_red.png and /dev/null differ
diff --git a/assets/images/new-design/arrow_white.png b/assets/images/new-design/arrow_white.png
deleted file mode 100644
index 0c2fa7a4..00000000
Binary files a/assets/images/new-design/arrow_white.png and /dev/null differ
diff --git a/assets/images/new-design/attach-prescription.png b/assets/images/new-design/attach-prescription.png
deleted file mode 100644
index fc1b649b..00000000
Binary files a/assets/images/new-design/attach-prescription.png and /dev/null differ
diff --git a/assets/images/new-design/available_vaccines_to_bar.png b/assets/images/new-design/available_vaccines_to_bar.png
deleted file mode 100644
index b988355f..00000000
Binary files a/assets/images/new-design/available_vaccines_to_bar.png and /dev/null differ
diff --git a/assets/images/new-design/awesome-star.png b/assets/images/new-design/awesome-star.png
deleted file mode 100644
index 36153c59..00000000
Binary files a/assets/images/new-design/awesome-star.png and /dev/null differ
diff --git a/assets/images/new-design/blood_pressure_icon.png b/assets/images/new-design/blood_pressure_icon.png
deleted file mode 100644
index 0d622094..00000000
Binary files a/assets/images/new-design/blood_pressure_icon.png and /dev/null differ
diff --git a/assets/images/new-design/blood_type.png b/assets/images/new-design/blood_type.png
deleted file mode 100644
index c0e09ae4..00000000
Binary files a/assets/images/new-design/blood_type.png and /dev/null differ
diff --git a/assets/images/new-design/body_icon.png b/assets/images/new-design/body_icon.png
deleted file mode 100644
index b9a70b2b..00000000
Binary files a/assets/images/new-design/body_icon.png and /dev/null differ
diff --git a/assets/images/new-design/body_mass.png b/assets/images/new-design/body_mass.png
deleted file mode 100644
index 01cebfb8..00000000
Binary files a/assets/images/new-design/body_mass.png and /dev/null differ
diff --git a/assets/images/new-design/body_mass_icon.png b/assets/images/new-design/body_mass_icon.png
deleted file mode 100644
index c93a31cb..00000000
Binary files a/assets/images/new-design/body_mass_icon.png and /dev/null differ
diff --git a/assets/images/new-design/book_appointment_arabic.png b/assets/images/new-design/book_appointment_arabic.png
deleted file mode 100644
index f0bc5aff..00000000
Binary files a/assets/images/new-design/book_appointment_arabic.png and /dev/null differ
diff --git a/assets/images/new-design/booking_icon.png b/assets/images/new-design/booking_icon.png
deleted file mode 100644
index 8693a1fe..00000000
Binary files a/assets/images/new-design/booking_icon.png and /dev/null differ
diff --git a/assets/images/new-design/calendar_reminder_black_icon.svg b/assets/images/new-design/calendar_reminder_black_icon.svg
deleted file mode 100644
index 8885e241..00000000
--- a/assets/images/new-design/calendar_reminder_black_icon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/assets/images/new-design/call.png b/assets/images/new-design/call.png
deleted file mode 100644
index cf6713cb..00000000
Binary files a/assets/images/new-design/call.png and /dev/null differ
diff --git a/assets/images/new-design/cancel.png b/assets/images/new-design/cancel.png
deleted file mode 100644
index 5aa51245..00000000
Binary files a/assets/images/new-design/cancel.png and /dev/null differ
diff --git a/assets/images/new-design/chat_with_us_icon.png b/assets/images/new-design/chat_with_us_icon.png
deleted file mode 100644
index 6d2af727..00000000
Binary files a/assets/images/new-design/chat_with_us_icon.png and /dev/null differ
diff --git a/assets/images/new-design/check-icon.png b/assets/images/new-design/check-icon.png
deleted file mode 100644
index 669a4975..00000000
Binary files a/assets/images/new-design/check-icon.png and /dev/null differ
diff --git a/assets/images/new-design/clinic-wayfinding-2.png b/assets/images/new-design/clinic-wayfinding-2.png
deleted file mode 100644
index 5ac63738..00000000
Binary files a/assets/images/new-design/clinic-wayfinding-2.png and /dev/null differ
diff --git a/assets/images/new-design/confirm_appointment_icon.png b/assets/images/new-design/confirm_appointment_icon.png
deleted file mode 100644
index 9918f4d5..00000000
Binary files a/assets/images/new-design/confirm_appointment_icon.png and /dev/null differ
diff --git a/assets/images/new-design/connect_to_internet_icon.png b/assets/images/new-design/connect_to_internet_icon.png
deleted file mode 100644
index 14e7758a..00000000
Binary files a/assets/images/new-design/connect_to_internet_icon.png and /dev/null differ
diff --git a/assets/images/new-design/cs_logo.png b/assets/images/new-design/cs_logo.png
deleted file mode 100644
index fa03e4f9..00000000
Binary files a/assets/images/new-design/cs_logo.png and /dev/null differ
diff --git a/assets/images/new-design/discount_offers.png b/assets/images/new-design/discount_offers.png
deleted file mode 100644
index dd4a0d05..00000000
Binary files a/assets/images/new-design/discount_offers.png and /dev/null differ
diff --git a/assets/images/new-design/doctor_book_physical_appointment.png b/assets/images/new-design/doctor_book_physical_appointment.png
deleted file mode 100644
index 16458b29..00000000
Binary files a/assets/images/new-design/doctor_book_physical_appointment.png and /dev/null differ
diff --git a/assets/images/new-design/doctor_information_icon.png b/assets/images/new-design/doctor_information_icon.png
deleted file mode 100644
index cb210a97..00000000
Binary files a/assets/images/new-design/doctor_information_icon.png and /dev/null differ
diff --git a/assets/images/new-design/doctor_qualification_icon.png b/assets/images/new-design/doctor_qualification_icon.png
deleted file mode 100644
index 29225e6d..00000000
Binary files a/assets/images/new-design/doctor_qualification_icon.png and /dev/null differ
diff --git a/assets/images/new-design/download_pharmacy_app.png b/assets/images/new-design/download_pharmacy_app.png
deleted file mode 100644
index 89c64085..00000000
Binary files a/assets/images/new-design/download_pharmacy_app.png and /dev/null differ
diff --git a/assets/images/new-design/emergency_videocall_icon.png b/assets/images/new-design/emergency_videocall_icon.png
deleted file mode 100644
index 0f67e245..00000000
Binary files a/assets/images/new-design/emergency_videocall_icon.png and /dev/null differ
diff --git a/assets/images/new-design/envelop_icon.png b/assets/images/new-design/envelop_icon.png
deleted file mode 100644
index 86f21eb5..00000000
Binary files a/assets/images/new-design/envelop_icon.png and /dev/null differ
diff --git a/assets/images/new-design/family_member_icon_active.png b/assets/images/new-design/family_member_icon_active.png
deleted file mode 100644
index 5806c872..00000000
Binary files a/assets/images/new-design/family_member_icon_active.png and /dev/null differ
diff --git a/assets/images/new-design/family_member_icon_inactive.png b/assets/images/new-design/family_member_icon_inactive.png
deleted file mode 100644
index 59f6c912..00000000
Binary files a/assets/images/new-design/family_member_icon_inactive.png and /dev/null differ
diff --git a/assets/images/new-design/family_menu_icon_red.png b/assets/images/new-design/family_menu_icon_red.png
deleted file mode 100644
index 7d55094e..00000000
Binary files a/assets/images/new-design/family_menu_icon_red.png and /dev/null differ
diff --git a/assets/images/new-design/generate_visit_ticket.png b/assets/images/new-design/generate_visit_ticket.png
deleted file mode 100644
index 5d250853..00000000
Binary files a/assets/images/new-design/generate_visit_ticket.png and /dev/null differ
diff --git a/assets/images/new-design/health_calculator_general.png b/assets/images/new-design/health_calculator_general.png
deleted file mode 100644
index 2cc02679..00000000
Binary files a/assets/images/new-design/health_calculator_general.png and /dev/null differ
diff --git a/assets/images/new-design/health_calculator_women.png b/assets/images/new-design/health_calculator_women.png
deleted file mode 100644
index 2c292444..00000000
Binary files a/assets/images/new-design/health_calculator_women.png and /dev/null differ
diff --git a/assets/images/new-design/heart_icon.png b/assets/images/new-design/heart_icon.png
deleted file mode 100644
index 1cf02faf..00000000
Binary files a/assets/images/new-design/heart_icon.png and /dev/null differ
diff --git a/assets/images/new-design/height.png b/assets/images/new-design/height.png
deleted file mode 100644
index 718f8a5d..00000000
Binary files a/assets/images/new-design/height.png and /dev/null differ
diff --git a/assets/images/new-design/height_icon.png b/assets/images/new-design/height_icon.png
deleted file mode 100644
index cca88ac0..00000000
Binary files a/assets/images/new-design/height_icon.png and /dev/null differ
diff --git a/assets/images/new-design/history_icon.png b/assets/images/new-design/history_icon.png
deleted file mode 100644
index 8ef33358..00000000
Binary files a/assets/images/new-design/history_icon.png and /dev/null differ
diff --git a/assets/images/new-design/hmg_full_logo.png b/assets/images/new-design/hmg_full_logo.png
deleted file mode 100644
index 1449d28d..00000000
Binary files a/assets/images/new-design/hmg_full_logo.png and /dev/null differ
diff --git a/assets/images/new-design/hmg_services.png b/assets/images/new-design/hmg_services.png
deleted file mode 100644
index 5892dd84..00000000
Binary files a/assets/images/new-design/hmg_services.png and /dev/null differ
diff --git a/assets/images/new-design/hmg_services_ar.png b/assets/images/new-design/hmg_services_ar.png
deleted file mode 100644
index da5a5085..00000000
Binary files a/assets/images/new-design/hmg_services_ar.png and /dev/null differ
diff --git a/assets/images/new-design/home_bottom_bar.png b/assets/images/new-design/home_bottom_bar.png
deleted file mode 100644
index 49f4e84a..00000000
Binary files a/assets/images/new-design/home_bottom_bar.png and /dev/null differ
diff --git a/assets/images/new-design/home_bottom_bar_active.png b/assets/images/new-design/home_bottom_bar_active.png
deleted file mode 100644
index ce642d0b..00000000
Binary files a/assets/images/new-design/home_bottom_bar_active.png and /dev/null differ
diff --git a/assets/images/new-design/icon_check_list.png b/assets/images/new-design/icon_check_list.png
deleted file mode 100644
index 1fc5ab3e..00000000
Binary files a/assets/images/new-design/icon_check_list.png and /dev/null differ
diff --git a/assets/images/new-design/info-icon.png b/assets/images/new-design/info-icon.png
deleted file mode 100644
index 49b1bc44..00000000
Binary files a/assets/images/new-design/info-icon.png and /dev/null differ
diff --git a/assets/images/new-design/info_icon copy.png b/assets/images/new-design/info_icon copy.png
deleted file mode 100644
index 49b1bc44..00000000
Binary files a/assets/images/new-design/info_icon copy.png and /dev/null differ
diff --git a/assets/images/new-design/input_calendar_icon.png b/assets/images/new-design/input_calendar_icon.png
deleted file mode 100644
index d3a51014..00000000
Binary files a/assets/images/new-design/input_calendar_icon.png and /dev/null differ
diff --git a/assets/images/new-design/input_clock_icon.png b/assets/images/new-design/input_clock_icon.png
deleted file mode 100644
index 67b15715..00000000
Binary files a/assets/images/new-design/input_clock_icon.png and /dev/null differ
diff --git a/assets/images/new-design/ionic-ios-eye.png b/assets/images/new-design/ionic-ios-eye.png
deleted file mode 100644
index 93eabdfc..00000000
Binary files a/assets/images/new-design/ionic-ios-eye.png and /dev/null differ
diff --git a/assets/images/new-design/lakum_icon.png b/assets/images/new-design/lakum_icon.png
deleted file mode 100644
index eab11b56..00000000
Binary files a/assets/images/new-design/lakum_icon.png and /dev/null differ
diff --git a/assets/images/new-design/list-icon-down.png b/assets/images/new-design/list-icon-down.png
deleted file mode 100644
index 02c73b5b..00000000
Binary files a/assets/images/new-design/list-icon-down.png and /dev/null differ
diff --git a/assets/images/new-design/list-icon-up.png b/assets/images/new-design/list-icon-up.png
deleted file mode 100644
index eb6a6019..00000000
Binary files a/assets/images/new-design/list-icon-up.png and /dev/null differ
diff --git a/assets/images/new-design/liveCare_white_logo.svg b/assets/images/new-design/liveCare_white_logo.svg
deleted file mode 100644
index 494b3671..00000000
--- a/assets/images/new-design/liveCare_white_logo.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-
diff --git a/assets/images/new-design/livecare_arabic_logo.svg b/assets/images/new-design/livecare_arabic_logo.svg
deleted file mode 100644
index c524a803..00000000
--- a/assets/images/new-design/livecare_arabic_logo.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-
diff --git a/assets/images/new-design/livecare_white_logo.png b/assets/images/new-design/livecare_white_logo.png
deleted file mode 100644
index dc223965..00000000
Binary files a/assets/images/new-design/livecare_white_logo.png and /dev/null differ
diff --git a/assets/images/new-design/location-sharp.png b/assets/images/new-design/location-sharp.png
deleted file mode 100644
index 9682fde1..00000000
Binary files a/assets/images/new-design/location-sharp.png and /dev/null differ
diff --git a/assets/images/new-design/lock_icon.png b/assets/images/new-design/lock_icon.png
deleted file mode 100644
index bf8c6aed..00000000
Binary files a/assets/images/new-design/lock_icon.png and /dev/null differ
diff --git a/assets/images/new-design/main_user_icon_active.png b/assets/images/new-design/main_user_icon_active.png
deleted file mode 100644
index d1005e17..00000000
Binary files a/assets/images/new-design/main_user_icon_active.png and /dev/null differ
diff --git a/assets/images/new-design/main_user_icon_inaactive.png b/assets/images/new-design/main_user_icon_inaactive.png
deleted file mode 100644
index b203d151..00000000
Binary files a/assets/images/new-design/main_user_icon_inaactive.png and /dev/null differ
diff --git a/assets/images/new-design/medical_services.png b/assets/images/new-design/medical_services.png
deleted file mode 100644
index 596ac34e..00000000
Binary files a/assets/images/new-design/medical_services.png and /dev/null differ
diff --git a/assets/images/new-design/medical_services_ar.png b/assets/images/new-design/medical_services_ar.png
deleted file mode 100644
index 082fe5fa..00000000
Binary files a/assets/images/new-design/medical_services_ar.png and /dev/null differ
diff --git a/assets/images/new-design/medication-refill.png b/assets/images/new-design/medication-refill.png
deleted file mode 100644
index fec82538..00000000
Binary files a/assets/images/new-design/medication-refill.png and /dev/null differ
diff --git a/assets/images/new-design/my-prescription.png b/assets/images/new-design/my-prescription.png
deleted file mode 100644
index 077c3453..00000000
Binary files a/assets/images/new-design/my-prescription.png and /dev/null differ
diff --git a/assets/images/new-design/my_appointment_icon.png b/assets/images/new-design/my_appointment_icon.png
deleted file mode 100644
index 94439627..00000000
Binary files a/assets/images/new-design/my_appointment_icon.png and /dev/null differ
diff --git a/assets/images/new-design/my_doctor_icon.png b/assets/images/new-design/my_doctor_icon.png
deleted file mode 100644
index 4043d64a..00000000
Binary files a/assets/images/new-design/my_doctor_icon.png and /dev/null differ
diff --git a/assets/images/new-design/my_file_bottom_bar_active.png b/assets/images/new-design/my_file_bottom_bar_active.png
deleted file mode 100644
index d00e22c3..00000000
Binary files a/assets/images/new-design/my_file_bottom_bar_active.png and /dev/null differ
diff --git a/assets/images/new-design/navigate.png b/assets/images/new-design/navigate.png
deleted file mode 100644
index 99cfa09a..00000000
Binary files a/assets/images/new-design/navigate.png and /dev/null differ
diff --git a/assets/images/new-design/no-wait-queue.png b/assets/images/new-design/no-wait-queue.png
deleted file mode 100644
index d87a172f..00000000
Binary files a/assets/images/new-design/no-wait-queue.png and /dev/null differ
diff --git a/assets/images/new-design/patient_call_icon.png b/assets/images/new-design/patient_call_icon.png
deleted file mode 100644
index 51b286e7..00000000
Binary files a/assets/images/new-design/patient_call_icon.png and /dev/null differ
diff --git a/assets/images/new-design/patient_referral_icon.png b/assets/images/new-design/patient_referral_icon.png
deleted file mode 100644
index 8d417b73..00000000
Binary files a/assets/images/new-design/patient_referral_icon.png and /dev/null differ
diff --git a/assets/images/new-design/pay_now.png b/assets/images/new-design/pay_now.png
deleted file mode 100644
index 6096d8b9..00000000
Binary files a/assets/images/new-design/pay_now.png and /dev/null differ
diff --git a/assets/images/new-design/pending.svg b/assets/images/new-design/pending.svg
deleted file mode 100644
index 2c26afbd..00000000
--- a/assets/images/new-design/pending.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/assets/images/new-design/pharmacy_icon.png b/assets/images/new-design/pharmacy_icon.png
deleted file mode 100644
index 141583ee..00000000
Binary files a/assets/images/new-design/pharmacy_icon.png and /dev/null differ
diff --git a/assets/images/new-design/refresh_icon.png b/assets/images/new-design/refresh_icon.png
deleted file mode 100644
index c9b2db7d..00000000
Binary files a/assets/images/new-design/refresh_icon.png and /dev/null differ
diff --git a/assets/images/new-design/remove_icon.png b/assets/images/new-design/remove_icon.png
deleted file mode 100644
index 4a8f9479..00000000
Binary files a/assets/images/new-design/remove_icon.png and /dev/null differ
diff --git a/assets/images/new-design/reschedule_icon.png b/assets/images/new-design/reschedule_icon.png
deleted file mode 100644
index d04a5b49..00000000
Binary files a/assets/images/new-design/reschedule_icon.png and /dev/null differ
diff --git a/assets/images/new-design/respiration.png b/assets/images/new-design/respiration.png
deleted file mode 100644
index 944d65aa..00000000
Binary files a/assets/images/new-design/respiration.png and /dev/null differ
diff --git a/assets/images/new-design/respirtation_icon.png b/assets/images/new-design/respirtation_icon.png
deleted file mode 100644
index 75cd719d..00000000
Binary files a/assets/images/new-design/respirtation_icon.png and /dev/null differ
diff --git a/assets/images/new-design/rotate_icon.png b/assets/images/new-design/rotate_icon.png
deleted file mode 100644
index 1593fe75..00000000
Binary files a/assets/images/new-design/rotate_icon.png and /dev/null differ
diff --git a/assets/images/new-design/schedule.png b/assets/images/new-design/schedule.png
deleted file mode 100644
index a8a78432..00000000
Binary files a/assets/images/new-design/schedule.png and /dev/null differ
diff --git a/assets/images/new-design/schedule_icon.png b/assets/images/new-design/schedule_icon.png
deleted file mode 100644
index 555dcd23..00000000
Binary files a/assets/images/new-design/schedule_icon.png and /dev/null differ
diff --git a/assets/images/new-design/scheduled_reminder.png b/assets/images/new-design/scheduled_reminder.png
deleted file mode 100644
index 40254fb4..00000000
Binary files a/assets/images/new-design/scheduled_reminder.png and /dev/null differ
diff --git a/assets/images/new-design/search_by_disease.png b/assets/images/new-design/search_by_disease.png
deleted file mode 100644
index b55b2c67..00000000
Binary files a/assets/images/new-design/search_by_disease.png and /dev/null differ
diff --git a/assets/images/new-design/search_by_symptom.png b/assets/images/new-design/search_by_symptom.png
deleted file mode 100644
index 551f6ec8..00000000
Binary files a/assets/images/new-design/search_by_symptom.png and /dev/null differ
diff --git a/assets/images/new-design/search_medicine.png b/assets/images/new-design/search_medicine.png
deleted file mode 100644
index f4a1c675..00000000
Binary files a/assets/images/new-design/search_medicine.png and /dev/null differ
diff --git a/assets/images/new-design/send-email.png b/assets/images/new-design/send-email.png
deleted file mode 100644
index 86f21eb5..00000000
Binary files a/assets/images/new-design/send-email.png and /dev/null differ
diff --git a/assets/images/new-design/setting_menu_icon.png b/assets/images/new-design/setting_menu_icon.png
deleted file mode 100644
index d4f60540..00000000
Binary files a/assets/images/new-design/setting_menu_icon.png and /dev/null differ
diff --git a/assets/images/new-design/sign_in_main_icon.png b/assets/images/new-design/sign_in_main_icon.png
deleted file mode 100644
index 9938f32e..00000000
Binary files a/assets/images/new-design/sign_in_main_icon.png and /dev/null differ
diff --git a/assets/images/new-design/sign_out_menu_icon.png b/assets/images/new-design/sign_out_menu_icon.png
deleted file mode 100644
index e5bc35a4..00000000
Binary files a/assets/images/new-design/sign_out_menu_icon.png and /dev/null differ
diff --git a/assets/images/new-design/star_icon.png b/assets/images/new-design/star_icon.png
deleted file mode 100644
index 95923936..00000000
Binary files a/assets/images/new-design/star_icon.png and /dev/null differ
diff --git a/assets/images/new-design/star_rate_menu_icon.png b/assets/images/new-design/star_rate_menu_icon.png
deleted file mode 100644
index 207b1f71..00000000
Binary files a/assets/images/new-design/star_rate_menu_icon.png and /dev/null differ
diff --git a/assets/images/new-design/success_icon.png b/assets/images/new-design/success_icon.png
deleted file mode 100644
index 617cbe89..00000000
Binary files a/assets/images/new-design/success_icon.png and /dev/null differ
diff --git a/assets/images/new-design/temperature.png b/assets/images/new-design/temperature.png
deleted file mode 100644
index 22bf5241..00000000
Binary files a/assets/images/new-design/temperature.png and /dev/null differ
diff --git a/assets/images/new-design/temperature_icon.png b/assets/images/new-design/temperature_icon.png
deleted file mode 100644
index 5d5d1203..00000000
Binary files a/assets/images/new-design/temperature_icon.png and /dev/null differ
diff --git a/assets/images/new-design/upcoming_icon_bottom_bar_active.png b/assets/images/new-design/upcoming_icon_bottom_bar_active.png
deleted file mode 100644
index cccb9652..00000000
Binary files a/assets/images/new-design/upcoming_icon_bottom_bar_active.png and /dev/null differ
diff --git a/assets/images/new-design/user_top_bar_icon.png b/assets/images/new-design/user_top_bar_icon.png
deleted file mode 100644
index 9b7b9a59..00000000
Binary files a/assets/images/new-design/user_top_bar_icon.png and /dev/null differ
diff --git a/assets/images/new-design/vaccines_availability_icon.png b/assets/images/new-design/vaccines_availability_icon.png
deleted file mode 100644
index 1bd6f8b3..00000000
Binary files a/assets/images/new-design/vaccines_availability_icon.png and /dev/null differ
diff --git a/assets/images/new-design/verification_check.svg b/assets/images/new-design/verification_check.svg
deleted file mode 100644
index 1b3cdcca..00000000
--- a/assets/images/new-design/verification_check.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/assets/images/new-design/vida_logo.jpg b/assets/images/new-design/vida_logo.jpg
deleted file mode 100644
index 5fcec65c..00000000
Binary files a/assets/images/new-design/vida_logo.jpg and /dev/null differ
diff --git a/assets/images/new-design/vidamobile.png b/assets/images/new-design/vidamobile.png
deleted file mode 100644
index f096e8a7..00000000
Binary files a/assets/images/new-design/vidamobile.png and /dev/null differ
diff --git a/assets/images/new-design/video_call_book_icon.png b/assets/images/new-design/video_call_book_icon.png
deleted file mode 100644
index e4db4a57..00000000
Binary files a/assets/images/new-design/video_call_book_icon.png and /dev/null differ
diff --git a/assets/images/new-design/virtal_respiration.png b/assets/images/new-design/virtal_respiration.png
deleted file mode 100644
index 7e1b4466..00000000
Binary files a/assets/images/new-design/virtal_respiration.png and /dev/null differ
diff --git a/assets/images/new-design/virtal_weight.png b/assets/images/new-design/virtal_weight.png
deleted file mode 100644
index 5247e924..00000000
Binary files a/assets/images/new-design/virtal_weight.png and /dev/null differ
diff --git a/assets/images/new-design/virtual_appointment_icon.png b/assets/images/new-design/virtual_appointment_icon.png
deleted file mode 100644
index f91046c6..00000000
Binary files a/assets/images/new-design/virtual_appointment_icon.png and /dev/null differ
diff --git a/assets/images/new-design/vital_blood-pressure.png b/assets/images/new-design/vital_blood-pressure.png
deleted file mode 100644
index 44c9f2e2..00000000
Binary files a/assets/images/new-design/vital_blood-pressure.png and /dev/null differ
diff --git a/assets/images/new-design/vital_blood_type.png b/assets/images/new-design/vital_blood_type.png
deleted file mode 100644
index fbb5296f..00000000
Binary files a/assets/images/new-design/vital_blood_type.png and /dev/null differ
diff --git a/assets/images/new-design/vital_body_mass.png b/assets/images/new-design/vital_body_mass.png
deleted file mode 100644
index 08476c51..00000000
Binary files a/assets/images/new-design/vital_body_mass.png and /dev/null differ
diff --git a/assets/images/new-design/vital_heart_rate.png b/assets/images/new-design/vital_heart_rate.png
deleted file mode 100644
index e788658b..00000000
Binary files a/assets/images/new-design/vital_heart_rate.png and /dev/null differ
diff --git a/assets/images/new-design/vital_height.png b/assets/images/new-design/vital_height.png
deleted file mode 100644
index 8c324b2c..00000000
Binary files a/assets/images/new-design/vital_height.png and /dev/null differ
diff --git a/assets/images/new-design/vital_temperature .png b/assets/images/new-design/vital_temperature .png
deleted file mode 100644
index 7fe657de..00000000
Binary files a/assets/images/new-design/vital_temperature .png and /dev/null differ
diff --git a/assets/images/new-design/weather_dashboard_icon.png b/assets/images/new-design/weather_dashboard_icon.png
deleted file mode 100644
index 2a73dfac..00000000
Binary files a/assets/images/new-design/weather_dashboard_icon.png and /dev/null differ
diff --git a/assets/images/new/E_Refferal.svg b/assets/images/new/E_Refferal.svg
deleted file mode 100644
index bbbfc2b5..00000000
--- a/assets/images/new/E_Refferal.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/assets/images/new/Nav_Icon.svg b/assets/images/new/Nav_Icon.svg
deleted file mode 100644
index 6808f518..00000000
--- a/assets/images/new/Nav_Icon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/assets/images/new/RRT.svg b/assets/images/new/RRT.svg
deleted file mode 100644
index d29abf81..00000000
--- a/assets/images/new/RRT.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/assets/images/new/bottom_nav/help.svg b/assets/images/new/bottom_nav/help.svg
deleted file mode 100644
index 31d49e71..00000000
--- a/assets/images/new/bottom_nav/help.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/new/bottom_nav/home.svg b/assets/images/new/bottom_nav/home.svg
deleted file mode 100644
index b363bbc0..00000000
--- a/assets/images/new/bottom_nav/home.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/new/bottom_nav/my_file.svg b/assets/images/new/bottom_nav/my_file.svg
deleted file mode 100644
index fc5c0096..00000000
--- a/assets/images/new/bottom_nav/my_file.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/assets/images/new/forward_arrow.svg b/assets/images/new/forward_arrow.svg
deleted file mode 100644
index 3142c248..00000000
--- a/assets/images/new/forward_arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/new/mass/Obese_BMI.svg b/assets/images/new/mass/Obese_BMI.svg
deleted file mode 100644
index d638bb72..00000000
--- a/assets/images/new/mass/Obese_BMI.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/new/mass/ovrweight_BMI.svg b/assets/images/new/mass/ovrweight_BMI.svg
deleted file mode 100644
index d60d9e55..00000000
--- a/assets/images/new/mass/ovrweight_BMI.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/new/mass/underweight_BMI.svg b/assets/images/new/mass/underweight_BMI.svg
deleted file mode 100644
index fac1a9ed..00000000
--- a/assets/images/new/mass/underweight_BMI.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/new/payment.png b/assets/images/new/payment.png
deleted file mode 100644
index 0bdb006b..00000000
Binary files a/assets/images/new/payment.png and /dev/null differ
diff --git a/assets/images/new/remind_me.svg b/assets/images/new/remind_me.svg
deleted file mode 100644
index 1e5b27a8..00000000
--- a/assets/images/new/remind_me.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/assets/images/new/services/generate_ticket.svg b/assets/images/new/services/generate_ticket.svg
deleted file mode 100644
index 1c2e3a4c..00000000
--- a/assets/images/new/services/generate_ticket.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/assets/images/new/verified_check.svg b/assets/images/new/verified_check.svg
deleted file mode 100644
index 73916330..00000000
--- a/assets/images/new/verified_check.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/assets/images/offer_ar.png b/assets/images/offer_ar.png
deleted file mode 100644
index 1fdbf749..00000000
Binary files a/assets/images/offer_ar.png and /dev/null differ
diff --git a/assets/images/online_payments_bg.png b/assets/images/online_payments_bg.png
deleted file mode 100644
index 72f8e331..00000000
Binary files a/assets/images/online_payments_bg.png and /dev/null differ
diff --git a/assets/images/pharmacy/Group 1206.svg b/assets/images/pharmacy/Group 1206.svg
deleted file mode 100644
index ef8f7473..00000000
--- a/assets/images/pharmacy/Group 1206.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/assets/images/pharmacy/Group 1207.svg b/assets/images/pharmacy/Group 1207.svg
deleted file mode 100644
index fd2ffd41..00000000
--- a/assets/images/pharmacy/Group 1207.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
diff --git a/assets/images/pharmacy/Logo Parmacy-green.png b/assets/images/pharmacy/Logo Parmacy-green.png
deleted file mode 100644
index 72862b33..00000000
Binary files a/assets/images/pharmacy/Logo Parmacy-green.png and /dev/null differ
diff --git a/assets/images/pharmacy/Redheart.svg b/assets/images/pharmacy/Redheart.svg
deleted file mode 100644
index 3bba67fa..00000000
--- a/assets/images/pharmacy/Redheart.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/assets/images/pharmacy/aramex_shipping_logo.svg b/assets/images/pharmacy/aramex_shipping_logo.svg
deleted file mode 100644
index 30cc03b8..00000000
--- a/assets/images/pharmacy/aramex_shipping_logo.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/assets/images/pharmacy/arrow-left-png.png b/assets/images/pharmacy/arrow-left-png.png
deleted file mode 100644
index 18d58c87..00000000
Binary files a/assets/images/pharmacy/arrow-left-png.png and /dev/null differ
diff --git a/assets/images/pharmacy/arrow-right-png.png b/assets/images/pharmacy/arrow-right-png.png
deleted file mode 100644
index 19af7c0b..00000000
Binary files a/assets/images/pharmacy/arrow-right-png.png and /dev/null differ
diff --git a/assets/images/pharmacy/arrow.png b/assets/images/pharmacy/arrow.png
deleted file mode 100644
index 19af7c0b..00000000
Binary files a/assets/images/pharmacy/arrow.png and /dev/null differ
diff --git a/assets/images/pharmacy/arrow_lef.png b/assets/images/pharmacy/arrow_lef.png
deleted file mode 100644
index 19af7c0b..00000000
Binary files a/assets/images/pharmacy/arrow_lef.png and /dev/null differ
diff --git a/assets/images/pharmacy/delete_red_icon.svg b/assets/images/pharmacy/delete_red_icon.svg
deleted file mode 100644
index 8897a683..00000000
--- a/assets/images/pharmacy/delete_red_icon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/assets/images/pharmacy/edit_icon.svg b/assets/images/pharmacy/edit_icon.svg
deleted file mode 100644
index df7cca2f..00000000
--- a/assets/images/pharmacy/edit_icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/pharmacy/heart-empty.svg b/assets/images/pharmacy/heart-empty.svg
deleted file mode 100644
index a682a44e..00000000
--- a/assets/images/pharmacy/heart-empty.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/pharmacy/hmg_shipping_greenlogo.svg b/assets/images/pharmacy/hmg_shipping_greenlogo.svg
deleted file mode 100644
index 449712a5..00000000
--- a/assets/images/pharmacy/hmg_shipping_greenlogo.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
diff --git a/assets/images/pharmacy/hmg_shipping_logo.svg b/assets/images/pharmacy/hmg_shipping_logo.svg
deleted file mode 100644
index 8e9db3d6..00000000
--- a/assets/images/pharmacy/hmg_shipping_logo.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
diff --git a/assets/images/pharmacy/pill_reminder_icon.svg b/assets/images/pharmacy/pill_reminder_icon.svg
deleted file mode 100644
index f4fb4ddc..00000000
--- a/assets/images/pharmacy/pill_reminder_icon.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-
diff --git a/assets/images/pharmacy/success_check_icon.svg b/assets/images/pharmacy/success_check_icon.svg
deleted file mode 100644
index ed1379b8..00000000
--- a/assets/images/pharmacy/success_check_icon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/assets/images/pharmacy/user.svg b/assets/images/pharmacy/user.svg
deleted file mode 100644
index 8e978105..00000000
--- a/assets/images/pharmacy/user.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/pharmacy/user_icon.svg b/assets/images/pharmacy/user_icon.svg
deleted file mode 100644
index 8e978105..00000000
--- a/assets/images/pharmacy/user_icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/pharmacy/wishklist_icon.svg b/assets/images/pharmacy/wishklist_icon.svg
deleted file mode 100644
index cd0ce16d..00000000
--- a/assets/images/pharmacy/wishklist_icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/powerd-by2.jpg b/assets/images/powerd-by2.jpg
deleted file mode 100644
index 93bdbb18..00000000
Binary files a/assets/images/powerd-by2.jpg and /dev/null differ
diff --git a/assets/images/rectangle.png b/assets/images/rectangle.png
deleted file mode 100644
index e4bdb0b6..00000000
Binary files a/assets/images/rectangle.png and /dev/null differ
diff --git a/assets/images/robort.png b/assets/images/robort.png
deleted file mode 100644
index 320afcbc..00000000
Binary files a/assets/images/robort.png and /dev/null differ
diff --git a/assets/images/roboticon.png b/assets/images/roboticon.png
deleted file mode 100644
index 5b04e287..00000000
Binary files a/assets/images/roboticon.png and /dev/null differ
diff --git a/assets/images/search_medicine_icon.png b/assets/images/search_medicine_icon.png
deleted file mode 100644
index 349620a5..00000000
Binary files a/assets/images/search_medicine_icon.png and /dev/null differ
diff --git a/assets/images/siri-ianzhao.gif b/assets/images/siri-ianzhao.gif
deleted file mode 100644
index 8d1c644f..00000000
Binary files a/assets/images/siri-ianzhao.gif and /dev/null differ
diff --git a/assets/images/svg/discount_ar.svg b/assets/images/svg/discount_ar.svg
deleted file mode 100644
index d9d6ec27..00000000
--- a/assets/images/svg/discount_ar.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
diff --git a/assets/images/svg/discount_en.svg b/assets/images/svg/discount_en.svg
deleted file mode 100644
index 294cf19c..00000000
--- a/assets/images/svg/discount_en.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
diff --git a/assets/images/svg/symptom.svg b/assets/images/svg/symptom.svg
deleted file mode 100644
index aa670da1..00000000
--- a/assets/images/svg/symptom.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-
\ No newline at end of file
diff --git a/assets/images/test-weight.png b/assets/images/test-weight.png
deleted file mode 100644
index 934b2467..00000000
Binary files a/assets/images/test-weight.png and /dev/null differ
diff --git a/assets/images/undraw_connected_world_wuay.png b/assets/images/undraw_connected_world_wuay.png
deleted file mode 100644
index f1bd3f00..00000000
Binary files a/assets/images/undraw_connected_world_wuay.png and /dev/null differ
diff --git a/assets/images/weight_icon.png b/assets/images/weight_icon.png
deleted file mode 100644
index 5c640114..00000000
Binary files a/assets/images/weight_icon.png and /dev/null differ
diff --git a/assets/tracker/devices.png b/assets/tracker/devices.png
deleted file mode 100644
index f00f9d95..00000000
Binary files a/assets/tracker/devices.png and /dev/null differ
diff --git a/heartrate_icon.png b/heartrate_icon.png
deleted file mode 100644
index e228bea4..00000000
Binary files a/heartrate_icon.png and /dev/null differ
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
index 230266a1..e0bfb3bb 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
@@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/app_map/google_huawei_map.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/select_location_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -44,9 +45,7 @@ class _NewCMCStepTowPageState extends State {
bool showCurrentLocation = false;
AppSharedPreferences sharedPref = AppSharedPreferences();
- Completer _controller = Completer();
- GoogleMapController googleMapController;
- static CameraPosition _kGooglePlex = CameraPosition(
+ static CameraPosition cameraPosition = CameraPosition(
target: LatLng(37.42796133580664, -122.085749655962),
zoom: 14.4746,
);
@@ -84,18 +83,11 @@ class _NewCMCStepTowPageState extends State {
setMap() {
setState(() {
- _kGooglePlex = CameraPosition(
+ cameraPosition = CameraPosition(
target: currentPostion,
zoom: 14.4746,
);
- googleMapController.animateCamera(
- CameraUpdate.newCameraPosition(
- CameraPosition(
- target: currentPostion,
- zoom: 16,
- ),
- ),
- );
+ appMap.moveTo(cameraPostion: cameraPosition);
});
}
@@ -131,7 +123,8 @@ class _NewCMCStepTowPageState extends State {
setMap();
}
}
-
+
+ AppMap appMap;
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
@@ -232,18 +225,9 @@ class _NewCMCStepTowPageState extends State {
child: Stack(
alignment: Alignment.center,
children: [
- GoogleMap(
- mapType: MapType.normal,
- zoomControlsEnabled: false,
- myLocationButtonEnabled: true,
- myLocationEnabled: true,
- initialCameraPosition: _kGooglePlex,
- onCameraMove: ((_position) => _updatePosition(_position)),
- onMapCreated: (GoogleMapController controller) {
- googleMapController = controller;
- _controller.complete(controller);
- },
- ),
+ appMap = AppMap(cameraPosition.toMap(), onCameraMove: (camera){
+ _updatePosition(camera);
+ }),
Icon(
Icons.place,
color: CustomColors.accentColor,
diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart
index d4d0a7ce..1adb0308 100644
--- a/lib/uitl/utils.dart
+++ b/lib/uitl/utils.dart
@@ -3,6 +3,7 @@ import 'dart:core';
import 'dart:io';
import 'dart:typed_data';
+import 'package:auto_size_text/auto_size_text.dart';
import 'package:badges/badges.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:connectivity/connectivity.dart';
@@ -882,6 +883,30 @@ class Utils {
],
);
}
+
+ static Widget tableColumnValueWithUnderLine(String text, {bool isLast = false, bool isCapitable = true}) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.center,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ SizedBox(height: 14),
+ AutoSizeText(
+ isCapitable ? text.toLowerCase().capitalizeFirstofEach : text,
+ maxLines: 1,
+ minFontSize: 6,
+ style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12),
+ ),
+ SizedBox(height: 10),
+ if (!isLast)
+ Divider(
+ height: 1,
+ color: Color(0xffEFEFEF),
+ thickness: 1,
+ )
+ ],
+ );
+ }
}
Widget applyShadow({Color color = Colors.grey, double shadowOpacity = 0.5, double spreadRadius = 2, double blurRadius = 7, Offset offset = const Offset(2, 2), @required Widget child}) {
diff --git a/lib/widgets/app_map/google_huawei_map.dart b/lib/widgets/app_map/google_huawei_map.dart
new file mode 100644
index 00000000..fe991ad8
--- /dev/null
+++ b/lib/widgets/app_map/google_huawei_map.dart
@@ -0,0 +1,94 @@
+
+import 'dart:async';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hms_gms_availability/flutter_hms_gms_availability.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:huawei_map/map.dart' as hmsMap;
+
+
+class AppMap extends StatefulWidget{
+ CameraPositionCallback onCameraMove;
+ Map initialCamera;
+
+ AppMapState _state;
+
+ AppMap(this.initialCamera, {this.onCameraMove});
+
+ @override
+ State createState() => _state = AppMapState();
+
+
+ moveTo({@required CameraPosition cameraPostion}){
+ if(_state.isHuawei){
+ final cameraJson = cameraPostion.toMap();
+ final camera = hmsMap.CameraPosition.fromMap(cameraJson);
+ _state._huaweiMapController.animateCamera(hmsMap.CameraUpdate.newCameraPosition(camera));
+ }else{
+ _state.googleMapController.animateCamera(CameraUpdate.newCameraPosition(cameraPostion));
+ }
+ }
+}
+
+class AppMapState extends State{
+
+ bool isHuawei;
+
+ Completer _googleMapControllerComp = Completer();
+ GoogleMapController googleMapController;
+
+ Completer _huaweiMapControllerComp = Completer();
+ hmsMap.HuaweiMapController _huaweiMapController;
+
+ checkIsHuawei() async{
+ isHuawei = await FlutterHmsGmsAvailability.isHmsAvailable;
+ setState(() {});
+ }
+ @override
+ void initState() {
+ checkIsHuawei();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ if(isHuawei == null)
+ return CircularProgressIndicator();
+ return map();
+ }
+
+ Widget map() => isHuawei ? huaweiMap() : googleMap();
+
+
+ googleMap(){
+ return
+ GoogleMap(
+ mapType: MapType.normal,
+ zoomControlsEnabled: false,
+ myLocationButtonEnabled: true,
+ myLocationEnabled: true,
+ initialCameraPosition: CameraPosition.fromMap(widget.initialCamera),
+ onCameraMove: widget.onCameraMove,
+ onMapCreated: (GoogleMapController controller) {
+ googleMapController = controller;
+ _googleMapControllerComp.complete(controller);
+ },
+ );
+ }
+
+ Widget huaweiMap(){
+ return hmsMap.HuaweiMap(
+ mapType: hmsMap.MapType.normal,
+ zoomControlsEnabled: false,
+ myLocationButtonEnabled: true,
+ myLocationEnabled: true,
+ initialCameraPosition: hmsMap.CameraPosition.fromMap(widget.initialCamera),
+ onCameraMove: (camera) => widget.onCameraMove(CameraPosition.fromMap(camera.toMap())),
+ onMapCreated: (controller){
+ _huaweiMapController = controller;
+ _huaweiMapControllerComp .complete(controller);
+ },
+ );
+ }
+
+}
\ No newline at end of file
diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
index a67d991d..5ce5ceba 100644
--- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
+++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
@@ -1,3 +1,4 @@
+import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/core/model/labs/lab_result.dart';
import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart';
import 'package:diplomaticquarterapp/core/service/medical/labs_service.dart';
@@ -6,14 +7,16 @@ import 'package:diplomaticquarterapp/pages/medical/labs/passport_update_page.dar
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/uitl/utils.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
+import 'package:diplomaticquarterapp/uitl/utils.dart';
+import '../../text.dart';
import 'FlowChartPage.dart';
class LabResultWidget extends StatelessWidget {
@@ -44,23 +47,6 @@ class LabResultWidget extends StatelessWidget {
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.56, height: 21 / 14),
),
SizedBox(width: 16),
- InkWell(
- onTap: () {
- Navigator.push(
- context,
- FadePage(
- page: FlowChartPage(
- filterName: filterName,
- patientLabOrder: patientLabOrder,
- ),
- ),
- );
- },
- child: Text(
- TranslationBase.of(context).viewFlowChart,
- style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12),
- ),
- ),
],
),
Table(
@@ -68,6 +54,7 @@ class LabResultWidget extends StatelessWidget {
0: FlexColumnWidth(2),
1: FlexColumnWidth(1.5),
2: FlexColumnWidth(1),
+ 3: FlexColumnWidth(1.7),
},
children: fullData(patientLabResultList, context),
),
@@ -167,20 +154,53 @@ class LabResultWidget extends StatelessWidget {
Utils.tableColumnTitle(TranslationBase.of(context).description),
Utils.tableColumnTitle(TranslationBase.of(context).value),
Utils.tableColumnTitle(TranslationBase.of(context).range),
+ Utils.tableColumnTitle(""),
],
),
);
- for (int i = 0; i < labResultList.length; i++)
+ for (int i = 0; i < labResultList.length; i++) {
tableRow.add(
TableRow(
children: [
- Utils.tableColumnValue(labResultList[i].description, isLast: i == (labResultList.length - 1)),
- Utils.tableColumnValue(labResultList[i].resultValue + " " + labResultList[i].uOM, isLast: i == (labResultList.length - 1)),
- Utils.tableColumnValue(labResultList[i].referanceRange, isLast: i == (labResultList.length - 1), isCapitable: false),
+ mHeight(8),
+ mHeight(8),
+ mHeight(8),
+ mHeight(8),
+ ],
+ ),
+ );
+ tableRow.add(
+ TableRow(
+ decoration: containerColorRadiusBorderWidth(Colors.grey[100], 12, Colors.grey[300], 0.6),
+ children: [
+ Padding(
+ padding: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 12, right: projectViewModel.isArabic ? 12 : 0),
+ child: Utils.tableColumnValue(labResultList[i].description, isLast: true),
+ ),
+ Utils.tableColumnValue(labResultList[i].resultValue + " " + labResultList[i].uOM, isLast: true),
+ Utils.tableColumnValue(labResultList[i].referanceRange, isLast: true, isCapitable: false),
+ InkWell(
+ onTap: () {
+ Navigator.push(
+ context,
+ FadePage(
+ page: FlowChartPage(
+ filterName: filterName,
+ patientLabOrder: patientLabOrder,
+ ),
+ ),
+ );
+ },
+ child: Padding(
+ padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0),
+ child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false),
+ ),
+ ),
],
),
);
+ }
return tableRow;
}
}
diff --git a/no-wait-queue.png b/no-wait-queue.png
deleted file mode 100644
index d87a172f..00000000
Binary files a/no-wait-queue.png and /dev/null differ
diff --git a/pubspec.yaml b/pubspec.yaml
index bbf05ea3..0d6b4756 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -87,6 +87,7 @@ dependencies:
google_maps_flutter: ^1.0.3
+ huawei_map: ^5.0.3+303
# Qr code Scanner TODO fix it
# barcode_scanner: ^1.0.1
diff --git a/sleep_data.png b/sleep_data.png
deleted file mode 100644
index dc6661d6..00000000
Binary files a/sleep_data.png and /dev/null differ