diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index ffcca5d7..890499a8 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1758,4 +1758,5 @@ const Map localizedValues = { "ancillaryOrderPaymentSuccess": {"en": "Your payment for selected orders has been made successfully.", "ar": "تم سداد دفعتك للطلبات المحددة بنجاح."}, "connectTitle": {"en": "Connect", "ar": "تواصل"}, "connectSubtitle": {"en": "With us", "ar": "معنا"}, + "covidConsent": {"en": "Covid-19 Test feature allows you to book an appointment for the Covid-19 Lab test within HMG branches, where a swab sample will be collected & processed. Once the result has been processed, we shall notify you via SMS on your registered mobile number & the test result will also be available in the Lab Results section of this app. Please note that this result is only available to you & not publicly available to anyone else. \nPlease accept to confirm & proceed.", "ar": "تتيح لك ميزة اختبار كوفيد19 حجز موعد في احد فروع مجموعة الحبيب الطبية ، حيث سيتم اخذ عينة المسحة ومعالجتها. بمجرد معالجة النتيجة ، سنخطرك عبر رسالة نصية قصيرة على رقم هاتفك المحمول المسجل وستكون نتيجة الاختبار متاحة أيضًا على التطبيق في قسم نتائج المختبر. يرجى ملاحظة أن هذه النتيجة متاحة لك فقط وليست متاحة للجمهور او اي شخص آخر. الرجاء الموافقة للتأكيد والمتابعة."}, }; \ No newline at end of file diff --git a/lib/core/model/er/AmbulanceRequestOrdersModel.dart b/lib/core/model/er/AmbulanceRequestOrdersModel.dart index 72a3fd5f..c08b3574 100644 --- a/lib/core/model/er/AmbulanceRequestOrdersModel.dart +++ b/lib/core/model/er/AmbulanceRequestOrdersModel.dart @@ -228,17 +228,17 @@ class AmbulanceRequestOrdersModel { } class WFOrder { - Null wfButtonsDTO; + dynamic wfButtonsDTO; num iD; num orderId; num previousStep; num nextStep; num serviceId; - Null order; + dynamic order; String created; - Null createdBy; - Null modified; - Null modifiedBy; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; bool isDeleted; WFOrder( @@ -291,14 +291,14 @@ class WFOrder { class Orderpayment { num iD; num orderId; - Null clientRequestId; + dynamic clientRequestId; num totalAmount; num paymentStatus; - Null order; + dynamic order; String created; - Null createdBy; - Null modified; - Null modifiedBy; + dynamic createdBy; + dynamic modified; + dynamic modifiedBy; bool isDeleted; Orderpayment( diff --git a/lib/pages/landing/widgets/services_view.dart b/lib/pages/landing/widgets/services_view.dart index 323b37de..32c4393a 100644 --- a/lib/pages/landing/widgets/services_view.dart +++ b/lib/pages/landing/widgets/services_view.dart @@ -283,8 +283,7 @@ class ServicesView extends StatelessWidget { builder: (cxt) => CovidConsentDialog( okTitle: TranslationBase.of(context).acceptLbl, title: "User Consent", - message: - "Covid-19 Test feature allows you to book appointment for Covid-19 Lab test within HMG branches where a swab sample will be collected & will be processed. Once the result has been processed you shall be notified via SMS on your registered mobile number & the test result will also be available in the Lab Results section of this app. Please note that this result is only available to you & not publicly available to anyone else. \nPlease accept to confirm & proceed.", + message: TranslationBase.of(context).covidConsent, onTap: () async { Navigator.push(context, FadePage(page: CovidDrivethruLocation())); }, diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 67f08479..297b669f 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -2829,11 +2829,10 @@ class TranslationBase { String get successRegister => localizedValues["successRegister"][locale.languageCode]; String get pharmacyLiveCare => localizedValues["pharmacyLiveCare"][locale.languageCode]; String get ancillaryOrderPaymentSuccess => localizedValues["ancillaryOrderPaymentSuccess"][locale.languageCode]; - String get connectTitle => localizedValues["connectTitle"][locale.languageCode]; String get connectSubtitle => localizedValues["connectSubtitle"][locale.languageCode]; - String get declineLbl => localizedValues["declineLbl"][locale.languageCode]; + String get covidConsent => localizedValues["covidConsent"][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/bottom_navigation/bottom_nav_bar.dart b/lib/widgets/bottom_navigation/bottom_nav_bar.dart index 9f9c7c0c..6f27fd94 100644 --- a/lib/widgets/bottom_navigation/bottom_nav_bar.dart +++ b/lib/widgets/bottom_navigation/bottom_nav_bar.dart @@ -50,16 +50,16 @@ class _BottomNavBarState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ BottomNavigationItem( - icon: DQIcons.my_medical_file, - activeIcon: DQIcons.my_medical_file, + icon: "assets/images/new/bottom_nav/my_file.svg", + activeIcon: "assets/images/new/bottom_nav/my_file.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 1, name: TranslationBase.of(context).medicalFile, ), BottomNavigationItem( - icon: DQIcons.family, - activeIcon: DQIcons.family, + icon: "assets/images/new/bottom_nav/family_files.svg", + activeIcon: "assets/images/new/bottom_nav/family_files.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 3, @@ -69,8 +69,8 @@ class _BottomNavBarState extends State { if (widget.index == 0) (widget.showHomeIcon) ? BottomNavigationItem( - icon: Icons.home_outlined, - activeIcon: Icons.home_outlined, + icon: "assets/images/new/bottom_nav/home.svg", + activeIcon: "assets/images/new/bottom_nav/home.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 2, @@ -79,8 +79,8 @@ class _BottomNavBarState extends State { : Expanded(child: SizedBox()), if (widget.index != 0 && projectViewModel.havePrivilege(34)) BottomNavigationItem( - icon: Icons.home_outlined, - activeIcon: Icons.home_outlined, + icon: "assets/images/new/bottom_nav/home.svg", + activeIcon: "assets/images/new/bottom_nav/home.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 0, @@ -96,8 +96,8 @@ class _BottomNavBarState extends State { // ), if (/*widget.index == 0 && */ projectViewModel.havePrivilege(34)) BottomNavigationItem( - icon: Icons.calendar_today_sharp, - activeIcon: Icons.calendar_today_sharp, + icon: "assets/images/new/bottom_nav/todo.svg", + activeIcon: "assets/images/new/bottom_nav/todo.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 4, @@ -105,8 +105,8 @@ class _BottomNavBarState extends State { ), if (projectViewModel.havePrivilege(77)) BottomNavigationItem( - icon: DQIcons.roboticon, - activeIcon: DQIcons.roboticon, + icon: "assets/images/new/bottom_nav/help.svg", + activeIcon: "assets/images/new/bottom_nav/help.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 5, diff --git a/lib/widgets/bottom_navigation/bottom_navigation_item.dart b/lib/widgets/bottom_navigation/bottom_navigation_item.dart index f01f70af..b729aa91 100644 --- a/lib/widgets/bottom_navigation/bottom_navigation_item.dart +++ b/lib/widgets/bottom_navigation/bottom_navigation_item.dart @@ -6,13 +6,14 @@ import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel. import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; import '../../Constants.dart'; class BottomNavigationItem extends StatelessWidget { - final IconData icon; - final IconData activeIcon; + final String icon; + final String activeIcon; final ValueChanged changeIndex; final int index; final int currentIndex; @@ -46,14 +47,12 @@ class BottomNavigationItem extends StatelessWidget { SizedBox( height: 15, ), - Container( - child: Icon(currentIndex == index ? activeIcon : icon, - color: currentIndex == index - ? secondaryColor - : isDisabled - ? Colors.grey[300] - : Colors.grey, - size: 22.0), + icon == "assets/images/new/bottom_nav/help.svg" ? Container( + child: SvgPicture.asset(icon, height: 20, width: 20, fit: BoxFit.cover), + ) : Container( + child: SvgPicture.asset(icon, height: 20, width: 20, fit: BoxFit.cover, color: currentIndex == index + ? Color(0xff333c45) + : Color(0xff989898)), ), SizedBox( height: 2, @@ -62,7 +61,7 @@ class BottomNavigationItem extends StatelessWidget { name, textAlign: TextAlign.center, color: currentIndex == index - ? secondaryColor + ? Color(0xff333c45) : isDisabled ? Colors.grey[300] : Colors.grey, @@ -77,21 +76,6 @@ class BottomNavigationItem extends StatelessWidget { ? Stack( alignment: AlignmentDirectional.center, children: [ - Positioned( - right: 18.0, - bottom: 28.0, - child: Badge( - toAnimate: false, - position: BadgePosition.topEnd(), - shape: BadgeShape.circle, - badgeColor: secondaryColor.withOpacity(1.0), - borderRadius: BorderRadius.circular(8), - badgeContent: Container( - padding: EdgeInsets.all(2.0), - child: Text(model.count.toString(), style: TextStyle(color: Colors.white, fontSize: 14.0)), - ), - ), - ), Column( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, @@ -100,7 +84,10 @@ class BottomNavigationItem extends StatelessWidget { height: 15, ), Container( - child: Icon(currentIndex == index ? activeIcon : icon, color: currentIndex == index ? secondaryColor : Theme.of(context).dividerColor, size: 22.0), + child: SvgPicture.asset(icon, height: 20, width: 20, fit: BoxFit.cover, color: currentIndex == index + ? Color(0xff333c45) + : Color(0xff989898)), + // Icon(currentIndex == index ? activeIcon : icon, color: currentIndex == index ? secondaryColor : Theme.of(context).dividerColor, size: 22.0), ), SizedBox( height: 2, @@ -108,7 +95,7 @@ class BottomNavigationItem extends StatelessWidget { Texts( name, textAlign: TextAlign.center, - color: currentIndex == index ? Theme.of(context).primaryColor : Colors.grey, + color: currentIndex == index ? Color(0xff333c45) : Colors.grey, fontSize: 11, ), SizedBox( @@ -116,6 +103,21 @@ class BottomNavigationItem extends StatelessWidget { ), ], ), + Positioned( + right: 18.0, + bottom: 28.0, + child: Badge( + toAnimate: false, + position: BadgePosition.topEnd(), + shape: BadgeShape.circle, + badgeColor: secondaryColor.withOpacity(1.0), + borderRadius: BorderRadius.circular(8), + badgeContent: Container( + padding: EdgeInsets.all(2.0), + child: Text(model.count.toString(), style: TextStyle(color: Colors.white, fontSize: 14.0)), + ), + ), + ), ], ) : Column( @@ -126,13 +128,7 @@ class BottomNavigationItem extends StatelessWidget { height: 15, ), Container( - child: Icon(currentIndex == index ? activeIcon : icon, - color: currentIndex == index - ? secondaryColor - : isDisabled - ? Colors.grey[300] - : Theme.of(context).dividerColor, - size: 22.0), + child: SvgPicture.asset(icon, height: 20, width: 20, fit: BoxFit.cover), ), SizedBox( height: 2, @@ -141,7 +137,7 @@ class BottomNavigationItem extends StatelessWidget { name, textAlign: TextAlign.center, color: currentIndex == index - ? secondaryColor + ? Color(0xff333c45) : isDisabled ? Colors.grey[300] : Colors.grey,