diff --git a/lib/ui/my_team/my_team.dart b/lib/ui/my_team/my_team.dart index 7b802c1..c9cc2c7 100644 --- a/lib/ui/my_team/my_team.dart +++ b/lib/ui/my_team/my_team.dart @@ -115,16 +115,15 @@ class _MyTeamState extends State { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), padding: const EdgeInsets.only(top: 12), - separatorBuilder: (cxt, index) => 12.height, + separatorBuilder: (BuildContext cxt,int index) => 12.height, itemCount: _textEditingController!.text.isNotEmpty ? getEmployeeSListOnSearch.length : getEmployeeSubordinatesList.length, - itemBuilder: (context, index) { + itemBuilder: (BuildContext cxt,int index) { var phoneNumber = Uri.parse('tel:${getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER}'); return InkWell( onTap: () async { Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSListOnSearch[index]); }, child: Row( - //mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ getEmployeeSListOnSearch[index].eMPLOYEEIMAGE == null diff --git a/lib/ui/my_team/team_members.dart b/lib/ui/my_team/team_members.dart index cb59ab6..6240b0e 100644 --- a/lib/ui/my_team/team_members.dart +++ b/lib/ui/my_team/team_members.dart @@ -64,19 +64,18 @@ class _TeamMembersState extends State { margin: const EdgeInsets.only(top: 100), child: Utils.getNoDataWidget(context)): ListView.separated( - scrollDirection: Axis.vertical, - shrinkWrap: true, - padding: EdgeInsets.all(21), - physics: ScrollPhysics(), - separatorBuilder: (cxt, index) => 12.height, - itemCount: getEmployeeSubordinatesList.length, - itemBuilder: (BuildContext context, int index) { - var phoneNumber = Uri.parse('tel:${getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER}'); - return InkWell( - onTap: () async { + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + padding: const EdgeInsets.only(top: 12), + separatorBuilder: (BuildContext cxt,int index) => 12.height, + itemCount: getEmployeeSubordinatesList.length, + itemBuilder: (BuildContext context, int index) { + var phoneNumber = Uri.parse('tel:${getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER}'); + return InkWell( + onTap: () async { // Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSubordinatesList[index]); }, - child: Row( + child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ getEmployeeSubordinatesList[index].eMPLOYEEIMAGE == null @@ -100,23 +99,28 @@ class _TeamMembersState extends State { ], ).expanded, Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.end, children: [ getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER == "" - ? SvgPicture.asset("assets/images/call-disable.svg", width: 22, height: 22).paddingOnly(bottom: 23) + ? SvgPicture.asset("assets/images/call-disable.svg", width: 22, height: 22) :InkWell( onTap: () { launchUrl(phoneNumber); }, - child: SvgPicture.asset("assets/images/call.svg", width: 22, height: 22).paddingOnly(bottom: 23), + child: SvgPicture.asset("assets/images/call.svg", width: 22, height: 22), + ), + 8.height, + const Icon( + Icons.arrow_forward_outlined, + color: MyColors.grey3AColor, + size: 18, ), - // 21.height, - Icon(Icons.arrow_forward_outlined, color: MyColors.grey3AColor), ], - ).expanded, + ), ], - ), - ).objectContainerView(); + ).paddingOnly(top: 13, bottom: 13, right: 12, left: 14).objectContainerView(radius: 10, disablePadding: true), + ); }), ], ) diff --git a/lib/ui/profile/family_members.dart b/lib/ui/profile/family_members.dart index e68eb92..70c907c 100644 --- a/lib/ui/profile/family_members.dart +++ b/lib/ui/profile/family_members.dart @@ -83,14 +83,11 @@ class _FamilyMembersState extends State { children: [ WidgetSpan( child: menuEntries.updateButton == 'Y' - ?InkWell( - onTap: () async { - relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt(); - showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr()); - }, - child: Icon(Icons.edit, size: 14, color: MyColors.grey67Color, - ), - ) + ? Icon(Icons.edit, size: 14, color: MyColors.grey67Color, + ).onPress(() async { + relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt(); + showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr()); + }) :Icon(Icons.edit, size: 14, color: MyColors.lightGreyColor, ), ), @@ -103,12 +100,7 @@ class _FamilyMembersState extends State { ), ), Container(height: 35, width: 1, color: const Color(0xffEFEFEF)), - InkWell( - onTap: () { - relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt(); - showRemoveAlertDialog(context, relationId!.toInt()); - }, - child: RichText( + RichText( text: TextSpan( children: [ const WidgetSpan( @@ -121,8 +113,8 @@ class _FamilyMembersState extends State { ), ], ), - ), - ), + ).onPress(() { relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt(); + showRemoveAlertDialog(context, relationId!.toInt());}), ], ), ],