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 00000000..06813fb7 Binary files /dev/null and b/assets/images/vida_logo_container.png differ diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 706bec87..7a69e49c 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -663,6 +663,7 @@ const Map localizedValues = { "myAccount": {"en": "My Account", "ar": "حسابي"}, "cart": {"en": "Cart", "ar": "التسوق"}, "Alhabibapp": {"en": "Al Habib app", "ar": "تطبيق الحبيب"}, + "VidaMobile": {"en": "Vida Mobile", "ar": "تطبيق الحبيب"}, "searchProductHere": {"en": "Search Product here", "ar": "البحث عن منتج"}, "HHCNotAuthMsg": { "en": diff --git a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart index 27fe3234..458df338 100644 --- a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart +++ b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart @@ -75,7 +75,7 @@ class PharmacyModuleViewModel extends BaseViewModel { List 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/