From 6dc7ba2d0bd9e931c3cb61989685714d3f8de5ea Mon Sep 17 00:00:00 2001 From: Haroon Amjad Date: Mon, 24 Jan 2022 12:04:08 +0300 Subject: [PATCH] updates --- assets/images/new/CS/Vida_Mobile.svg | 1 + assets/images/vida_logo_container.png | Bin 0 -> 16404 bytes lib/config/localized_values.dart | 1 + .../pharmacy_module_view_model.dart | 2 +- .../all_habib_medical_service_page2.dart | 8 ++++---- .../landing/fragments/home_page_fragment2.dart | 12 ++++++------ lib/pages/login/welcome.dart | 2 +- lib/uitl/translations_delegate_base.dart | 1 + lib/widgets/Loader/gif_loader_container.dart | 5 +++-- lib/widgets/drawer/app_drawer_widget.dart | 10 +++++----- lib/widgets/others/app_scaffold_widget.dart | 8 ++++---- .../pharmacy/bottom_nav_pharmacy_bar.dart | 2 +- .../pharmacy/bottom_nav_pharmacy_home_item.dart | 7 ++++--- pubspec.yaml | 1 + 14 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 assets/images/new/CS/Vida_Mobile.svg create mode 100644 assets/images/vida_logo_container.png diff --git a/assets/images/new/CS/Vida_Mobile.svg b/assets/images/new/CS/Vida_Mobile.svg new file mode 100644 index 00000000..619ce0ab --- /dev/null +++ b/assets/images/new/CS/Vida_Mobile.svg @@ -0,0 +1 @@ +Mobile \ No newline at end of file diff --git a/assets/images/vida_logo_container.png b/assets/images/vida_logo_container.png new file mode 100644 index 0000000000000000000000000000000000000000..06813fb7543481c66c47bf58b4025550fadad4cc GIT binary patch literal 16404 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 imP`z`G4i=J0RA6PpLR#u=SHmn0000 getBannerImagesUrl(ProjectViewModel projectViewModel) { List images = List(); - images.add('assets/images/pharmacy_module/pharmacy_logo_green.png'); + // images.add('assets/images/pharmacy_module/pharmacy_logo_green.png'); if (projectViewModel.isArabic) images.add('assets/images/pharmacy_module/offers_banner_ar.png'); diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart index b6608d1c..63ca1f07 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart @@ -49,18 +49,18 @@ class _AllHabibMedicalSevicePage2State extends State initialiseHmgServices(bool isLogin) { hmgServices.clear(); - hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCareTitle, TranslationBase.of(context).liveCareSubtitle, "assets/images/new/Live_Care.svg", isLogin)); + hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCareTitle, TranslationBase.of(context).liveCareSubtitle, "assets/images/new/CS/livecare_CS.svg", isLogin)); hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/CoronaIcon.svg", isLogin)); hmgServices.add(new HmgServices(2, TranslationBase.of(context).onlinePayment, TranslationBase.of(context).onlinePaymentSubtitle, "assets/images/new/paymentMethods.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/CS/home_health_care_CS.svg", isLogin)); hmgServices.add(new HmgServices(4, TranslationBase.of(context).cmcTitle, TranslationBase.of(context).cmcSubtitle, "assets/images/new/comprehensive_checkup.svg", isLogin)); - hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.svg", isLogin)); + hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/CS/emergency_request_CS.svg", isLogin)); hmgServices.add(new HmgServices(6, TranslationBase.of(context).ereferralTitle, TranslationBase.of(context).ereferralSubtitle, "assets/images/new/E_Referral.svg", isLogin)); hmgServices.add(new HmgServices(7, TranslationBase.of(context).waterTitle, TranslationBase.of(context).waterSubtitle, "assets/images/new/h2o.svg", isLogin)); hmgServices.add(new HmgServices(8, TranslationBase.of(context).findUs, TranslationBase.of(context).reachUs, "assets/images/new/reach_us.svg", isLogin)); hmgServices.add(new HmgServices(9, TranslationBase.of(context).medicalFileTitle2, TranslationBase.of(context).medicalFileSubtitle, "assets/images/new/medical file.svg", isLogin)); hmgServices.add(new HmgServices(10, TranslationBase.of(context).book, TranslationBase.of(context).appointmentLabel, "assets/images/new/book appointment.svg", isLogin)); - hmgServices.add(new HmgServices(11, TranslationBase.of(context).pharmacyTitle, TranslationBase.of(context).pharmacySubtitle, "assets/images/new/Pharmacy.svg", isLogin)); + hmgServices.add(new HmgServices(11, TranslationBase.of(context).onlinePharmacy, TranslationBase.of(context).pharmacySubtitle, "assets/images/new/CS/pharmacy_CS.svg", isLogin)); hmgServices.add(new HmgServices(12, TranslationBase.of(context).updateInsurance, TranslationBase.of(context).updateInsuranceSubtitle, "assets/images/new/update insurance card.svg", isLogin)); hmgServices.add(new HmgServices(13, TranslationBase.of(context).familyTitle, TranslationBase.of(context).familySubtitle, "assets/images/new/my family.svg", isLogin)); hmgServices.add(new HmgServices(14, TranslationBase.of(context).My_Child, TranslationBase.of(context).Vaccines, "assets/images/new/child vaccines.svg", isLogin)); diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index 87722fac..cbe987cf 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -56,12 +56,12 @@ class _HomePageFragment2State extends State { 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(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/CS/livecare_CS.svg", isLogin)); hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/CoronaIcon.svg", isLogin)); hmgServices.add(new HmgServices(2, TranslationBase.of(context).online, TranslationBase.of(context).payment, "assets/images/new/paymentMethods.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/CS/home_health_care_CS.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).emergency, TranslationBase.of(context).services2, "assets/images/new/emergency.svg", isLogin)); + hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergency, TranslationBase.of(context).services2, "assets/images/new/CS/emergency_request_CS.svg", isLogin)); hmgServices.add(new HmgServices(6, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Referral.svg", isLogin)); hmgServices.add(new HmgServices(7, "H\u2082O", TranslationBase.of(context).dailyWater, "assets/images/new/h2o.svg", isLogin)); hmgServices.add(new HmgServices(8, TranslationBase.of(context).reachUs, TranslationBase.of(context).findUs, "assets/images/new/reach_us.svg", isLogin)); @@ -496,7 +496,7 @@ class _HomePageFragment2State extends State { child: Opacity( opacity: 0.04, child: SvgPicture.asset( - "assets/images/new/Pharmacy.svg", + "assets/images/new/CS/pharmacy_CS.svg", height: MediaQuery.of(context).size.width * 0.15, ), ), @@ -507,7 +507,7 @@ class _HomePageFragment2State extends State { child: Opacity( opacity: 0.04, child: SvgPicture.asset( - "assets/images/new/Pharmacy.svg", + "assets/images/new/CS/pharmacy_CS.svg", height: MediaQuery.of(context).size.width * 0.15, ), ), @@ -524,7 +524,7 @@ class _HomePageFragment2State extends State { color: Colors.yellow, // width: MediaQuery.of(context).size.width * 0.065, child: SvgPicture.asset( - "assets/images/new/Pharmacy.svg", + "assets/images/new/CS/pharmacy_CS.svg", height: MediaQuery.of(context).size.width * 0.08, ), ), diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index 8688fec3..2d9f8e92 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -43,7 +43,7 @@ class _WelcomeLogin extends State { Row( children: [ SvgPicture.asset( - "assets/images/new/hmg_icon.svg", + "assets/images/new/CS/Vida_Mobile.svg", height: 62, width: 62, ), diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index a367df0d..030f3428 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -2827,6 +2827,7 @@ class TranslationBase { String get ancillaryOrdersPaymentConfirm => localizedValues["ancillaryOrdersPaymentConfirm"][locale.languageCode]; String get covidTestTodo => localizedValues["covidTestTodo"][locale.languageCode]; String get successRegister => localizedValues["successRegister"][locale.languageCode]; + String get VidaMobile => localizedValues["VidaMobile"][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/Loader/gif_loader_container.dart b/lib/widgets/Loader/gif_loader_container.dart index 75083d1a..e69dcd88 100644 --- a/lib/widgets/Loader/gif_loader_container.dart +++ b/lib/widgets/Loader/gif_loader_container.dart @@ -32,10 +32,11 @@ class _GifLoaderContainerState extends State with TickerProv return Center( //progress-loading.gif child: Container( - // margin: EdgeInsets.only(bottom: 40), + width: 90.0, + height: 90.0, child: GifImage( controller: controller1, - image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), + image: AssetImage("assets/images/new/CS/loader.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), ), )); } diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index b7e00d54..7ff64b5d 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -89,7 +89,7 @@ class _AppDrawerState extends State { padding: EdgeInsets.zero, children: [ Container( - height: SizeConfig.screenHeight * .30, + height: SizeConfig.screenHeight * .40, child: InkWell( child: Padding( padding: const EdgeInsets.all(14.0), @@ -101,10 +101,10 @@ class _AppDrawerState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - SvgPicture.asset( - "assets/images/new/logo.svg", - height: 60, - width: 60, + Image.asset( + "assets/images/vida_logo_container.png", + height: 100, + width: 100, ), IconButton( icon: Icon(Icons.clear), diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index a39b9d6a..b38071ed 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -187,10 +187,10 @@ class _AppScaffoldState extends State { }, child: Container( height: 2.0, - width: 10.0, - child: Image.asset( - 'assets/images/pharmacy_logo.png', - ), + width: 0.0, + // child: Image.asset( + // 'assets/images/pharmacy_logo.png', + // ), ), ); }, diff --git a/lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart b/lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart index 105d7503..9f6b3faa 100644 --- a/lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart +++ b/lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart @@ -38,7 +38,7 @@ class _BottomNavPharmacyBarState extends State { changeIndex: _changeIndex, index: widget.index, currentIndex: 0, - title: TranslationBase.of(context).Alhabibapp, + title: TranslationBase.of(context).VidaMobile, ), BottomNavPharmacyItem( icon: DQIcons.categories_menu_icon, diff --git a/lib/widgets/pharmacy/bottom_nav_pharmacy_home_item.dart b/lib/widgets/pharmacy/bottom_nav_pharmacy_home_item.dart index 28217b8b..837f60cb 100644 --- a/lib/widgets/pharmacy/bottom_nav_pharmacy_home_item.dart +++ b/lib/widgets/pharmacy/bottom_nav_pharmacy_home_item.dart @@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; class BottomNavHomeItem extends StatelessWidget { final IconData icon; @@ -58,10 +59,10 @@ class BottomNavHomeItem extends StatelessWidget { ), Container( margin: EdgeInsets.only(bottom: 5.0), - child: Image.asset( - 'assets/images/habib-logo.png', + child: SvgPicture.asset( + 'assets/images/new/CS/Vida_Mobile.svg', ), - height: 22.0, + height: 25.0, ), SizedBox( height: 5, diff --git a/pubspec.yaml b/pubspec.yaml index ab0a256d..648ce55f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -239,6 +239,7 @@ flutter: - assets/payment_options/ - assets/images/new/ + - assets/images/new/CS/ - assets/images/new/mass/ - assets/images/new/bottom_nav/ - assets/images/new/services/