pull/196/head
haroon amjad 3 weeks ago
parent 5b04a5a3ea
commit 29447cc9fa

@ -195,7 +195,7 @@ class ApiClientImp implements ApiClient {
} }
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// body['PatientID'] = 4773715; // body['PatientID'] = 2007395;
// body['PatientTypeID'] = 1; // body['PatientTypeID'] = 1;
// body['PatientOutSA'] = 0; // body['PatientOutSA'] = 0;
// body['SessionID'] = "45786230487560q"; // body['SessionID'] = "45786230487560q";

@ -75,7 +75,7 @@ class HospitalBottomSheetBodySelection extends StatelessWidget {
children: [ children: [
Utils.buildSvgWithAssets(icon: AppAssets.hmg).paddingOnly(right: 10), Utils.buildSvgWithAssets(icon: AppAssets.hmg).paddingOnly(right: 10),
Expanded( Expanded(
child: Text(hospital.projectName ?? "", style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: AppColors.blackColor)), child: Text(hospital.projectName ?? "", style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16.f, color: AppColors.blackColor)),
) )
], ],
); );

@ -43,7 +43,7 @@ class MyInvoicesViewModel extends ChangeNotifier {
} else if (apiResponse.messageStatus == 1) { } else if (apiResponse.messageStatus == 1) {
allInvoicesList = apiResponse.data!; allInvoicesList = apiResponse.data!;
isInvoicesListLoading = false; isInvoicesListLoading = false;
allInvoicesList.sort((a, b) => b.appointmentDate!.compareTo(a.appointmentDate!));
notifyListeners(); notifyListeners();
if (onSuccess != null) { if (onSuccess != null) {
onSuccess(apiResponse); onSuccess(apiResponse);

@ -116,7 +116,7 @@ class LoginScreenState extends State<LoginScreen> {
child: RichText( child: RichText(
textAlign: TextAlign.center, textAlign: TextAlign.center,
text: TextSpan( text: TextSpan(
style: context.dynamicTextStyle(color: Colors.black, fontSize: 14.f, height: 26 / 16, fontWeight: FontWeight.w500), style: context.dynamicTextStyle(color: AppColors.textColor, fontSize: 14.f, height: 26 / 16, fontWeight: FontWeight.w500),
children: <TextSpan>[ children: <TextSpan>[
TextSpan(text: LocaleKeys.dontHaveAccount.tr(context: context), style: context.dynamicTextStyle()), TextSpan(text: LocaleKeys.dontHaveAccount.tr(context: context), style: context.dynamicTextStyle()),
TextSpan(text: " "), TextSpan(text: " "),
@ -218,9 +218,9 @@ class LoginScreenState extends State<LoginScreen> {
await authViewModel.checkUserAuthentication(otpTypeEnum: OTPTypeEnum.whatsapp); await authViewModel.checkUserAuthentication(otpTypeEnum: OTPTypeEnum.whatsapp);
} }
}, },
backgroundColor: Colors.white, backgroundColor: AppColors.whiteColor,
borderColor: AppColors.borderOnlyColor, borderColor: AppColors.textColor,
textColor: AppColors.whiteColor, textColor: AppColors.textColor,
icon: AppAssets.whatsapp, icon: AppAssets.whatsapp,
iconColor: null, iconColor: null,
applyThemeColor: false, applyThemeColor: false,

@ -251,10 +251,11 @@ class _SavedLogin extends State<SavedLogin> {
} }
}, },
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
borderColor: Color(0xFF2E3039), borderColor: AppColors.textColor,
textColor: Color(0xFF2E3039), textColor: AppColors.textColor,
borderWidth: 2.w, borderWidth: 2.w,
padding: EdgeInsets.fromLTRB(0, 14.h, 0, 14.h), padding: EdgeInsets.fromLTRB(0, 14.h, 0, 14.h),
applyThemeColor: false,
), ),
const Spacer(flex: 2), const Spacer(flex: 2),
// OR divider // OR divider

@ -226,7 +226,7 @@ class _ReviewAppointmentPageState extends State<ReviewAppointmentPage> {
backgroundColor: AppColors.primaryRedColor, backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedColor,
textColor: Colors.white, textColor: Colors.white,
fontSize: 16, fontSize: 16.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12, borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),

@ -236,7 +236,7 @@ class LiveChatPage extends StatelessWidget {
backgroundColor: contactUsVM.selectedLiveChatProjectIndex == -1 ? AppColors.greyColor : AppColors.primaryRedColor, backgroundColor: contactUsVM.selectedLiveChatProjectIndex == -1 ? AppColors.greyColor : AppColors.primaryRedColor,
borderColor: contactUsVM.selectedLiveChatProjectIndex == -1 ? AppColors.greyColor : AppColors.primaryRedColor, borderColor: contactUsVM.selectedLiveChatProjectIndex == -1 ? AppColors.greyColor : AppColors.primaryRedColor,
textColor: Colors.white, textColor: Colors.white,
fontSize: 16, fontSize: 16.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12, borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),

@ -90,7 +90,7 @@ class NearestERItem extends StatelessWidget {
Expanded( Expanded(
child: CustomButton( child: CustomButton(
text: LocaleKeys.viewLocationGoogleMaps.tr(context: context), text: LocaleKeys.viewLocationGoogleMaps.tr(context: context),
iconSize: 18.h, iconSize: 16.h,
icon: AppAssets.location, icon: AppAssets.location,
onPressed: () { onPressed: () {
context.read<EmergencyServicesViewModel>().openDirections(destLat: double.parse(nearestERItem.latitude??"0.0"), destLng: double.parse(nearestERItem.longitude??"0.0") ); context.read<EmergencyServicesViewModel>().openDirections(destLat: double.parse(nearestERItem.latitude??"0.0"), destLng: double.parse(nearestERItem.longitude??"0.0") );
@ -100,7 +100,7 @@ class NearestERItem extends StatelessWidget {
textColor: AppColors.primaryRedColor, textColor: AppColors.primaryRedColor,
iconColor: AppColors.primaryRedColor, iconColor: AppColors.primaryRedColor,
height: 40.h, height: 40.h,
fontSize: 14, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
).toShimmer2(isShow: isLoading), ).toShimmer2(isShow: isLoading),
), ),

@ -66,7 +66,7 @@ class LabOrderByTest extends StatelessWidget {
backgroundColor: AppColors.secondaryLightRedColor, backgroundColor: AppColors.secondaryLightRedColor,
borderColor: AppColors.secondaryLightRedColor, borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor, textColor: AppColors.primaryRedColor,
fontSize: 14, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12, borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),

File diff suppressed because one or more lines are too long

@ -166,7 +166,7 @@ class LabResultDetails extends StatelessWidget {
: (labmodel.filteredGraphValues.length < 3) : (labmodel.filteredGraphValues.length < 3)
? (labmodel.filteredGraphValues.length * 64) + 80.h ? (labmodel.filteredGraphValues.length * 64) + 80.h
: 260.h, : 260.h,
padding: EdgeInsets.all(16.h), padding: EdgeInsets.all(14.h),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
@ -177,7 +177,7 @@ class LabResultDetails extends StatelessWidget {
Text( Text(
labmodel.isGraphVisible ? LocaleKeys.historyFlowchart.tr(context: context) : LocaleKeys.history.tr(context: context), labmodel.isGraphVisible ? LocaleKeys.historyFlowchart.tr(context: context) : LocaleKeys.history.tr(context: context),
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16.f,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColors.textColor, color: AppColors.textColor,

@ -42,7 +42,7 @@ class LabHistoryItem extends StatelessWidget{
), ),
Transform.flip( Transform.flip(
flipY: shouldRotateIcon, flipY: shouldRotateIcon,
child: Utils.buildSvgWithAssets(icon: assetUrl,height: 18, width: 18) child: Utils.buildSvgWithAssets(icon: assetUrl, height: 18, width: 18)
), ),
], ],
); );

@ -101,13 +101,13 @@ Widget buildLabel(String label) {
} }
Widget buildTimeSeparator() { Widget buildTimeSeparator() {
return const Padding( return Padding(
padding: EdgeInsets.symmetric(horizontal: 2.0), padding: EdgeInsets.symmetric(horizontal: 2.0),
child: Text( child: Text(
":", ":",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 20, fontSize: 20.f,
), ),
), ),
); );

@ -74,7 +74,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
LocaleKeys.to.tr(context: context), LocaleKeys.to.tr(context: context),
style: TextStyle( style: TextStyle(
color: AppColors.calenderTextColor, color: AppColors.calenderTextColor,
fontSize: 14.h, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
letterSpacing: -.2 letterSpacing: -.2
), ),
@ -247,7 +247,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
label, label,
style: TextStyle( style: TextStyle(
color: AppColors.inputLabelTextColor, color: AppColors.inputLabelTextColor,
fontSize: 12.h, fontSize: 12.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@ -255,7 +255,7 @@ class _DateRangeSelectorState extends State<DateRangeSelector> {
date!, date!,
style: TextStyle( style: TextStyle(
color: AppColors.textColor, color: AppColors.textColor,
fontSize: 14.h, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
) )

@ -53,7 +53,7 @@ class DatePickerWidget extends StatelessWidget {
return Text( return Text(
labelText, labelText,
style: const TextStyle( style: const TextStyle(
fontSize: 12, fontSize: 12.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Color(0xff898A8D), color: Color(0xff898A8D),
letterSpacing: -0.2, letterSpacing: -0.2,
@ -99,7 +99,7 @@ class DatePickerWidget extends StatelessWidget {
textAlign: TextAlign.left, textAlign: TextAlign.left,
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14.f,
height: 21 / 14, height: 21 / 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: (selectedValue != null && selectedValue!.isNotEmpty) ? const Color(0xff2E3039) : const Color(0xffB0B0B0), color: (selectedValue != null && selectedValue!.isNotEmpty) ? const Color(0xff2E3039) : const Color(0xffB0B0B0),

@ -87,7 +87,7 @@ class _NfcLayoutState extends State<NfcLayout> {
"Ready To Scan", "Ready To Scan",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 24, fontSize: 24.f,
), ),
), ),
SizedBox( SizedBox(
@ -103,7 +103,7 @@ class _NfcLayoutState extends State<NfcLayout> {
Text( Text(
"Approach an NFC Tag", "Approach an NFC Tag",
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18.f,
), ),
), ),
SizedBox( SizedBox(
@ -125,7 +125,7 @@ class _NfcLayoutState extends State<NfcLayout> {
backgroundColor: AppColors.primaryRedColor, backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor, textColor: AppColors.whiteColor,
fontSize: 14, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12.h, borderRadius: 12.h,
height: 40.h, height: 40.h,

@ -100,7 +100,7 @@ class _PhoneNumberInputState extends State<PhoneNumberInput> {
), ),
), ),
style: const TextStyle( style: const TextStyle(
fontSize: 18, fontSize: 18.f,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: 2, letterSpacing: 2,
color: Colors.black, color: Colors.black,

Loading…
Cancel
Save