diff --git a/assets/images/new/body_parts/female/full_body_female.png b/assets/images/new/body_parts/female/full_body_female.png new file mode 100644 index 00000000..fb6a3756 Binary files /dev/null and b/assets/images/new/body_parts/female/full_body_female.png differ diff --git a/assets/images/new/body_parts/male/full_body_male.png b/assets/images/new/body_parts/male/full_body_male.png new file mode 100644 index 00000000..df304728 Binary files /dev/null and b/assets/images/new/body_parts/male/full_body_male.png differ diff --git a/lib/pages/BookAppointment/components/LaserClinic.dart b/lib/pages/BookAppointment/components/LaserClinic.dart index a4fc5117..f1b9be57 100644 --- a/lib/pages/BookAppointment/components/LaserClinic.dart +++ b/lib/pages/BookAppointment/components/LaserClinic.dart @@ -77,8 +77,9 @@ class _LaserClinicState extends State with SingleTickerProviderStat res['Laser_GetBodyPartsByCategoryList'].forEach((v) { _tempList.add(LaserBodyPart.fromJson(v)); }); - if (_tempList[0].category == 1 || _tempList[0].category == 11 || _tempList[0].category == 2 || _tempList[0].category == 10) { - fullBody = _tempList[0]; + // if (_tempList[0].category == 1 || _tempList[0].category == 11 || _tempList[0].category == 2 || _tempList[0].category == 10) { + if (_tempList[0].category == 2 || _tempList[0].category == 10) { + // fullBody = _tempList[0]; _tempList.removeAt(0); } laserBodyPartsList = _tempList; @@ -260,8 +261,15 @@ class _LaserClinicState extends State with SingleTickerProviderStat } Future navigateToSearchResults(context, List docList, List patientDoctorAppointmentListHospital) async { - Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, isDoctorSearchResult: true,))) - .then((value) { + Navigator.push( + context, + FadePage( + page: SearchResults( + isLiveCareAppointment: false, + doctorsList: docList, + patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital, + isDoctorSearchResult: true, + ))).then((value) { setState(() { // dropdownValue = null; }); @@ -356,46 +364,47 @@ class _LaserClinicState extends State with SingleTickerProviderStat child: Column( mainAxisSize: MainAxisSize.min, children: [ - if (fullBody != null) - Row( - children: [ - SizedBox( - width: 22, - height: 22, - child: Theme( - data: Theme.of(context).copyWith( - unselectedWidgetColor: Color(0xffEAEAEA), - ), - child: Checkbox( - value: _isFullBody, - onChanged: (value) { - setState(() { - if (value!) { - _selectedBodyPartList.clear(); - _selectedBodyPartList.add(fullBody); - } else { - _selectedBodyPartList.clear(); - } - _isFullBody = !_isFullBody; - }); - }, - activeColor: Color(0xffD02127), - ), - ), - ), - SizedBox(width: 12), - Text( - projectViewModel.isArabic ? fullBody.bodyPartN! : fullBody.bodyPart!, - style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.6, height: 21 / 14), - ), - ], - ), + // if (fullBody != null) + // Row( + // children: [ + // SizedBox( + // width: 22, + // height: 22, + // child: Theme( + // data: Theme.of(context).copyWith( + // unselectedWidgetColor: Color(0xffEAEAEA), + // ), + // child: Checkbox( + // value: _isFullBody, + // onChanged: (value) { + // setState(() { + // if (value!) { + // _selectedBodyPartList.clear(); + // _selectedBodyPartList.add(fullBody); + // } else { + // _selectedBodyPartList.clear(); + // } + // _isFullBody = !_isFullBody; + // }); + // }, + // activeColor: Color(0xffD02127), + // ), + // ), + // ), + // SizedBox(width: 12), + // Text( + // projectViewModel.isArabic ? fullBody.bodyPartN! : fullBody.bodyPart!, + // style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.6, height: 21 / 14), + // ), + // ], + // ), GridView.builder( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 85 / 107, crossAxisSpacing: 4, mainAxisSpacing: 21), physics: NeverScrollableScrollPhysics(), shrinkWrap: true, itemCount: laserBodyPartsList.length, - padding: fullBody != null ? EdgeInsets.only(top: 16) : EdgeInsets.zero, + // padding: fullBody != null ? EdgeInsets.only(top: 16) : EdgeInsets.zero, + padding: EdgeInsets.zero, itemBuilder: (BuildContext context, int index) { bool _isSelected = _selectedBodyPartList.any((file) => file.id == laserBodyPartsList[index].id); return InkWell( @@ -410,7 +419,7 @@ class _LaserClinicState extends State with SingleTickerProviderStat setState(() {}); return; } - AppToast.showToast(message: TranslationBase.of(context).laserMaxLimitReach); + AppToast.showToast(message: TranslationBase.of(context).laserMaxLimitReach, timeInSeconds: 3); return; } if (_isSelected) { diff --git a/lib/uitl/laser_body_parts_data.dart b/lib/uitl/laser_body_parts_data.dart index d7e5742d..366201a0 100644 --- a/lib/uitl/laser_body_parts_data.dart +++ b/lib/uitl/laser_body_parts_data.dart @@ -18,6 +18,7 @@ class LaserBodyParts { } Map maleBodyMap = { + "1": imagePng("assets/images/new/body_parts/male/full_body_male.png"), "40": imagePng("assets/images/new/body_parts/male/upper_arm.png"), "41": imagePng("assets/images/new/body_parts/male/lower_arm.png"), "42": imagePng("assets/images/new/body_parts/male/chest.png"), @@ -43,6 +44,7 @@ class LaserBodyParts { }; Map maleBodyRetouchMap = { + "50": imagePng("assets/images/new/body_parts/male/full_body_male.png"), "51": imagePng("assets/images/new/body_parts/male/upper_arm.png"), "52": imagePng("assets/images/new/body_parts/male/lower_arm.png"), "53": imagePng("assets/images/new/body_parts/male/chest.png"), @@ -57,6 +59,7 @@ class LaserBodyParts { }; Map femaleBodyMap = { + "1": imagePng("assets/images/new/body_parts/female/full_body_female.png"), "40": imagePng("assets/images/new/body_parts/female/upper_arm.png"), "41": imagePng("assets/images/new/body_parts/female/lower_arm.png"), "42": imagePng("assets/images/new/body_parts/female/chest.png"), @@ -89,6 +92,7 @@ class LaserBodyParts { }; Map femaleBodyRetouchMap = { + "50": imagePng("assets/images/new/body_parts/female/full_body_female.png"), "51": imagePng("assets/images/new/body_parts/female/upper_arm.png"), "52": imagePng("assets/images/new/body_parts/female/lower_arm.png"), "53": imagePng("assets/images/new/body_parts/female/chest.png"),