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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Kid’s Offer - Take care of your children’s teeth - Only 500 SAR - - - - - - - - - - - - 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 @@ - - - - - - Online Consultation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/config/config.dart b/lib/config/config.dart index d7ffabcd..0b3fc7ea 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -16,12 +16,12 @@ const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs -// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; -// const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; +const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; +const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // Pharmacy Production URLs -const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; -const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; +// const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; +// const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity'; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 4388d11b..5c6b0fea 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1270,13 +1270,8 @@ const Map localizedValues = { "notif-permission-msg": {"en": "To recieve water reminders, please turn on notifications in the system settings", "ar": "الرجاء تفعيل الاشعارات في الاعدادات"}, "verification_message_code": {"en": "Please enter verification code", "ar": "الرجاء إدخال رمز التحقق"}, "select-location": {"en": "Select Location", "ar": "اختر موقعا"}, - "result-header": {"en": "Get The Result During 8 Hours", "ar": "احصل على النتيجة خلال 8 ساعة"}, - "covid-info": { - "en": - "We are using the advance technology to test COVID-19, The sample for examination is taking between the nose and mouth (nasopharyngeal swab), the examination is done by ELITE In Genius of the company ELITECH GROUP MOLECULAR DIAGNOSTICS, Note that the device belongs to an Italian company and is manufactured in Japan with RC- PCR​", - "ar": - "يتوفر لدينا أحدث جهاز خاص بفحص مرض الكورونا (COVID-19) طريقة الفحص تؤخذ مسحة من البلعوم الأنفي ( عن طريف الأنف) ويتم الفحص بواسطة جهاز ELITE In Genius التابع لشركة ELITECH GROUP MOLECULAR DIAGNOSTICS علما بأن الجهاز تابع لشركة إيطالية ومصنع في اليابان بتقينة RC-PCR" - }, + "result-header": {"en": "Get the result in Few Hours", "ar": "احصل على النتيجة خلال عدة ساعات"}, + "covid-info": { "en": "Dr. Sulaiman Al Habib hospitals are conducting a test for the emerging corona virus and issuing travel certificates 24/7 in a short time and with high accuracy. Those wishing to benefit from this service can visit one of Dr. Sulaiman Al Habib branches to conduct a corona test within few minutes, and obtain the result within several hours. Corona Virus Covid 19 testing service with PCR technology to detect the virus according to the highest international standards and with the latest high-precision RT-PCR devices (American GeneXpert and others), That is approved by the Food and Drug Authority as well as by the Saudi Center for Infectious Diseases Prevention.", "ar": "تجري مستشفيات د. سليمان الحبيب فحص فيروس كورونا المستجد وتصدر شهادات السفر على مدار الساعة، طوال أيام الأسبوع، وبسرعة ودقة عالية. يمكن للراغبين في الاستفادة من هذه الخدمة زيارة أحد فروع مستشفيات د. سليمان الحبيب وإجراء فحص كورونا خلال بضع دقائق والحصول على النتائج خلال عدة ساعات خدمة فحص فيروس كورونا Covid 19 بتقنية PCR للكشف عن الفيروس وفقاً لأعلى المعايير العالمية وبأحدث أجهزة RT-PCR عالية الدقة (GeneXpert الأمريكي وغيره)، وهي طرق معتمدة من قبل هيئة الغذاء والدواء وكذلك من قبل المركز السعودي للوقاية من الأمراض المُعدية" }, "select-appo": {"en": "Kindly select one of the available appointments from below:", "ar": "يرجى اختيار أحد المواعيد المتاحة من أدناه:"}, "covid-alert-header": {"en": "Pay With-in 15 mins to confirm the appointment", "ar": "الرجاء اتمام عملية الدفع خلال 15 دقيقه لتاكيد الموعد"}, "covid-alert-info": { diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart index 52c2b2e1..260b3a92 100644 --- a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart +++ b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart @@ -26,7 +26,7 @@ class CustomerAddressesService extends BaseService { var date = f.format(DateTime.now().toUtc()) + " GMT"; addNewAddressRequestModel.customer.addresses[0].createdOnUtc = date; hasError = false; - await baseAppClient.postPharmacy(ADD_CUSTOMER_ADDRESS, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.postPharmacy(ADD_ADDRESS_INFO, onSuccess: (dynamic response, int statusCode) { addressesList.clear(); response["customers"][0]["addresses"].forEach((data) { addressesList.add(AddressInfo.fromJson(data)); diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart index e8b1f2c0..6a445663 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart @@ -19,11 +19,12 @@ import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:provider/provider.dart'; class CMCLocationPage extends StatefulWidget { - final Function(PickResult) onPick; + final Function onPick; final double latitude; final double longitude; final dynamic model; + const CMCLocationPage({Key key, this.onPick, this.latitude, this.longitude, this.model}) : super(key: key); @override @@ -34,9 +35,11 @@ class _CMCLocationPageState extends State { double latitude = 0; double longitude = 0; bool showCurrentLocation = false; + Function onPick; @override void initState() { + onPick=widget.onPick; latitude = widget.latitude; longitude = widget.longitude; if (latitude == 0.0 && longitude == 0.0) { @@ -48,97 +51,104 @@ class _CMCLocationPageState extends State { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return BaseView( - onModelReady: (model) {}, - builder: (_, model, widget) => AppScaffold( - isShowDecPage: false, - isShowAppBar: true, - baseViewModel: model, - showNewAppBar: true, - showNewAppBarTitle: true, - backgroundColor: CustomColors.appBackgroudGreyColor, - description: TranslationBase.of(context).infoCMC, - imagesInfo: [ - ImagesInfo(imageAr: 'https://hmgwebservices.com/Images/MobileApp/CMC/ar/0.png', imageEn: 'https://hmgwebservices.com/Images/MobileApp/CMC/en/0.png'), - ], - appBarTitle: TranslationBase.of(context).addNewAddress, - body: PlacePicker( - apiKey: GOOGLE_API_KEY, - enableMyLocationButton: true, - automaticallyImplyAppBarLeading: false, - autocompleteOnTrailingWhitespace: true, - selectInitialPosition: true, - autocompleteLanguage: projectViewModel.currentLanguage, - enableMapTypeButton: true, - searchForInitialValue: false, - onPlacePicked: (PickResult result) { - print(result.adrAddress); - }, - selectedPlaceWidgetBuilder: (_, selectedPlace, state, isSearchBarFocused) { - print("state: $state, isSearchBarFocused: $isSearchBarFocused"); - return isSearchBarFocused - ? Container() - : FloatingCard( - bottomPosition: 0.0, - leftPosition: 0.0, - rightPosition: 0.0, - width: 500, - borderRadius: BorderRadius.circular(12.0), - child: state == SearchingState.Searching - ? Center(child: CircularProgressIndicator()) - : Container( - margin: EdgeInsets.all(12), - child: Column( - children: [ - SecondaryButton( - color: CustomColors.accentColor, - textColor: Colors.white, - onTap: () async { - print(selectedPlace); - AddNewAddressRequestModel addNewAddressRequestModel = new AddNewAddressRequestModel( - customer: Customer(addresses: [ - Addresses( - address1: selectedPlace.formattedAddress, - address2: selectedPlace.formattedAddress, - customerAttributes: "", - city: "", - createdOnUtc: "", - id: 0, - latLong: "$latitude,$longitude", - email: "") - ]), - ); - selectedPlace.addressComponents.forEach((e) { - if (e.types.contains("country")) { - addNewAddressRequestModel.customer.addresses[0].country = e.longName; - } - if (e.types.contains("postal_code")) { - addNewAddressRequestModel.customer.addresses[0].zipPostalCode = e.longName; - } - if (e.types.contains("locality")) { - addNewAddressRequestModel.customer.addresses[0].city = e.longName; - } - }); + return BaseView( + onModelReady: (model) {}, + builder: (_, model, widget) => AppScaffold( + isShowDecPage: false, + isShowAppBar: true, + baseViewModel: model, + showNewAppBar: true, + showNewAppBarTitle: true, + backgroundColor: CustomColors.appBackgroudGreyColor, + description: TranslationBase.of(context).infoCMC, + imagesInfo: [ + ImagesInfo(imageAr: 'https://hmgwebservices.com/Images/MobileApp/CMC/ar/0.png', imageEn: 'https://hmgwebservices.com/Images/MobileApp/CMC/en/0.png'), + ], + appBarTitle: TranslationBase.of(context).addNewAddress, + body: PlacePicker( + apiKey: GOOGLE_API_KEY, + enableMyLocationButton: true, + automaticallyImplyAppBarLeading: false, + autocompleteOnTrailingWhitespace: true, + selectInitialPosition: true, + autocompleteLanguage: projectViewModel.currentLanguage, + enableMapTypeButton: true, + searchForInitialValue: false, + onPlacePicked: (PickResult result) { + print(result.adrAddress); + }, + selectedPlaceWidgetBuilder: (_, selectedPlace, state, isSearchBarFocused) { + print("state: $state, isSearchBarFocused: $isSearchBarFocused"); - await model.addAddressInfo(addNewAddressRequestModel: addNewAddressRequestModel); - if (model.state == ViewState.ErrorLocal) { - Utils.showErrorToast(model.error); - } else { - AppToast.showSuccessToast(message: "Address Added Successfully"); - } - Navigator.of(context).pop(); - }, - label: TranslationBase.of(context).addNewAddress, + return isSearchBarFocused + ? Container() + : FloatingCard( + bottomPosition: 0.0, + leftPosition: 0.0, + rightPosition: 0.0, + width: 500, + borderRadius: BorderRadius.circular(12.0), + child: state == SearchingState.Searching + ? Center(child: CircularProgressIndicator()) + : Container( + margin: EdgeInsets.all(12), + child: Column( + children: [ + SecondaryButton( + color: CustomColors.accentColor, + textColor: Colors.white, + onTap: () async { + print(selectedPlace); + AddNewAddressRequestModel addNewAddressRequestModel = new AddNewAddressRequestModel( + customer: Customer( + addresses: [ + Addresses( + address1: selectedPlace.formattedAddress, + address2: selectedPlace.formattedAddress, + customerAttributes: "", + city: "", + createdOnUtc: "", + id: 0, + latLong: selectedPlace.geometry.location.lat.toString() + "," + selectedPlace.geometry.location.lng.toString(), + email: "", + ) + ], ), - ], - ), + ); + + selectedPlace.addressComponents.forEach((e) { + if (e.types.contains("country")) { + addNewAddressRequestModel.customer.addresses[0].country = e.longName; + } + if (e.types.contains("postal_code")) { + addNewAddressRequestModel.customer.addresses[0].zipPostalCode = e.longName; + } + if (e.types.contains("locality")) { + addNewAddressRequestModel.customer.addresses[0].city = e.longName; + } + }); + + await model.addAddressInfo(addNewAddressRequestModel: addNewAddressRequestModel); + if (model.state == ViewState.ErrorLocal) { + Utils.showErrorToast(model.error); + } else { + onPick(); + AppToast.showSuccessToast(message: "Address Added Successfully"); + } + Navigator.of(context).pop(); + }, + label: TranslationBase.of(context).addNewAddress, ), - ); - }, - initialPosition: LatLng(latitude, longitude), - useCurrentLocation: showCurrentLocation, - ), - )); + ], + ), + ), + ); + }, + initialPosition: LatLng(latitude, longitude), + useCurrentLocation: showCurrentLocation, + ), + ), + ); } } diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart index 77291083..3b7e5a22 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart @@ -132,15 +132,16 @@ class _NewCMCStepThreePageState extends State { // _controller.complete(controller); // }, // ), - child: Image.network("https://maps.googleapis.com/maps/api/staticmap?center=" + - widget.cmcInsertPresOrderRequestModel.latitude.toString() + - "," + - widget.cmcInsertPresOrderRequestModel.longitude.toString() + - "&zoom=16&size=600x300&maptype=roadmap&markers=color:red%7C" + - widget.cmcInsertPresOrderRequestModel.latitude.toString() + - "," + - widget.cmcInsertPresOrderRequestModel.longitude.toString() + - "&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8", + child: Image.network( + "https://maps.googleapis.com/maps/api/staticmap?center=" + + widget.cmcInsertPresOrderRequestModel.latitude.toString() + + "," + + widget.cmcInsertPresOrderRequestModel.longitude.toString() + + "&zoom=16&size=600x300&maptype=roadmap&markers=color:red%7C" + + widget.cmcInsertPresOrderRequestModel.latitude.toString() + + "," + + widget.cmcInsertPresOrderRequestModel.longitude.toString() + + "&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8", width: double.infinity, height: double.infinity, fit: BoxFit.cover, 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 4525d89b..671c8e57 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 @@ -11,6 +11,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/location_util.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'; @@ -46,9 +47,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, ); @@ -86,18 +85,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); }); } @@ -111,6 +103,7 @@ class _NewCMCStepTowPageState extends State { } setLatitudeAndLongitude({bool isSetState = false, String latLong}) async { + print("latLong " + latLong.toString()); if (latLong == null) { if (widget.model.addressesList.isEmpty) { setState(() { @@ -126,11 +119,14 @@ class _NewCMCStepTowPageState extends State { latitude = double.parse(latLongArr[0]); longitude = double.parse(latLongArr[1]); + print("sssss1 " + latitude.toString()); + print("sssss2 " + longitude.toString()); currentPostion = LatLng(latitude, longitude); setMap(); } } - + + AppMap appMap; @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -144,6 +140,7 @@ class _NewCMCStepTowPageState extends State { showNewAppBar: true, showNewAppBarTitle: true, backgroundColor: CustomColors.appBackgroudGreyColor, + baseViewModel: widget.model, body: Column( children: [ if (widget.model.addressesList.isNotEmpty) @@ -185,16 +182,28 @@ class _NewCMCStepTowPageState extends State { ), ), InkWell( - onTap: () { - Navigator.push( - context, - FadePage( - page: CMCLocationPage( + onTap: () async { + + bool isNeedToUpdate=false; + await Navigator.of(context).push(new MaterialPageRoute( + builder: (BuildContext context) { + return CMCLocationPage( latitude: latitude, longitude: longitude, - ), - ), - ); + onPick: (){ + isNeedToUpdate=true; + print("onPickonPick1"); + }, + ); + }, + )); + if(isNeedToUpdate){ + print("onPickonPick2"); + _selectedAddress=new AddressInfo(); + _selectedAddress.address1 = widget.model.addressesList.last.address1; + showCurrentLocation = false; + setLatitudeAndLongitude(); + } }, child: Padding( padding: EdgeInsets.only(left: 12, right: 12, bottom: 16, top: 8), @@ -218,18 +227,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, @@ -277,7 +277,9 @@ class _NewCMCStepTowPageState extends State { addresses: addresses, selectedAddress: _selectedAddress, onValueSelected: (value) { + showCurrentLocation = false; setLatitudeAndLongitude(latLong: value.latLong); + setState(() { _selectedAddress = value; }); diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart index 070187a0..a7681687 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart @@ -24,7 +24,7 @@ import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dar import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page_pharmcy.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; -import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; + import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart'; import 'package:diplomaticquarterapp/pages/medical/smart_watch_health_data/smart_watch_instructions.dart'; import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; diff --git a/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart b/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart index 7c4e8b8b..c91ac5fd 100644 --- a/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart +++ b/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart @@ -9,7 +9,8 @@ import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/today_page. import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/week_page.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart'; + import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; @@ -166,7 +167,7 @@ class _H2OPageState extends State with SingleTickerProviderStateMixin { ), ), ], - body: MedicalProfilePage()))); + body: MedicalProfilePageNew()))); } else if (index == 2) { Navigator.of(context).pushNamedAndRemoveUntil(HOME, (Route route) => false); } else if (index == 3) { diff --git a/lib/pages/AlHabibMedicalService/h2o/widgets/h20_buttom_navigation_bar.dart b/lib/pages/AlHabibMedicalService/h2o/widgets/h20_buttom_navigation_bar.dart index 1948e1c8..3405a327 100644 --- a/lib/pages/AlHabibMedicalService/h2o/widgets/h20_buttom_navigation_bar.dart +++ b/lib/pages/AlHabibMedicalService/h2o/widgets/h20_buttom_navigation_bar.dart @@ -1,8 +1,10 @@ -import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; + +import 'package:diplomaticquarterapp/pages/landing/home_page_2.dart'; +import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart'; import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart'; import 'package:flutter/material.dart'; -import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; + import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart'; import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart'; @@ -21,12 +23,12 @@ class H20BottomNavigationBar extends StatelessWidget { physics: NeverScrollableScrollPhysics(), controller: pageController, children: [ - HomePage( + HomePage2( goToMyProfile: () { _changeCurrentTab(1); }, ), - MedicalProfilePage(), + MedicalProfilePageNew(), BookingOptions(), MyFamily(isAppbarVisible: false), ToDo(isShowAppBar: false), diff --git a/lib/pages/Blood/confirm_payment_page.dart b/lib/pages/Blood/confirm_payment_page.dart index 5c70c181..96e8d593 100644 --- a/lib/pages/Blood/confirm_payment_page.dart +++ b/lib/pages/Blood/confirm_payment_page.dart @@ -224,7 +224,7 @@ class ConfirmPaymentPage extends StatelessWidget { browser, false, "3", - null); + ""); } onBrowserLoadStart(String url) { diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart index b2cfe74c..387bd41a 100644 --- a/lib/pages/BookAppointment/BookSuccess.dart +++ b/lib/pages/BookAppointment/BookSuccess.dart @@ -504,7 +504,7 @@ class _BookSuccessState extends State { widget.browser, widget.patientShareResponse.isLiveCareAppointment, "2", - null, + "", widget.patientShareResponse.appointmentDate, widget.patientShareResponse.appointmentNo, widget.patientShareResponse.clinicID, diff --git a/lib/pages/Covid-DriveThru/covid-payment-summary.dart b/lib/pages/Covid-DriveThru/covid-payment-summary.dart index fa39cdb0..2f403991 100644 --- a/lib/pages/Covid-DriveThru/covid-payment-summary.dart +++ b/lib/pages/Covid-DriveThru/covid-payment-summary.dart @@ -162,7 +162,7 @@ class _CovidPaymentSummaryState extends State { widget.browser, widget.patientShareResponse.isLiveCareAppointment, "2", - null, + "", widget.patientShareResponse.appointmentDate, widget.patientShareResponse.appointmentNo, widget.patientShareResponse.clinicID, diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 5519562d..e7f56c61 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -194,7 +194,7 @@ class _ToDoState extends State { ? Text( '${time.days != null ? time.days : "0"}:${time.hours != null ? time.hours.toString().length == 1 ? "0" + time.hours.toString() : time.hours : "00"}:${time.min}:${time.sec} ' + TranslationBase.of(context).upcomingTimeLeft, - style: TextStyle(fontSize: 12.0, color: Color(0xff40ACC9))) + style: TextStyle(fontSize: 12.0, color: Color(0xffC5272D))) : Container(); }, ), @@ -243,7 +243,7 @@ class _ToDoState extends State { }, child: Container( child: Text(TranslationBase.of(context).upcomingDetails, - textAlign: TextAlign.end, style: TextStyle(fontSize: 11.0, color: new Color(0xFF40ACC9), decoration: TextDecoration.underline)), + textAlign: TextAlign.end, style: TextStyle(fontSize: 11.0, color: new Color(0xffC5272D), decoration: TextDecoration.underline)), ), ), ) @@ -632,7 +632,7 @@ class _ToDoState extends State { widget.browser, appo.isLiveCareAppointment, "2", - null, + "", appo.appointmentDate, appo.appointmentNo, appo.clinicID, diff --git a/lib/pages/landing/fragments/home_page_fragment.dart b/lib/pages/landing/fragments/home_page_fragment.dart deleted file mode 100644 index 9f92a86b..00000000 --- a/lib/pages/landing/fragments/home_page_fragment.dart +++ /dev/null @@ -1,136 +0,0 @@ -import 'package:diplomaticquarterapp/models/hmg_services.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/pharmacy_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart'; -import 'package:diplomaticquarterapp/theme/colors.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/uitl/utils_new.dart'; -import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; -import 'package:flutter/material.dart'; - -class HomePageFragment extends StatefulWidget { - Function onPharmacyClick, onLoginClick; - - HomePageFragment({this.onPharmacyClick, this.onLoginClick}); - - @override - _HomePageFragmentState createState() => _HomePageFragmentState(); -} - -class _HomePageFragmentState extends State { - List hmgServices = []; - - @override - void initState() { - // TODO: implement initState - super.initState(); - - // getFamilyFiles(); - } - - initialiseHmgServices(bool isLogin) { - hmgServices.clear(); - hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin)); - hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/covid_test_drive_thru.svg", isLogin)); - hmgServices.add(new HmgServices(2, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin)); - hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin)); - hmgServices.add(new HmgServices(4, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Refferal.svg", isLogin)); - hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergency, TranslationBase.of(context).services, "assets/images/new/RRT.svg", isLogin)); - } - - @override - Widget build(BuildContext context) { - initialiseHmgServices(false); - return Container( - width: double.infinity, - child: Column( - children: [ - AspectRatio( - aspectRatio: 2.3, - child: Container( - margin: EdgeInsets.only(left: 14, right: 14, top: 10, bottom: 10), - child: SliderView( - onLoginClick: () { - widget.onLoginClick(); - }, - ), - // height: MediaQuery.of(context).size.width / 2.6, - ), - ), - Padding( - padding: const EdgeInsets.only(left: 20, right: 20), - child: Image.asset("assets/images/bn_offer.png"), - ), - Padding( - padding: const EdgeInsets.only( - left: 20, - right: 20, - top: 16, - ), - child: PharmacyView( - onPharmacyClick: () { - widget.onPharmacyClick(); - }, - ), - ), - mHeight(16), - Column( - children: [ - Padding( - padding: const EdgeInsets.only( - left: 20, - right: 8, - ), - child: Row( - children: [ - Expanded( - child: Text( - TranslationBase.of(context).hMGService, - style: TextStyle( - color: Colors.black, - fontSize: 18, - fontWeight: FontWeight.bold, - ), - ), - ), - FlatButton( - onPressed: () { - Navigator.push(context, FadePage(page: AllHabibMedicalService())); - }, - child: Text( - TranslationBase.of(context).viewAllServices, - style: TextStyle( - color: CustomColors.accentColor, - fontSize: 14, - decoration: TextDecoration.underline, - ), - ), - ), - ], - ), - ), - Padding( - padding: const EdgeInsets.only( - left: 20, - right: 20, - top: 4, - ), - child: GridView.builder( - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12), - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: hmgServices.length, - padding: EdgeInsets.zero, - itemBuilder: (BuildContext context, int index) { - return ServicesView(hmgServices[index], index); - }), - ), - ], - ), - mHeight(140), - ], - ), - ); - } -} diff --git a/lib/pages/landing/fragments/logged_home_page_fragment.dart b/lib/pages/landing/fragments/logged_home_page_fragment.dart deleted file mode 100644 index 92f3e960..00000000 --- a/lib/pages/landing/fragments/logged_home_page_fragment.dart +++ /dev/null @@ -1,422 +0,0 @@ -import 'package:auto_size_text/auto_size_text.dart'; -import 'package:carousel_slider/carousel_slider.dart'; -import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; -import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; -import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; -import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; -import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; -import 'package:diplomaticquarterapp/models/gradient_color.dart'; -import 'package:diplomaticquarterapp/models/hmg_services.dart'; -import 'package:diplomaticquarterapp/models/slider_data.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart'; -import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/logged_slider_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/pharmacy_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart'; -import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; -import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart'; -import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; -import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart'; -import 'package:diplomaticquarterapp/theme/colors.dart'; -import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/uitl/utils.dart'; -import 'package:diplomaticquarterapp/uitl/utils_new.dart'; -import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; -import 'package:flutter/material.dart'; -import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart' as s; -import 'package:provider/provider.dart'; - -class LoggedHomePageFragment extends StatefulWidget { - ProjectViewModel projectViewModel; - Function onPharmacyClick; - - LoggedHomePageFragment(this.projectViewModel, {this.onPharmacyClick}); - - @override - _HomePageFragmentState createState() => _HomePageFragmentState(); -} - -class _HomePageFragmentState extends State { - List hmgServices = []; - var familyFileProvider = FamilyFilesProvider(); - List appoList = []; - - @override - void initState() { - // TODO: implement initState - super.initState(); - - getPatientAppointmentHistory1(); - // getPatientAppointmentHistory1(); - // getFamilyFiles(); - } - - initialiseHmgServices(bool isLogin) { - hmgServices.clear(); - hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin)); - hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/covid_test_drive_thru.svg", isLogin)); - hmgServices.add(new HmgServices(2, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin)); - hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin)); - hmgServices.add(new HmgServices(4, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Refferal.svg", isLogin)); - hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergency, TranslationBase.of(context).services, "assets/images/new/RRT.svg", isLogin)); - } - - Future getFamilyFiles() async { - if (widget.projectViewModel.user != null) { - print("calling_family"); - - if (await s.sharedPref.getObject(FAMILY_FILE) != null) { - // print(await sharedPref.getObject(FAMILY_FILE)); - return Future.value(GetAllSharedRecordsByStatusResponse.fromJson(await s.sharedPref.getObject(FAMILY_FILE))); - } else { - return familyFileProvider.getSharedRecordByStatus(); - } - } - } - - @override - Widget build(BuildContext context) { - initialiseHmgServices(false); - var appoCountProvider = Provider.of(context); - List myMedicalList = Utils.myMedicalListHomePage(projectViewModel: widget.projectViewModel, context: context, count: appoCountProvider.count, isLogin: widget.projectViewModel.isLogin); - return Container( - width: double.infinity, - child: Column( - children: [ - AspectRatio( - aspectRatio: 2.3, - child: Padding( - padding: const EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 16), - child: LoggedSliderView( - widget.projectViewModel, - new SliderData(TranslationBase.of(context).fileno + ": " + widget.projectViewModel.user.patientID.toString(), - widget.projectViewModel.user.firstName + ' ' + widget.projectViewModel.user.lastName, "", bannerColor[0].darkColor, bannerColor[0].lightColor), - null), - ), - ), - appoCountProvider.count == 0 - ? Padding( - padding: const EdgeInsets.only(left: 20, right: 20), - child: Image.asset("assets/images/bn_offer.png"), - ) - : offersView(appoCountProvider.count), - mHeight(16), - Container( - width: double.infinity, - height: MediaQuery.of(context).size.width * 0.26, - child: ListView.separated( - itemCount: 4, - padding: EdgeInsets.zero, - scrollDirection: Axis.horizontal, - physics: BouncingScrollPhysics(), - itemBuilder: (context, index) { - return widget.projectViewModel.isArabic - ? Container( - child: myMedicalList[index], - width: MediaQuery.of(context).size.width * 0.26, - margin: EdgeInsets.only(left: index == 3 ? 20 : 0, right: index == 0 ? 20 : 0), - ) - : Container( - child: myMedicalList[index], - width: MediaQuery.of(context).size.width * 0.26, - margin: EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == 3 ? 20 : 0), - ); - }, - separatorBuilder: (BuildContext context, int index) { - return mWidth(12); - }, - ), - ), - Padding( - padding: widget.projectViewModel.isArabic - ? EdgeInsets.only( - right: 20, - left: 8, - top: 0, - ) - : EdgeInsets.only( - left: 20, - right: 8, - top: 0, - ), - child: Row( - children: [ - mFlex(1), - FlatButton( - onPressed: () { - navigateTo(context, MedicalProfilePageNew()); - }, - child: Text( - TranslationBase.of(context).viewMedicalFile, - style: TextStyle( - color: CustomColors.accentColor, - fontSize: 14, - decoration: TextDecoration.underline, - ), - ), - ), - ], - ), - ), - Padding( - padding: const EdgeInsets.only( - left: 20, - right: 20, - top: 4, - ), - child: PharmacyView( - onPharmacyClick: () { - widget.onPharmacyClick(); - }, - ), - ), - Column( - children: [ - Padding( - padding: widget.projectViewModel.isArabic - ? EdgeInsets.only( - right: 20, - left: 8, - top: 4, - ) - : EdgeInsets.only( - left: 20, - right: 8, - top: 4, - ), - child: Row( - children: [ - Expanded( - child: Text( - TranslationBase.of(context).hMGService, - style: TextStyle( - color: Colors.black, - fontSize: 18, - fontWeight: FontWeight.bold, - ), - ), - ), - FlatButton( - onPressed: () { - Navigator.push(context, FadePage(page: AllHabibMedicalService())); - }, - child: Text( - TranslationBase.of(context).viewAllServices, - style: TextStyle( - color: CustomColors.accentColor, - fontSize: 14, - decoration: TextDecoration.underline, - ), - ), - ), - ], - ), - ), - mHeight(4), - Container( - width: double.infinity, - height: MediaQuery.of(context).size.width * 0.26, - child: ListView.separated( - itemCount: hmgServices.length, - padding: EdgeInsets.zero, - scrollDirection: Axis.horizontal, - physics: BouncingScrollPhysics(), - itemBuilder: (BuildContext context, int index) { - return Container( - width: MediaQuery.of(context).size.width * 0.26, - margin: widget.projectViewModel.isArabic - ? EdgeInsets.only(left: index == hmgServices.length - 1 ? 20 : 0, right: index == 0 ? 20 : 0) - : EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == hmgServices.length - 1 ? 20 : 0), - child: ServicesView(hmgServices[index], index), - ); - }, - separatorBuilder: (BuildContext context, int index) { - return mWidth(12); - }, - ), - ), - ], - ), - mHeight(140), - ], - ), - ); - } - - Widget offersView(int counts) { - if (appoList.length > 0) { - return Container( - height: MediaQuery.of(context).size.width / 4.35, - child: ListView.separated( - itemCount: 2, - padding: EdgeInsets.zero, - scrollDirection: Axis.horizontal, - physics: BouncingScrollPhysics(), - itemBuilder: (context, index) { - return index == 0 - ? Container( - width: MediaQuery.of(context).size.width / 1.123, - height: MediaQuery.of(context).size.width / 4.35, - margin: widget.projectViewModel.isArabic ? EdgeInsets.only(right: index == 0 ? 20 : 0) : EdgeInsets.only(left: index == 0 ? 20 : 0), - padding: EdgeInsets.all(8), - decoration: containerColorRadiusBorderWidth(Colors.white, 16, Colors.black, 2), - child: InkWell( - onTap: () {}, - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - circularAviator(MediaQuery.of(context).size.width / 10, brColor: Colors.white, elevation: 1), - mWidth(8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - appoList[index].doctorTitle + " " + appoList[index].doctorNameObj, - style: TextStyle( - color: Colors.black, - fontSize: 16, - fontWeight: FontWeight.bold, - ), - ), - Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Icon( - Icons.watch_later_rounded, - size: 16, - ), - mWidth(4), - Expanded( - child: AutoSizeText( - DateUtil.getWeekDayMonthDayYearDateFormatted( - DateUtil.convertStringToDate(appoList[index].appointmentDate), widget.projectViewModel.isArabic ? "ar" : "en") + - " " + - appoList[index].startTime.substring(0, 5), - maxLines: 1, - ), - ), - ], - ), - ], - ), - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Icon( - Icons.notifications_active_sharp, - color: Color(0xFF9D9D9D), - size: 16, - ), - mWidth(4), - Text( - "Remind me", - style: TextStyle( - color: Color(0xFF9D9D9D), - fontSize: 12, - ), - ), - ], - ), - ], - ), - mFlex(1), - Flexible( - child: Container( - width: double.infinity, - child: Row( - children: [ - // Text( - // "Appointment Details", - // style: TextStyle( - // color: CustomColors.accentColor, - // decoration: TextDecoration.underline, - // ), - // ), - FlatButton( - onPressed: () { - Navigator.push(context, FadePage(page: MyAppointments())); - }, - child: Text( - "Appointment Details", - style: TextStyle( - color: CustomColors.accentColor, - fontSize: 14, - decoration: TextDecoration.underline, - ), - ), - ), - mFlex(1), - Icon(Icons.arrow_forward), - ], - ), - ), - ), - ], - ), - ), - ], - ), - ), - ) - : Padding( - padding: widget.projectViewModel.isArabic ? EdgeInsets.only(left: index == 1 ? 20 : 0) : EdgeInsets.only(right: index == 1 ? 20 : 0), - child: Container( - child: showOfferImage(), - width: MediaQuery.of(context).size.width / 1.123, - ), - ); - }, - separatorBuilder: (BuildContext context, int index) { - return mWidth(12); - }, - ), - ); - } else { - return Padding( - padding: const EdgeInsets.only(left: 20, right: 20), - child: Image.asset("assets/images/bn_offer.png"), - ); - } - } - - Widget showOfferImage() { - return Image.asset( - "assets/images/bn_offer.png", - width: double.infinity, - height: double.infinity, - fit: BoxFit.fill, - ); - } - - getPatientAppointmentHistory1() async { - DoctorsListService service = new DoctorsListService(); - - Map res = await service.getPatientAppointmentHistory(true, context); - // appoList.clear(); - if (res['MessageStatus'] == 1) { - if (res['AppoimentAllHistoryResultList'].length != 0) { - appoList.clear(); - res['AppoimentAllHistoryResultList'].forEach((v) { - appoList.add(new AppoitmentAllHistoryResultList.fromJson(v)); - }); - } - } - setState(() {}); - } -} diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart deleted file mode 100644 index 65bad5dd..00000000 --- a/lib/pages/landing/home_page.dart +++ /dev/null @@ -1,892 +0,0 @@ -import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart'; -import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart'; -import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; -import 'package:diplomaticquarterapp/locator.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart'; -import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart'; -import 'package:diplomaticquarterapp/pages/ContactUs/contact_us_page.dart'; -import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart'; -import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; -import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; -import 'package:diplomaticquarterapp/pages/packages_offers/OfferAndPackagesPage.dart'; -import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; -import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:hexcolor/hexcolor.dart'; -import 'package:provider/provider.dart'; - -import 'landing_page_pharmcy.dart'; - -class HomePage extends StatefulWidget { - final Function goToMyProfile; - - HomePage({Key key, this.goToMyProfile}); - - @override - _HomePageState createState() => _HomePageState(); -} - -class _HomePageState extends State { - PharmacyModuleViewModel pharmacyModuleViewModel = locator(); - - @override - void initState() { - // TODO: implement initState - super.initState(); - } - - @override - Widget build(BuildContext context) { - ProjectViewModel projectViewModel = Provider.of(context); - return BaseView( - onModelReady: (model) => () async {}, - builder: (_, model, wi) => AppScaffold( - isShowDecPage: false, - isHelp: true, - body: Container( - width: double.infinity, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Stack( - children: [ - Column( - children: [ - Container( - width: double.infinity, - height: 210, - decoration: BoxDecoration( - image: DecorationImage(image: ExactAssetImage('assets/images/dashboard_top_bg.png'), fit: BoxFit.cover), - ), - child: Stack( - children: [ - Positioned( - top: 15, - left: 5, - right: 5, - child: Container( - width: MediaQuery.of(context).size.width * 0.8, - child: Row( - children: [ - Expanded( - child: Container( - height: 125, - padding: EdgeInsets.all(5), - margin: EdgeInsets.all(5), - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/images/new-design/covid_bg_transparent.png"), - fit: BoxFit.fill, - ), - color: Colors.white.withOpacity(0.3), - borderRadius: BorderRadius.all(Radius.circular(5))), - child: (model.user != null && model.user.outSA == 1) - ? Container( - width: double.infinity, - height: double.infinity, - color: Colors.grey.shade500.withOpacity(0.3), - child: Icon( - Icons.lock_outline, - size: 40, - ), - ) - : Container( - child: Column( - children: [ - Texts( - TranslationBase.of(context).covidTest, - color: Colors.white, - fontWeight: FontWeight.w700, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Container( - margin: EdgeInsets.only( - top: 15.0, - ), - child: SvgPicture.asset('assets/images/new-design/covid-19-car.svg', width: 45.0, height: 45.0), - ), - Container( - margin: EdgeInsets.only(top: 5.0), - child: Column( - children: [ - Texts( - TranslationBase.of(context).driveThru, - fontWeight: FontWeight.w700, - color: Colors.white, - ), - ButtonTheme( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(5.0), - ), - minWidth: MediaQuery.of(context).size.width * 0.15, - height: 25.0, - child: RaisedButton( - color: Colors.red[800], - textColor: Colors.white, - disabledTextColor: Colors.white, - disabledColor: new Color(0xFFbcc2c4), - onPressed: (model.user != null && model.user.outSA == 1) - ? () {} - : () { - navigateToCovidDriveThru(); - }, - child: Center( - child: Center( - child: Center( - child: Center( - child: Texts( - TranslationBase.of(context).bookNow, - fontWeight: FontWeight.w700, - color: Colors.white, - ), - ), - ), - ), - ), - ), - ), - ], - ), - ), - ], - ), - ], - ), - )), - ), - Expanded( - child: InkWell( - onTap: () => Navigator.push(context, FadePage(page: LiveCareHome())), - child: Container( - height: 125, - padding: EdgeInsets.all(15), - margin: EdgeInsets.all(5), - decoration: BoxDecoration(color: Colors.white.withOpacity(0.3), borderRadius: BorderRadius.all(Radius.circular(5))), - child: SvgPicture.asset( - projectViewModel.isArabic ? 'assets/images/new-design/livecare_arabic_logo.svg' : 'assets/images/new-design/liveCare_white_logo.svg', - ), - ), - ), - ), - ], - ), - ), - ) - ], - ), - ), - Container(width: double.infinity, height: projectViewModel.isArabic ? 110 : 80) - ], - ), - Positioned( - top: 155, - left: MediaQuery.of(context).size.width * (MediaQuery.of(context).orientation == Orientation.landscape ? 0.02 : 0.03), - right: MediaQuery.of(context).size.width * (MediaQuery.of(context).orientation == Orientation.landscape ? 0.02 : 0.03), - child: (!model.isLogin) - ? Container( - width: double.infinity, - height: 125, - decoration: BoxDecoration( - color: HexColor('#A59E9E'), - shape: BoxShape.rectangle, - border: Border.all(color: Colors.transparent, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(9)), - image: DecorationImage(image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover)), - child: Container( - margin: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 2, - ), - Texts( - TranslationBase.of(context).myMedicalFile, - color: Colors.black87, - fontWeight: FontWeight.w700, - fontSize: 23, - ), - Texts( - TranslationBase.of(context).myMedicalFileSubTitle, - color: Colors.black, - fontSize: 16, - ), - Align( - alignment: projectViewModel.isArabic ? Alignment.bottomLeft : Alignment.bottomRight, - child: InkWell( - onTap: () { - widget.goToMyProfile(); - }, - child: Container( - margin: EdgeInsets.only(left: 15, right: 15), - width: 90, - height: 30, - decoration: BoxDecoration( - color: HexColor('#D81A2E'), - shape: BoxShape.rectangle, - border: Border.all(color: Colors.transparent, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(0)), - ), - child: Center( - child: Texts( - TranslationBase.of(context).viewMore, - color: Colors.white, - fontWeight: FontWeight.w700, - fontSize: 12, - ), - ), - ), - ), - ) - ], - ), - ), - ) - : Container( - width: double.infinity, - height: projectViewModel.isArabic ? 160 : 130, - decoration: BoxDecoration( - color: HexColor('#A59E9E'), - shape: BoxShape.rectangle, - border: Border.all(color: Colors.transparent, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(9)), - image: DecorationImage(image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover), - ), - child: Container( - margin: EdgeInsets.all(5), - child: Column( - children: [ - Row( - children: [ - if (projectViewModel.user != null && model.isLogin) - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 8, - ), - model.user.cRSVerificationStatus == 2 - ? Row( - children: [ - Texts( - model.user.firstName + " " + model.user.lastName, - color: Colors.grey[100], - bold: true, - fontSize: 15, - ), - Container( - margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0), - child: SvgPicture.asset("assets/images/new-design/verification_check.svg"), - ), - ], - ) - : model.user.cRSVerificationStatus == 3 - ? Row( - children: [ - Texts( - model.user.firstName + " " + model.user.lastName, - color: Colors.grey[100], - bold: true, - fontSize: 15, - ), - Container( - margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0), - child: SvgPicture.asset("assets/images/new-design/pending.svg"), - ), - ], - ) - : Row( - children: [ - Texts( - model.user.firstName + " " + model.user.lastName, - color: Colors.grey[100], - bold: true, - fontSize: 15, - ), - ], - ), - Texts( - '${model.user.patientID}', - color: Colors.white, - fontSize: 14, - ), - SizedBox( - height: 5, - ), - Texts( - '${DateUtil.getMonthDayYearDateFormatted(model.user.dateofBirthDataTime)} ,${model.user.gender == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female} ${model.user.age.toString() + "y"}', - color: Colors.grey[100], - fontWeight: FontWeight.normal, - fontSize: 14, - ), - ], - ), - ), - InkWell( - onTap: () { - widget.goToMyProfile(); - }, - child: Container( - margin: EdgeInsets.all(2), - width: 90, - height: 30, - decoration: BoxDecoration( - color: HexColor('#D81A2E'), - shape: BoxShape.rectangle, - border: Border.all(color: Colors.transparent, width: 0.5), - borderRadius: BorderRadius.all( - Radius.circular(5), - ), - ), - child: Center( - child: Texts( - TranslationBase.of(context).myMedicalFile, - color: Colors.white, - fontSize: 12, - textAlign: TextAlign.center, - ), - ), - ), - ) - ], - ), - Row( - children: [ - Expanded( - child: Row( - children: [ - Image.asset( - 'assets/images/height_icon.png', - width: 35, - height: 40, - ), - Texts( - "${model.heightCm} ${TranslationBase.of(context).cm}", - color: Colors.white, - fontSize: 17, - ) - ], - ), - ), - SizedBox( - width: 3, - ), - Expanded( - child: Row( - children: [ - Image.asset( - 'assets/images/weight_icon.png', - width: 25, - height: 40, - ), - Texts('${model.weightKg} ${TranslationBase.of(context).kg}', color: Colors.white, fontSize: 17) - ], - ), - ), - SizedBox( - width: 3, - ), - Expanded( - child: Row( - children: [ - Image.asset( - 'assets/images/blood_icon.png', - width: 35, - height: 40, - ), - Texts('${model.booldType}', color: Colors.white, fontSize: 17) - ], - ), - ), - ], - ) - ], - ), - ), - ), - ), - ], - ), - Padding( - padding: const EdgeInsets.only(bottom: 15, right: 15, left: 15), - child: InkWell( - onTap: () { - Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage())); - }, - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - color: Color(0xffB8382C), - ), - child: Padding( - padding: const EdgeInsets.all(8), - child: Row( - children: [ - Texts( - TranslationBase.of(context).offerAndPackages, - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.normal, - ), - Spacer(), - Image.asset("assets/images/offer_icon.png"), - ], - ), - ), - ), - ), - ), - if (projectViewModel.havePrivilege(64) || projectViewModel.havePrivilege(65) || projectViewModel.havePrivilege(67)) - Container( - margin: EdgeInsets.only(left: 15, right: 15), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - if (projectViewModel.havePrivilege(64)) - DashboardItem( - onTap: (model.user != null && model.user.outSA == 1) - ? () {} - : () { - Navigator.push( - context, - FadePage( - page: HomeHealthCarePage(), - ), - ); - }, - child: Center( - child: Padding( - padding: (model.user != null && model.user.outSA == 1) ? const EdgeInsets.all(0.0) : const EdgeInsets.all(15.0), - child: (model.user != null && model.user.outSA == 1) - ? Container( - width: double.infinity, - height: double.infinity, - color: Colors.grey.shade500.withOpacity(0.3), - child: Icon( - Icons.lock_outline, - size: 40, - ), - ) - : Column( - children: [ - Image.asset( - 'assets/images/home_health_care_icon.png', - width: 50, - height: 50, - ), - SizedBox( - height: 10, - ), - Texts( - TranslationBase.of(context).homeHealthCare, - textAlign: TextAlign.center, - color: Colors.white, - fontWeight: FontWeight.w700, - fontSize: SizeConfig.textMultiplier * 1.55, - ) - ], - )), - ), - height: MediaQuery.of(context).size.width * 0.4, - imageName: 'home_healthcare_service_bg.png', - opacity: 0.5, - ), - if (projectViewModel.havePrivilege(65)) - DashboardItem( - onTap: () => (model.user != null && model.user.outSA == 1) ? () {} : getPharmacyToken(model), - child: Center( - child: Padding( - padding: (model.user != null && model.user.outSA == 1) ? const EdgeInsets.all(0.0) : const EdgeInsets.all(15.0), - child: (model.user != null && model.user.outSA == 1) - ? Container( - width: double.infinity, - height: double.infinity, - color: Colors.grey.shade500.withOpacity(0.3), - child: Icon( - Icons.lock_outline, - size: 40, - ), - ) - : Column( - children: [ - Image.asset( - 'assets/images/pharmacy_logo.png', - width: 40, - height: 40, - ), - SizedBox( - height: 20, - ), - Texts( - TranslationBase.of(context).onlinePharmacy, - textAlign: TextAlign.center, - color: Colors.white, - fontWeight: FontWeight.w700, - fontSize: SizeConfig.textMultiplier * 1.55, - ) - ], - ), - ), - ), - height: MediaQuery.of(context).size.width * 0.4, - imageName: 'al-habib_onlne_pharmacy_bg.png', - ), - if (projectViewModel.havePrivilege(67)) - DashboardItem( - onTap: (model.user != null && model.user.outSA == 1) - ? () {} - : () { - Navigator.push( - context, - FadePage( - page: CMCPage(), - ), - ); - }, - child: Center( - child: Padding( - padding: (model.user != null && model.user.outSA == 1) ? const EdgeInsets.all(0.0) : const EdgeInsets.all(15.0), - child: (model.user != null && model.user.outSA == 1) - ? Container( - width: double.infinity, - height: double.infinity, - color: Colors.grey.shade500.withOpacity(0.3), - child: Icon( - Icons.lock_outline, - size: 40, - ), - ) - : Column( - children: [ - Image.asset( - 'assets/images/comprehensive_medical_checkup_logo.png', - width: 50, - height: 50, - ), - SizedBox( - height: 10, - ), - Texts( - TranslationBase.of(context).cmcHeading, - textAlign: TextAlign.center, - color: Colors.white, - fontWeight: FontWeight.w700, - fontSize: SizeConfig.textMultiplier * 1.55, - ) - ], - )), - ), - height: MediaQuery.of(context).size.width * 0.4, - color: HexColor("#747C80"), - imageName: 'emergency_service_image.png', - ), - ], - ), - ), - SizedBox( - height: 8, - ), - Container( - margin: EdgeInsets.only(left: 15, right: 15), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - InkWell( - onTap: () => Navigator.push(context, FadePage(page: PaymentService())), - child: Container( - width: MediaQuery.of(context).size.width * 0.29, - child: Center( - child: Padding( - padding: const EdgeInsets.all(15.0), - child: Column( - children: [ - Image.asset( - 'assets/images/al-habib_online_payment_service_icon.png', - height: 55, - ), - SizedBox( - height: 5, - ), - Texts( - TranslationBase.of(context).onlinePaymentService, - textAlign: TextAlign.center, - color: Colors.black87, - bold: false, - fontSize: SizeConfig.textMultiplier * 1.7, - ) - ], - ), - ), - ), - height: MediaQuery.of(context).size.width * 0.4, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6.0), - color: Colors.white, - ), - ), - ), - InkWell( - onTap: () { - Navigator.push(context, FadePage(page: EReferralPage())); - }, - child: Container( - child: Center( - child: Padding( - padding: const EdgeInsets.all(15.0), - child: Column( - children: [ - Image.asset( - 'assets/images/ereferral_service_icon.png', - width: 50, - height: 55, - ), - SizedBox( - height: 10, - ), - Texts( - TranslationBase.of(context).ereferral, - textAlign: TextAlign.center, - color: Colors.black87, - bold: false, - fontSize: SizeConfig.textMultiplier * 1.7, - ) - ], - ), - ), - ), - width: MediaQuery.of(context).size.width * 0.29, - height: MediaQuery.of(context).size.width * 0.4, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6.0), - color: Colors.white, - )), - ), - if (projectViewModel.havePrivilege(60)) - Container( - width: MediaQuery.of(context).size.width * 0.29, - child: InkWell( - onTap: () => Navigator.push( - context, - FadePage( - page: ErOptions( - isAppbar: true, - ))), - child: Center( - child: Padding( - padding: const EdgeInsets.all(15.0), - child: Column( - children: [ - Image.asset( - 'assets/images/Dr_Schedule_report.png', - width: 50, - height: 50, - ), - SizedBox( - height: 10, - ), - Texts( - TranslationBase.of(context).emergencyServices, - textAlign: TextAlign.center, - color: Colors.black87, - bold: false, - fontSize: SizeConfig.textMultiplier * 1.7, - ) - ], - ), - ), - ), - ), - height: MediaQuery.of(context).size.width * 0.4, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6.0), - color: Colors.white, - ), - ), - ], - ), - ), - // ), - SizedBox( - height: 5, - ), - Container( - margin: EdgeInsets.only(left: 15, right: 15), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - DashboardItem( - child: Container( - width: double.infinity, - padding: EdgeInsets.all(10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts( - TranslationBase.of(context).hMGService, - color: Colors.white, - fontWeight: FontWeight.normal, - ), - Texts( - TranslationBase.of(context).viewAllHabibMedicalService, - color: Colors.white, - fontWeight: FontWeight.normal, - fontSize: 10, - ), - Expanded( - child: Container(), - ), - Texts( - TranslationBase.of(context).viewMore, - color: Colors.white, - //fontWeight: FontWeight.normal, - ) - ], - ), - ), - height: 100, - imageName: 'contact_us_bg.png', - opacity: 0.5, - color: Colors.grey[700], - width: MediaQuery.of(context).size.width * 0.45, - onTap: () => Navigator.push(context, FadePage(page: AllHabibMedicalService())), - ), - DashboardItem( - onTap: () { - // Navigator.push( - // context, FadePage(page: FeedbackHomePage())); - Navigator.push(context, FadePage(page: ContactUsPage())); - }, - child: Container( - width: double.infinity, - padding: EdgeInsets.all(10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts( - TranslationBase.of(context).reachUs, - color: Colors.white, - fontWeight: FontWeight.normal, - ), - Texts( - TranslationBase.of(context).viewAllWaysReachUs, - color: Colors.white, - fontWeight: FontWeight.normal, - fontSize: 10, - ), - Expanded( - child: Container(), - ), - Texts( - TranslationBase.of(context).viewMore, - color: Colors.white, - fontWeight: FontWeight.normal, - ) - ], - ), - ), - height: 100, - imageName: 'contact_us_bg.png', - opacity: 0.5, - color: Colors.grey[700], - width: MediaQuery.of(context).size.width * 0.45, - ), - ], - ), - ), - SizedBox( - height: 120, - ) - ], - ), - ), - ), - ), - ); - } - - getPharmacyToken(DashboardViewModel model) async { - if (!model.isLogin) { - Navigator.push(context, FadePage(page: LandingPagePharmacy())); - } else { - GifLoaderDialogUtils.showMyDialog(context); - await pharmacyModuleViewModel.generatePharmacyToken().then((value) async { - if (pharmacyModuleViewModel.error.isNotEmpty) { - await pharmacyModuleViewModel.createUser().then((value) { - GifLoaderDialogUtils.hideDialog(context); - Navigator.push(context, FadePage(page: LandingPagePharmacy())); - }); - } else { - GifLoaderDialogUtils.hideDialog(context); - Navigator.push(context, FadePage(page: LandingPagePharmacy())); - } - }); - } - } - - navigateToCovidDriveThru() { - Navigator.push(context, FadePage(page: CovidDrivethruLocation())); - } -} - -class DashboardItem extends StatelessWidget { - const DashboardItem({this.hasBorder = false, this.imageName, @required this.child, this.onTap, Key key, this.width, this.height, this.color, this.opacity = 0.4, this.hasColorFilter = true}) - : super(key: key); - final bool hasBorder; - final String imageName; - final Widget child; - final Function onTap; - final double width; - final double height; - final Color color; - final double opacity; - final bool hasColorFilter; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: onTap, - child: Container( - width: width != null ? width : MediaQuery.of(context).size.width * 0.29, - height: height != null - ? height - : MediaQuery.of(context).orientation == Orientation.portrait - ? MediaQuery.of(context).size.height * 0.17 - : MediaQuery.of(context).size.height * 0.35, - decoration: BoxDecoration( - color: !hasBorder - ? color != null - ? color - : HexColor('#050705').withOpacity(opacity) - : Colors.white, - borderRadius: BorderRadius.circular(6.0), - border: hasBorder ? Border.all(width: 1.0, color: const Color(0xffcccccc)) : Border.all(width: 0.0, color: Colors.transparent), - image: imageName != null - ? DecorationImage( - image: ExactAssetImage('assets/images/$imageName'), - fit: BoxFit.cover, - colorFilter: hasColorFilter ? new ColorFilter.mode(Colors.black.withOpacity(0.2), BlendMode.dstIn) : null, - ) - : null, - ), - child: Center( - child: child, - ), - ), - ); - } -} diff --git a/lib/pages/landing/home_page_2.dart b/lib/pages/landing/home_page_2.dart index 4e063d20..1c019682 100644 --- a/lib/pages/landing/home_page_2.dart +++ b/lib/pages/landing/home_page_2.dart @@ -6,8 +6,7 @@ import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/fragments/home_page_fragment.dart'; -import 'package:diplomaticquarterapp/pages/landing/fragments/logged_home_page_fragment.dart'; + import 'package:diplomaticquarterapp/theme/colors.dart'; diff --git a/lib/pages/medical/balance/confirm_payment_page.dart b/lib/pages/medical/balance/confirm_payment_page.dart index 1a72dc8e..a2d6078c 100644 --- a/lib/pages/medical/balance/confirm_payment_page.dart +++ b/lib/pages/medical/balance/confirm_payment_page.dart @@ -212,7 +212,7 @@ class ConfirmPaymentPage extends StatelessWidget { transID = Utils.getAdvancePaymentTransID(advanceModel.hospitalsModel.iD, int.parse(advanceModel.fileNumber)); browser.openPaymentBrowser(amount, "Advance Payment", transID, advanceModel.hospitalsModel.iD.toString(), advanceModel.email, paymentMethod, patientInfoAndMobileNumber.patientType, - advanceModel.patientName, advanceModel.fileNumber, authenticatedUser, browser, false, "3", null); + advanceModel.patientName, advanceModel.fileNumber, authenticatedUser, browser, false, "3", ""); } onBrowserLoadStart(String url) { diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart deleted file mode 100644 index 1d933530..00000000 --- a/lib/pages/medical/medical_profile_page.dart +++ /dev/null @@ -1,191 +0,0 @@ -import 'dart:math'; - -import 'package:badges/badges.dart'; -import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart'; -import 'package:diplomaticquarterapp/core/viewModels/medical/medical_view_model.dart'; -import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; -import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; -import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/uitl/utils.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/medical/time_line_widget.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -class MedicalProfilePage extends StatefulWidget { - @override - _MedicalProfilePageState createState() => _MedicalProfilePageState(); -} - -class _MedicalProfilePageState extends State { - var authProvider = new AuthProvider(); - List medical = List(); - ProjectViewModel projectViewModel; - - @override - Widget build(BuildContext context) { - projectViewModel = Provider.of(context); - var appoCountProvider = Provider.of(context); - List myMedicalList = Utils.myMedicalList(projectViewModel: projectViewModel, context: context, count: appoCountProvider.count, isLogin: projectViewModel.isLogin); - return BaseView( - onModelReady: (model) => model.getAppointmentHistory(), - builder: (_, model, widget) => AppScaffold( - isShowDecPage: false, - baseViewModel: model, - isHelp: false, - body: Container( - child: SingleChildScrollView( - child: Column( - children: [ - Stack( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: double.infinity, - height: 210, - child: Stack( - children: [ - Image.asset( - 'assets/images/timeline_bg.png', - fit: BoxFit.cover, - width: double.infinity, - // color: Colors.black.withOpacity(0.0) - ), - if (model.isLogin) - ListView.builder( - itemBuilder: (context, index) => TimeLineWidget( - isUp: index % 2 == 1, - appoitmentAllHistoryResul: model.appoitmentAllHistoryResultList[index], - ), - itemCount: model.appoitmentAllHistoryResultList.length, - scrollDirection: Axis.horizontal, - reverse: projectViewModel.isArabic, - ), - ], - ), - ), - SizedBox( - height: 20, - ), - Padding( - padding: EdgeInsets.only(left: 12, right: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - projectViewModel.isLogin - ? Text( - projectViewModel?.user?.firstNameN ?? "", - style: TextStyle(color: Colors.black, fontSize: SizeConfig.textMultiplier * 1.8), - ) - : Container(), - Text( - TranslationBase.of(context).medicalFile, - style: TextStyle(color: Colors.black, fontSize: SizeConfig.textMultiplier * 3), - ), - ], - ), - ), - SizedBox( - height: 20, - ), - Padding( - padding: EdgeInsets.only(left: 12, right: 12), - child: GridView.builder( - shrinkWrap: true, - primary: false, - physics: NeverScrollableScrollPhysics(), - // gridDelegate: - // SliverGridDelegateWithFixedCrossAxisCount( - // crossAxisCount: 3, - // childAspectRatio: MediaQuery.of(context) - // .size - // .width / - // (MediaQuery.of(context).size.height / 2.20), - // ), - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12), - padding: EdgeInsets.zero, - itemCount: myMedicalList.length, - itemBuilder: (BuildContext context, int index) { - return myMedicalList[index]; - }, - ), - ), - SizedBox( - height: 12, - ), - ], - ), - SizedBox( - height: MediaQuery.of(context).size.height * 0.12, - ), - if (model.user != null && model.isLogin) - Positioned( - top: 185, - left: 20, - right: 20, - child: Container( - width: double.infinity, - height: 80, - decoration: BoxDecoration( - color: Colors.grey[500], - shape: BoxShape.rectangle, - border: Border.all(color: Colors.transparent, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(9)), - image: DecorationImage(image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover)), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - SizedBox( - height: 8, - ), - Texts( - model.user.firstName + " " + model.user.lastName, - color: Colors.white, - bold: true, - ), - Texts( - '${model.user.patientID}', - color: Colors.white, - ), - ], - ), - ), - ), - Positioned( - top: 2, - left: projectViewModel.isArabic ? 0 : 10, - right: projectViewModel.isArabic ? 10 : 0, - child: Texts( - TranslationBase.of(context).timeLine, - color: Colors.white, - fontSize: 14, - fontWeight: FontWeight.normal, - ), - ) - ], - ), - ], - ), - ), - ), - ), - ); - } -} - -class Medical { - final String title; - final String imagePath; - final String subTitle; - final Widget page; - - Medical({this.title, this.imagePath, this.subTitle, this.page}); -} diff --git a/lib/pages/pharmacies/screens/pharmacy_module_page.dart b/lib/pages/pharmacies/screens/pharmacy_module_page.dart index e4830583..ad49366d 100644 --- a/lib/pages/pharmacies/screens/pharmacy_module_page.dart +++ b/lib/pages/pharmacies/screens/pharmacy_module_page.dart @@ -5,7 +5,6 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_mo import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/offers_categorise_page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/product-brands.dart'; @@ -25,6 +24,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hexcolor/hexcolor.dart'; import 'package:rating_bar/rating_bar.dart'; import '../../final_products_page.dart'; import 'lacum-activitaion-vida-page.dart'; @@ -812,6 +812,54 @@ class GridViewButtons extends StatelessWidget { ); } } +class DashboardItem extends StatelessWidget { + const DashboardItem({this.hasBorder = false, this.imageName, @required this.child, this.onTap, Key key, this.width, this.height, this.color, this.opacity = 0.4, this.hasColorFilter = true}) + : super(key: key); + final bool hasBorder; + final String imageName; + final Widget child; + final Function onTap; + final double width; + final double height; + final Color color; + final double opacity; + final bool hasColorFilter; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: onTap, + child: Container( + width: width != null ? width : MediaQuery.of(context).size.width * 0.29, + height: height != null + ? height + : MediaQuery.of(context).orientation == Orientation.portrait + ? MediaQuery.of(context).size.height * 0.17 + : MediaQuery.of(context).size.height * 0.35, + decoration: BoxDecoration( + color: !hasBorder + ? color != null + ? color + : HexColor('#050705').withOpacity(opacity) + : Colors.white, + borderRadius: BorderRadius.circular(6.0), + border: hasBorder ? Border.all(width: 1.0, color: const Color(0xffcccccc)) : Border.all(width: 0.0, color: Colors.transparent), + image: imageName != null + ? DecorationImage( + image: ExactAssetImage('assets/images/$imageName'), + fit: BoxFit.cover, + colorFilter: hasColorFilter ? new ColorFilter.mode(Colors.black.withOpacity(0.2), BlendMode.dstIn) : null, + ) + : null, + ), + child: Center( + child: child, + ), + ), + ); + } +} + class GridViewCard extends StatelessWidget { final String text; 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 f9eb0427..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,6 +7,7 @@ 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_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'; @@ -45,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( @@ -69,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), ), @@ -168,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/lib/widgets/dialogs/select_location_dialog.dart b/lib/widgets/dialogs/select_location_dialog.dart index df33a963..4291c67e 100644 --- a/lib/widgets/dialogs/select_location_dialog.dart +++ b/lib/widgets/dialogs/select_location_dialog.dart @@ -21,6 +21,9 @@ class _SelectLocationDialogState extends State { void initState() { super.initState(); widget.selectedAddress = widget.selectedAddress ?? widget.addresses[0]; + for(int i=0;i