pull/156/head
haroon amjad 4 months ago
parent 02930a901e
commit 1c0842ab95

@ -61,13 +61,13 @@ class Utils {
"ProjectOutSA": false, "ProjectOutSA": false,
"UsingInDoctorApp": false "UsingInDoctorApp": false
},{ },{
"Desciption": "Jeddah Hospital", "Desciption": "Jeddah Fayhaa Hospital",
"DesciptionN": "مستشفى جدة", "DesciptionN": "مستشفى جدة الفيحاء",
"ID": 3, // Campus ID "ID": 3, // Campus ID
"LegalName": "Jeddah Hospital", "LegalName": "Jeddah Fayhaa Hospital",
"LegalNameN": "مستشفى جدة", "LegalNameN": "مستشفى جدة الفيحاء",
"Name": "Jeddah Hospital", "Name": "Jeddah Fayhaa Hospital",
"NameN": "مستشفى جدة", "NameN": "مستشفى جدة الفيحاء",
"PhoneNumber": "+966115222222", "PhoneNumber": "+966115222222",
"SetupID": "013311", "SetupID": "013311",
"DistanceInKilometers": 0, "DistanceInKilometers": 0,

@ -70,15 +70,19 @@ class DoctorCard extends StatelessWidget {
), ),
SizedBox(height: 2.h), SizedBox(height: 2.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
(isLoading SizedBox(
? "Consultant Cardiologist" width: MediaQuery.of(context).size.width * 0.45,
: doctorsListResponseModel.speciality!.isNotEmpty child: (isLoading
? doctorsListResponseModel.speciality!.first ? "Consultant Cardiologist"
: "") : doctorsListResponseModel.speciality!.isNotEmpty
.toString() ? doctorsListResponseModel.speciality!.first
.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor, maxLine: 1) : "")
.toShimmer2(isShow: isLoading), .toString()
.toText12(fontWeight: FontWeight.w500, color: AppColors.greyTextColor, maxLine: 2)
.toShimmer2(isShow: isLoading),
),
SizedBox(width: 6.w), SizedBox(width: 6.w),
Image.network( Image.network(
isLoading ? "https://hmgwebservices.com/Images/flag/SYR.png" : doctorsListResponseModel.nationalityFlagURL ?? "https://hmgwebservices.com/Images/flag/SYR.png", isLoading ? "https://hmgwebservices.com/Images/flag/SYR.png" : doctorsListResponseModel.nationalityFlagURL ?? "https://hmgwebservices.com/Images/flag/SYR.png",

@ -349,15 +349,49 @@ class _LandingPageState extends State<LandingPage> {
isFromHomePage: true, isFromHomePage: true,
), ),
).paddingSymmetrical(24.h, 0.h) ).paddingSymmetrical(24.h, 0.h)
: Swiper( : isTablet
itemCount: myAppointmentsVM.isMyAppointmentsLoading ? SizedBox(
? 3 height: isFoldable ? 290.h : 255.h,
: myAppointmentsVM.patientAppointmentsHistoryList.length < 3 child: ListView.separated(
? myAppointmentsVM.patientAppointmentsHistoryList.length scrollDirection: Axis.horizontal,
: 3, itemCount: 3,
layout: SwiperLayout.STACK, shrinkWrap: true,
loop: true, padding: EdgeInsets.only(left: 16.h, right: 16.h),
itemWidth: MediaQuery.of(context).size.width - 48.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, indicatorLayout: PageIndicatorLayout.COLOR,
axisDirection: AxisDirection.right, axisDirection: AxisDirection.right,
controller: _controller, controller: _controller,

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.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/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/extensions/int_extensions.dart'; import 'package:hmg_patient_app_new/extensions/int_extensions.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@ -52,10 +53,15 @@ class NotificationsListPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 16.h), SizedBox(height: 16.h),
"Notification Title".toText14(), // "Notification Title".toText14(),
SizedBox(height: 8.h), // SizedBox(height: 8.h),
notificationsVM.notificationsList[index].message!.toText14(), Row(
children: [
Expanded(child: notificationsVM.notificationsList[index].message!.toText16(isBold: notificationsVM.notificationsList[index].isRead ?? false)),
],
),
SizedBox(height: 12.h), SizedBox(height: 12.h),
DateUtil.formatDateToDate(DateUtil.convertStringToDate(notificationsVM.notificationsList[index].isSentOn!), false).toText14(weight: FontWeight.w500),
1.divider, 1.divider,
], ],
), ),

Loading…
Cancel
Save