Updates & fixes

merge-requests/390/head
haroon amjad 3 years ago
parent 458dc2474b
commit 3f29bbd6b3

@ -146,11 +146,11 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
),
Row(
children: [
Texts(
TranslationBase.of(context).invoiceDate,
// fontWeight: FontWeight.bold,
color: Colors.red[500],
),
// Texts(
// TranslationBase.of(context).invoiceDate,
// // fontWeight: FontWeight.bold,
// color: Colors.red[500],
// ),
Texts(" : "),
Texts(
DateUtil.getFormattedDate(

@ -359,6 +359,7 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
isLiveCareAppointment: _appointmentResult.isLiveCareAppointment,
date: DateUtil.convertStringToDate(_appointmentResult.appointmentDate),
isSortByClinic: _isSortByClinic,
appoTime: _appointmentResult.startTime,
//projectViewModel.isArabic ? DateUtil.getMonthDayYearDateFormattedAr(labOrder.orderDate) : DateUtil.getMonthDayYearDateFormatted(labOrder.orderDate),
);
},

@ -224,7 +224,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
pageController = PageController(keepPage: true);
_firebaseMessaging.setAutoInitEnabled(true);
locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
locationUtils = new LocationUtils(isShowConfirmDialog: false, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) => locationUtils.getCurrentLocation());
// HMG (Guest/Internet) Wifi Access [Zohaib Kambrani]
HMGNetworkConnectivity(context, () {

@ -22,9 +22,10 @@ class DoctorCard extends StatelessWidget {
final bool isInOutPatient;
final bool isLiveCareAppointment;
final bool isSortByClinic;
final String appoTime;
DoctorCard(
{this.name, this.subName, this.rat, this.date, this.profileUrl, this.isSortByClinic = true, this.billNo, this.onTap, this.onEmailTap, this.isInOutPatient, this.isLiveCareAppointment = false});
{this.name, this.subName, this.rat, this.date, this.profileUrl, this.isSortByClinic = true, this.billNo, this.onTap, this.onEmailTap, this.isInOutPatient, this.isLiveCareAppointment = false, this.appoTime});
@override
Widget build(BuildContext context) {
@ -106,7 +107,8 @@ class DoctorCard extends StatelessWidget {
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
),
Text(
DateUtil.formatDateToTime(date),
// DateUtil.formatDateToTime(date),
appoTime,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.48, height: 18 / 12),
),
],

@ -82,14 +82,14 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
children: [
if (_title.isNotEmpty)
Text(
_title,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 23 / 12),
_title + " " + _subTitle,
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 23 / 12),
),
Text(
_subTitle,
maxLines: 1,
style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2E303A), letterSpacing: -1.44, height: 25 / 24),
),
// Text(
// _subTitle,
// maxLines: 1,
// style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2E303A), letterSpacing: -1.44, height: 25 / 24),
// ),
],
),
),

Loading…
Cancel
Save