diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index e8fa650..a4805b3 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -61,13 +61,13 @@ class Utils { "ProjectOutSA": false, "UsingInDoctorApp": false },{ - "Desciption": "Jeddah Hospital", - "DesciptionN": "مستشفى جدة", + "Desciption": "Jeddah Fayhaa Hospital", + "DesciptionN": "مستشفى جدة الفيحاء", "ID": 3, // Campus ID - "LegalName": "Jeddah Hospital", - "LegalNameN": "مستشفى جدة", - "Name": "Jeddah Hospital", - "NameN": "مستشفى جدة", + "LegalName": "Jeddah Fayhaa Hospital", + "LegalNameN": "مستشفى جدة الفيحاء", + "Name": "Jeddah Fayhaa Hospital", + "NameN": "مستشفى جدة الفيحاء", "PhoneNumber": "+966115222222", "SetupID": "013311", "DistanceInKilometers": 0, diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart index ffe26ff..da7c47d 100644 --- a/lib/presentation/book_appointment/widgets/doctor_card.dart +++ b/lib/presentation/book_appointment/widgets/doctor_card.dart @@ -70,15 +70,19 @@ class DoctorCard extends StatelessWidget { ), SizedBox(height: 2.h), Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - (isLoading - ? "Consultant Cardiologist" - : doctorsListResponseModel.speciality!.isNotEmpty - ? doctorsListResponseModel.speciality!.first - : "") - .toString() - .toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor, maxLine: 1) - .toShimmer2(isShow: isLoading), + SizedBox( + width: MediaQuery.of(context).size.width * 0.45, + child: (isLoading + ? "Consultant Cardiologist" + : doctorsListResponseModel.speciality!.isNotEmpty + ? doctorsListResponseModel.speciality!.first + : "") + .toString() + .toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor, maxLine: 2) + .toShimmer2(isShow: isLoading), + ), SizedBox(width: 6.w), Image.network( isLoading ? "https://hmgwebservices.com/Images/flag/SYR.png" : doctorsListResponseModel.nationalityFlagURL ?? "https://hmgwebservices.com/Images/flag/SYR.png", diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart index a0dd27f..9c53adb 100644 --- a/lib/presentation/home/landing_page.dart +++ b/lib/presentation/home/landing_page.dart @@ -349,15 +349,49 @@ class _LandingPageState extends State { isFromHomePage: true, ), ).paddingSymmetrical(24.h, 0.h) - : Swiper( - itemCount: myAppointmentsVM.isMyAppointmentsLoading - ? 3 - : myAppointmentsVM.patientAppointmentsHistoryList.length < 3 - ? myAppointmentsVM.patientAppointmentsHistoryList.length - : 3, - layout: SwiperLayout.STACK, - loop: true, - itemWidth: MediaQuery.of(context).size.width - 48.h, + : isTablet + ? SizedBox( + height: isFoldable ? 290.h : 255.h, + child: ListView.separated( + scrollDirection: Axis.horizontal, + itemCount: 3, + shrinkWrap: true, + padding: EdgeInsets.only(left: 16.h, right: 16.h), + itemBuilder: (context, index) { + return SizedBox( + height: 255.h, + width: 250.w, + child: getIndexSwiperCard(index), + ); + // return AnimationConfiguration.staggeredList( + // position: index, + // duration: const Duration(milliseconds: 1000), + // child: SlideAnimation( + // horizontalOffset: 100.0, + // child: FadeInAnimation( + // child: SizedBox( + // height: 255.h, + // width: 250.w, + // child: getIndexSwiperCard(index), + // ), + // ), + // ), + // ); + }, + separatorBuilder: (BuildContext cxt, int index) => SizedBox( + width: 10.w, + ), + ), + ) + : Swiper( + itemCount: myAppointmentsVM.isMyAppointmentsLoading + ? 3 + : myAppointmentsVM.patientAppointmentsHistoryList.length < 3 + ? myAppointmentsVM.patientAppointmentsHistoryList.length + : 3, + layout: SwiperLayout.STACK, + loop: true, + itemWidth: MediaQuery.of(context).size.width - 48.h, indicatorLayout: PageIndicatorLayout.COLOR, axisDirection: AxisDirection.right, controller: _controller, diff --git a/lib/presentation/notifications/notifications_list_page.dart b/lib/presentation/notifications/notifications_list_page.dart index 532b583..99d4270 100644 --- a/lib/presentation/notifications/notifications_list_page.dart +++ b/lib/presentation/notifications/notifications_list_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; +import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/extensions/int_extensions.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; @@ -52,10 +53,15 @@ class NotificationsListPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox(height: 16.h), - "Notification Title".toText14(), - SizedBox(height: 8.h), - notificationsVM.notificationsList[index].message!.toText14(), + // "Notification Title".toText14(), + // SizedBox(height: 8.h), + Row( + children: [ + Expanded(child: notificationsVM.notificationsList[index].message!.toText16(isBold: notificationsVM.notificationsList[index].isRead ?? false)), + ], + ), SizedBox(height: 12.h), + DateUtil.formatDateToDate(DateUtil.convertStringToDate(notificationsVM.notificationsList[index].isSentOn!), false).toText14(weight: FontWeight.w500), 1.divider, ], ),