icons and text changed for the application

1 month ago · 2619998362
parent b5c9251801
commit 2619998362
9 changed files with 38 additions and 35 deletions
--- a/assets/images/new/emergency_services.svg
+++ b/assets/images/new/emergency_services.svg
@ -1,5 +1,5 @@
 <svg width="126" height="126" viewBox="0 0 126 126" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M47.25 99.75C47.25 105.549 42.549 110.25 36.75 110.25C30.951 110.25 26.25 105.549 26.25 99.75C26.25 93.9509 30.951 89.25 36.75 89.25C42.549 89.25 47.25 93.9509 47.25 99.75Z" fill="#ED1C2B"/>
-<path d="M99.75 99.75C99.75 105.549 95.0492 110.25 89.25 110.25C83.4509 110.25 78.75 105.549 78.75 99.75C78.75 93.9509 83.4509 89.25 89.25 89.25C95.0492 89.25 99.75 93.9509 99.75 99.75Z" fill="#ED1C2B"/>
-<path d="M21 21H68.25C74.0491 21 78.75 25.701 78.75 31.5H89.4532C92.6431 31.5 95.6597 32.9499 97.6526 35.4407L112.35 53.8125H78.75V61.6875H115.5V89.25C115.5 94.1435 112.152 98.2553 107.622 99.4198C107.446 89.4238 99.288 81.375 89.25 81.375C79.1017 81.375 70.875 89.6018 70.875 99.75H55.125C55.125 89.6018 46.8982 81.375 36.75 81.375C26.712 81.375 18.554 89.4238 18.3779 99.4198C13.8477 98.2553 10.5 94.1435 10.5 89.25V31.5C10.5 25.701 15.201 21 21 21ZM47.5125 31.5H41.7375C40.2878 31.5 39.1125 32.6753 39.1125 34.125V44.3625H28.875C27.4253 44.3625 26.25 45.5378 26.25 46.9875V52.7625C26.25 54.212 27.4253 55.3875 28.875 55.3875H39.1125V65.625C39.1125 67.0745 40.2878 68.25 41.7375 68.25H47.5125C48.9622 68.25 50.1375 67.0745 50.1375 65.625V55.3875H60.375C61.8245 55.3875 63 54.212 63 52.7625V46.9875C63 45.5378 61.8245 44.3625 60.375 44.3625H50.1375V34.125C50.1375 32.6753 48.9622 31.5 47.5125 31.5Z" fill="#ED1C2B"/>
+<path d="M47.25 99.75C47.25 105.549 42.549 110.25 36.75 110.25C30.951 110.25 26.25 105.549 26.25 99.75C26.25 93.9509 30.951 89.25 36.75 89.25C42.549 89.25 47.25 93.9509 47.25 99.75Z" fill="#14384B"/>
+<path d="M99.75 99.75C99.75 105.549 95.0492 110.25 89.25 110.25C83.4509 110.25 78.75 105.549 78.75 99.75C78.75 93.9509 83.4509 89.25 89.25 89.25C95.0492 89.25 99.75 93.9509 99.75 99.75Z" fill="#14384B"/>
+<path d="M21 21H68.25C74.0491 21 78.75 25.701 78.75 31.5H89.4532C92.6431 31.5 95.6597 32.9499 97.6526 35.4407L112.35 53.8125H78.75V61.6875H115.5V89.25C115.5 94.1435 112.152 98.2553 107.622 99.4198C107.446 89.4238 99.288 81.375 89.25 81.375C79.1017 81.375 70.875 89.6018 70.875 99.75H55.125C55.125 89.6018 46.8982 81.375 36.75 81.375C26.712 81.375 18.554 89.4238 18.3779 99.4198C13.8477 98.2553 10.5 94.1435 10.5 89.25V31.5C10.5 25.701 15.201 21 21 21ZM47.5125 31.5H41.7375C40.2878 31.5 39.1125 32.6753 39.1125 34.125V44.3625H28.875C27.4253 44.3625 26.25 45.5378 26.25 46.9875V52.7625C26.25 54.212 27.4253 55.3875 28.875 55.3875H39.1125V65.625C39.1125 67.0745 40.2878 68.25 41.7375 68.25H47.5125C48.9622 68.25 50.1375 67.0745 50.1375 65.625V55.3875H60.375C61.8245 55.3875 63 54.212 63 52.7625V46.9875C63 45.5378 61.8245 44.3625 60.375 44.3625H50.1375V34.125C50.1375 32.6753 48.9622 31.5 47.5125 31.5Z" fill="#14384B"/>
 </svg>
--- a/assets/images/new/emergency_services_back.svg
+++ b/assets/images/new/emergency_services_back.svg
@ -1,5 +1,5 @@
 <svg width="126" height="126" viewBox="0 0 126 126" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M47.25 99.75C47.25 105.549 42.549 110.25 36.75 110.25C30.951 110.25 26.25 105.549 26.25 99.75C26.25 93.9509 30.951 89.25 36.75 89.25C42.549 89.25 47.25 93.9509 47.25 99.75Z" fill="#ED1C2B" fill-opacity="0.1"/>
-<path d="M99.75 99.75C99.75 105.549 95.0492 110.25 89.25 110.25C83.4509 110.25 78.75 105.549 78.75 99.75C78.75 93.9509 83.4509 89.25 89.25 89.25C95.0492 89.25 99.75 93.9509 99.75 99.75Z" fill="#ED1C2B" fill-opacity="0.1"/>
-<path d="M21 21H68.25C74.0491 21 78.75 25.701 78.75 31.5H89.4532C92.6431 31.5 95.6597 32.9499 97.6526 35.4407L112.35 53.8125H78.75V61.6875H115.5V89.25C115.5 94.1435 112.152 98.2553 107.622 99.4198C107.446 89.4238 99.288 81.375 89.25 81.375C79.1017 81.375 70.875 89.6018 70.875 99.75H55.125C55.125 89.6018 46.8982 81.375 36.75 81.375C26.712 81.375 18.554 89.4238 18.3779 99.4198C13.8477 98.2553 10.5 94.1435 10.5 89.25V31.5C10.5 25.701 15.201 21 21 21ZM47.5125 31.5H41.7375C40.2878 31.5 39.1125 32.6753 39.1125 34.125V44.3625H28.875C27.4253 44.3625 26.25 45.5378 26.25 46.9875V52.7625C26.25 54.212 27.4253 55.3875 28.875 55.3875H39.1125V65.625C39.1125 67.0745 40.2878 68.25 41.7375 68.25H47.5125C48.9622 68.25 50.1375 67.0745 50.1375 65.625V55.3875H60.375C61.8245 55.3875 63 54.212 63 52.7625V46.9875C63 45.5378 61.8245 44.3625 60.375 44.3625H50.1375V34.125C50.1375 32.6753 48.9622 31.5 47.5125 31.5Z" fill="#ED1C2B" fill-opacity="0.1"/>
+<path d="M47.25 99.75C47.25 105.549 42.549 110.25 36.75 110.25C30.951 110.25 26.25 105.549 26.25 99.75C26.25 93.9509 30.951 89.25 36.75 89.25C42.549 89.25 47.25 93.9509 47.25 99.75Z" fill="#14384B" fill-opacity="0.1"/>
+<path d="M99.75 99.75C99.75 105.549 95.0492 110.25 89.25 110.25C83.4509 110.25 78.75 105.549 78.75 99.75C78.75 93.9509 83.4509 89.25 89.25 89.25C95.0492 89.25 99.75 93.9509 99.75 99.75Z" fill="#14384B" fill-opacity="0.1"/>
+<path d="M21 21H68.25C74.0491 21 78.75 25.701 78.75 31.5H89.4532C92.6431 31.5 95.6597 32.9499 97.6526 35.4407L112.35 53.8125H78.75V61.6875H115.5V89.25C115.5 94.1435 112.152 98.2553 107.622 99.4198C107.446 89.4238 99.288 81.375 89.25 81.375C79.1017 81.375 70.875 89.6018 70.875 99.75H55.125C55.125 89.6018 46.8982 81.375 36.75 81.375C26.712 81.375 18.554 89.4238 18.3779 99.4198C13.8477 98.2553 10.5 94.1435 10.5 89.25V31.5C10.5 25.701 15.201 21 21 21ZM47.5125 31.5H41.7375C40.2878 31.5 39.1125 32.6753 39.1125 34.125V44.3625H28.875C27.4253 44.3625 26.25 45.5378 26.25 46.9875V52.7625C26.25 54.212 27.4253 55.3875 28.875 55.3875H39.1125V65.625C39.1125 67.0745 40.2878 68.25 41.7375 68.25H47.5125C48.9622 68.25 50.1375 67.0745 50.1375 65.625V55.3875H60.375C61.8245 55.3875 63 54.212 63 52.7625V46.9875C63 45.5378 61.8245 44.3625 60.375 44.3625H50.1375V34.125C50.1375 32.6753 48.9622 31.5 47.5125 31.5Z" fill="#14384B" fill-opacity="0.1"/>
 </svg>
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
@ -80,7 +80,7 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
    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).online, TranslationBase.of(context).payment, "assets/images/new/visa.png", isLogin));
-    hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.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).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
    hmgServices.add(new HmgServices(5, "RRT", TranslationBase.of(context).emergency, "assets/images/new/emergency.svg", isLogin));
    hmgServices.add(new HmgServices(6, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Referral.svg", isLogin));
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart
@ -68,10 +68,10 @@ class _AllHabibMedicalSevicePage2State extends State<AllHabibMedicalSevicePage2>

    hmgServices.add(new HmgServices(0, TranslationBase.of(context).book, TranslationBase.of(context).appointmentLabel, "assets/images/new/book appointment.svg", isLogin));
    hmgServices.add(new HmgServices(1, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin));
-    hmgServices.add(new HmgServices(2, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.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(2, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.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).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
-    hmgServices.add(new HmgServices(5, TranslationBase.of(context).pharmacyTitle, TranslationBase.of(context).pharmacySubtitle, "assets/images/new/Pharmacy.svg", isLogin));
+    // hmgServices.add(new HmgServices(5, TranslationBase.of(context).pharmacyTitle, TranslationBase.of(context).pharmacySubtitle, "assets/images/new/Pharmacy.svg", isLogin));

    hmgServices.add(new HmgServices(6, TranslationBase.of(context).medicalFileTitle2, TranslationBase.of(context).medicalFileSubtitle, "assets/images/new/medical file.svg", isLogin));
    hmgServices.add(new HmgServices(7, TranslationBase.of(context).familyTitle, TranslationBase.of(context).familySubtitle, "assets/images/new/my family.svg", isLogin));
--- a/lib/pages/BookAppointment/search_result/ResultByFacility.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByFacility.dart
@ -97,10 +97,10 @@ class HospitalTitle extends StatelessWidget {
                children: [
                  Row(
                    children: [
-                      SvgPicture.asset(iconUrl),
-                      SizedBox(
-                        width: 8,
-                      ),
+                      // SvgPicture.asset(iconUrl),
+                      // SizedBox(
+                      //   width: 8,
+                      // ),
                      Text(
                        title,
                        style: TextStyle(
--- a/lib/pages/BookAppointment/search_result/ResultByHospital.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByHospital.dart
@ -106,14 +106,14 @@ class HospitalBodyWidget extends StatelessWidget {
                        children: [
                          Row(
                            children: [
-                              Padding(
-                                padding: const EdgeInsets.all(6.0),
-                                child: SvgPicture.asset(
-                                  isHMC
-                                      ? 'assets/images/svg/HMC.svg'
-                                      : 'assets/images/svg/HMG.svg',
-                                ),
-                              ),
+                              // Padding(
+                              //   padding: const EdgeInsets.all(6.0),
+                              //   child: SvgPicture.asset(
+                              //     isHMC
+                              //         ? 'assets/images/svg/HMC.svg'
+                              //         : 'assets/images/svg/HMG.svg',
+                              //   ),
+                              // ),
                              Expanded(
                                child: Directionality(
                                  textDirection: (context
--- a/lib/pages/BookAppointment/search_result/ResultByRegion.dart
+++ b/lib/pages/BookAppointment/search_result/ResultByRegion.dart
@ -101,7 +101,8 @@ class RegionTitle extends StatelessWidget {
                  Row(
                    children: [
                        Visibility(
-                          visible: hmgCount != "0",
+                          // visible: hmgCount != "0",
+                          visible: false,
                          child: Row(
                            children: [
                              SvgPicture.asset(
@ -123,10 +124,12 @@ class RegionTitle extends StatelessWidget {
                          ),
                        ),
                        Visibility(
-                            visible: hmcCount != "0" && hmgCount != "0",
+                            // visible: hmcCount != "0" && hmgCount != "0",
+                            visible: false,
                            child: Text(", ")),
                        Visibility(
-                          visible: hmcCount != "0",
+                          // visible: hmcCount != "0",
+                          visible: false,
                          child: Row(
                            children: [
                              SvgPicture.asset(
--- a/lib/pages/landing/fragments/home_page_fragment2.dart
+++ b/lib/pages/landing/fragments/home_page_fragment2.dart
@ -61,9 +61,9 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
            isLocked: !projectViewModel.havePrivilege(107)))
        : hmgServices.add(HmgServices(2, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.svg", isLogin));

-    hmgServices.add(
-        HmgServices(9, TranslationBase.of(context).emergency, TranslationBase.of(context).checkinOptions, "assets/images/new/emergency.svg", isLogin, isLocked: !projectViewModel.havePrivilege(108)));
-    hmgServices.add(HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin));
+    // hmgServices.add(
+    //     HmgServices(9, TranslationBase.of(context).emergency, TranslationBase.of(context).checkinOptions, "assets/images/new/emergency.svg", isLogin, isLocked: !projectViewModel.havePrivilege(108)));
+    // hmgServices.add(HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin));
    hmgServices.add(HmgServices(4, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
    hmgServices.add(HmgServices(5, TranslationBase.of(context).online, TranslationBase.of(context).payment, "assets/images/new/paymentMethods.png", isLogin));
    hmgServices.add(HmgServices(6, TranslationBase.of(context).ereferralTitle, TranslationBase.of(context).ereferralSubtitle, "assets/images/new/E_Referral.svg", isLogin));
@ -240,7 +240,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
                  children: [
                    offersButton(),
                    mWidth(10),
-                    hmgButton(),
+                    // hmgButton(),
                  ],
                ),
              ),
--- a/lib/widgets/habib_logo_widget.dart
+++ b/lib/widgets/habib_logo_widget.dart
@ -8,12 +8,12 @@ class HabibLogoWidget extends StatelessWidget {
  Widget build(BuildContext context) {
    return Row(
      children: [
-        SvgPicture.asset(
-          "assets/images/new/logo.svg",
-          height: 24,
-          width: 62,
-        ),
-        SizedBox(width: 10),
+        // SvgPicture.asset(
+        //   "assets/images/new/logo.svg",
+        //   height: 24,
+        //   width: 62,
+        // ),
+        // SizedBox(width: 10),
        Expanded(
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,