diff --git a/lib/ui/work_list/sheets/delegate_sheet.dart b/lib/ui/work_list/sheets/delegate_sheet.dart index d505099..de724a1 100644 --- a/lib/ui/work_list/sheets/delegate_sheet.dart +++ b/lib/ui/work_list/sheets/delegate_sheet.dart @@ -1,4 +1,5 @@ import 'dart:collection'; +import 'dart:convert'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; @@ -32,8 +33,16 @@ class DelegateSheet extends StatefulWidget { VoidCallback callBackFunc; List getNotificationRespondAttributes; - DelegateSheet( - {required this.title, required this.apiMode, this.notificationID, this.actionHistoryList, this.wFHistory, required this.callBackFunc, this.getNotificationRespondAttributes = const []}); + DelegateSheet({ + super.key, + required this.title, + required this.apiMode, + this.notificationID, + this.actionHistoryList, + this.wFHistory, + required this.callBackFunc, + this.getNotificationRespondAttributes = const [], + }); @override State createState() => _DelegateSheetState(); @@ -46,8 +55,8 @@ class _DelegateSheetState extends State { String? selectedFavLetter; String selectedType = "Workflow"; String inputRes = ""; - List? favLetters; List? favUsersList; + List? filteredFavUsersList = []; List? replacementList; bool isImageLoaded = false; @@ -57,14 +66,14 @@ class _DelegateSheetState extends State { super.initState(); if (widget.wFHistory != null) { widget.wFHistory = widget.wFHistory!.reversed.toList(); - var ids = widget.wFHistory!.map((e) => e.employeeID).toSet(); - widget.wFHistory!.retainWhere((x) => ids.remove(x.employeeID)); + Set ids = widget.wFHistory!.map((WFHistory e) => e.employeeID).toSet(); + widget.wFHistory!.retainWhere((WFHistory x) => ids.remove(x.employeeID)); } if (widget.actionHistoryList != null) { widget.actionHistoryList = widget.actionHistoryList!.reversed.toList(); - var ids = widget.actionHistoryList!.map((e) => e.uSERNAME).toSet(); - widget.actionHistoryList!.retainWhere((x) => ids.remove(x.uSERNAME)); + Set ids = widget.actionHistoryList!.map((GetActionHistoryList e) => e.uSERNAME).toSet(); + widget.actionHistoryList!.retainWhere((GetActionHistoryList x) => ids.remove(x.uSERNAME)); } } @@ -73,36 +82,96 @@ class _DelegateSheetState extends State { super.dispose(); } - Future fetchFavLetters({bool isNeedLoading = true}) async { - favLetters = []; + Future fetchFavUsers({bool isNeedLoading = true}) async { + favUsersList = []; + filteredFavUsersList = []; + if (isNeedLoading) Utils.showLoading(context); - List? favList = await WorkListApiClient().getFavoriteReplacementWithoutImage(); - List result = []; - favList!.forEach((element) { - result.add(element.employeeDisplayName![0]); - }); - favLetters = LinkedHashSet.from(result).toList(); - if (isNeedLoading) Utils.hideLoading(context); - setState(() { - favLetters!.sort((a, b) { - return a.toLowerCase().compareTo(b.toLowerCase()); - }); - }); - return null; + + try { + List? favList = await WorkListApiClient().getFavoriteReplacementWithoutImage(); + favUsersList = favList; + + if (favUsersList != null && favUsersList!.isNotEmpty) { + favUsersList!.sort((GetFavoriteReplacements a, GetFavoriteReplacements b) => (a.employeeDisplayName ?? '').toLowerCase().compareTo((b.employeeDisplayName ?? '').toLowerCase())); + filteredFavUsersList = favUsersList; + + if (isNeedLoading) Utils.hideLoading(context); + setState(() {}); + _fetchAndAttachUserImages(); + } else { + if (isNeedLoading) Utils.hideLoading(context); + setState(() {}); + } + } catch (e) { + if (isNeedLoading) Utils.hideLoading(context); + setState(() {}); + } } - Future fetchFavUsersList({bool isNeedLoading = true}) async { - if (isNeedLoading) Utils.showLoading(context); - favUsersList = await WorkListApiClient().getFavoriteReplacementWithImage(selectedFavLetter ?? ""); - if (isNeedLoading) Utils.hideLoading(context); - setState(() {}); - fetchFavUsersListNew(isNeedLoading: false); - return null; + Future _fetchAndAttachUserImages() async { + try { + List? tempList = await WorkListApiClient().getFavoriteReplacementWithImageNew(""); + + if (tempList != null && tempList.isNotEmpty && favUsersList != null) { + for (GetFavoriteReplacements element in favUsersList!) { + for (GetFavoriteReplacements element2 in tempList) { + if (element.userName == element2.userName && element2.employeeImage != null && element2.employeeImage!.isNotEmpty) { + element.employeeImage = element2.employeeImage; + } + } + } + filteredFavUsersList = favUsersList; + setState(() {}); + } + } catch (e) {} } + // Future fetchFavUsers({bool isNeedLoading = true}) async { + // favUsersList = []; + // if (isNeedLoading) Utils.showLoading(context); + // + // try { + // List? favList = await WorkListApiClient().getFavoriteReplacementWithoutImage(); + // favUsersList = favList; + // + // if (favUsersList != null && favUsersList!.isNotEmpty) { + // setState(() { + // favUsersList!.sort((GetFavoriteReplacements a, GetFavoriteReplacements b) => (a.employeeDisplayName ?? '').toLowerCase().compareTo((b.employeeDisplayName ?? '').toLowerCase())); + // }); + // if (isNeedLoading) Utils.hideLoading(context); + // + // List? tempList = await WorkListApiClient().getFavoriteReplacementWithImageNew(""); + // if (tempList != null && tempList.isNotEmpty) { + // for (GetFavoriteReplacements element in favUsersList!) { + // for (GetFavoriteReplacements element2 in tempList) { + // if (element.userName == element2.userName) { + // if (element2.employeeImage != null && element2.employeeImage!.isNotEmpty) { + // element.employeeImage = element2.employeeImage; + // } + // } + // } + // } + // setState(() {}); + // } + // } + // } catch (e) { + // // if (isNeedLoading) Utils.hideLoading(context); + // } + // } + + // Future fetchFavUsersList({bool isNeedLoading = true}) async { + // if (isNeedLoading) Utils.showLoading(context); + // favUsersList = await WorkListApiClient().getFavoriteReplacementWithImage(selectedFavLetter ?? ""); + // if (isNeedLoading) Utils.hideLoading(context); + // setState(() {}); + // fetchFavUsersListNew(isNeedLoading: false); + // return null; + // } + Future fetchFavUsersListNew({bool isNeedLoading = true}) async { if (isNeedLoading) Utils.showLoading(context); - favUsersList = await WorkListApiClient().getFavoriteReplacementWithImageNew(selectedFavLetter ?? ""); + filteredFavUsersList = await WorkListApiClient().getFavoriteReplacementWithImageNew(selectedFavLetter ?? ""); if (isNeedLoading) Utils.hideLoading(context); setState(() { isImageLoaded = true; @@ -112,18 +181,10 @@ class _DelegateSheetState extends State { void fetchChangeFav({required String email, required String employeName, required String image, required String userName, bool isFav = false, bool isNeedToRefresh = false}) async { Utils.showLoading(context); - favLetters = null; - selectedFavLetter = null; - GenericResponseModel model = await WorkListApiClient().changeFavoriteReplacements( - email: email, - employeName: employeName, - image: image, - userName: userName, - isFav: isFav, - ); + GenericResponseModel model = await WorkListApiClient().changeFavoriteReplacements(email: email, employeName: employeName, image: image, userName: userName, isFav: isFav); if (isNeedToRefresh) { - await fetchFavLetters(isNeedLoading: false); - if (favLetters != null) await fetchFavUsersList(isNeedLoading: false); + await fetchFavUsers(isNeedLoading: false); + // if (favUsersList != null) await fetchFavUsersList(isNeedLoading: false); } Utils.hideLoading(context); @@ -137,44 +198,58 @@ class _DelegateSheetState extends State { userName: selectedType == "Employee Name" ? inputRes : "", email: selectedType == "Employee Email" ? inputRes : "", ); + if (isNeedLoading) Utils.hideLoading(context); setState(() {}); return null; } + Future searchFavUser() async { + if (favUsersList != null && favUsersList!.isNotEmpty) { + if (inputRes.length > 3) { + filteredFavUsersList = + favUsersList!.where((GetFavoriteReplacements element) { + String query = inputRes.toLowerCase(); + return (element.employeeDisplayName != null && element.employeeDisplayName!.toLowerCase().contains(query)) || + (element.userName != null && element.userName!.toLowerCase().contains(query)) || + (element.emailAddress != null && element.emailAddress!.toLowerCase().contains(query)); + }).toList(); + } else { + filteredFavUsersList = favUsersList; + } + } else { + filteredFavUsersList = []; + } + + setState(() {}); + } + @override Widget build(BuildContext context) { - return Container( + return SizedBox( width: double.infinity, height: MediaQuery.of(context).size.height - 80, child: Column( - children: [ + children: [ Expanded( child: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(21), child: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ widget.title.toText24(isBold: true), 21.height, LocaleKeys.search.tr().toText16(), 11.height, Column( crossAxisAlignment: CrossAxisAlignment.end, - children: [ + children: [ Container( - padding: EdgeInsets.only(left: 8, right: 4, top: 6, bottom: 6), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(15), - color: Colors.transparent, - border: Border.all( - color: Color(0xffefefef), - width: 1, - ), - ), + padding: const EdgeInsets.only(left: 8, right: 4, top: 6, bottom: 6), + decoration: BoxDecoration(borderRadius: BorderRadius.circular(15), color: Colors.transparent, border: Border.all(color: const Color(0xffefefef), width: 1)), child: Row( - children: [ + children: [ Expanded( child: InputWidget( "Search By " + selectedType, @@ -185,29 +260,18 @@ class _DelegateSheetState extends State { verticalPadding: 3, isInputTypeNum: selectedType == "Employee ID" ? true : false, isEnable: isNeedEnableTextField, - onChange: (v) { + onChange: (String v) { inputRes = v; + if (selectedType == "Favorites") { + searchFavUser(); + } }, ), ), + Container(height: 36, width: 1, color: const Color(0xffE5E5E5)), Container( - height: 36, - width: 1, - color: Color(0xffE5E5E5), - ), - Container( - padding: EdgeInsets.all(8), - child: Row( - children: [ - selectedType.toText12(), - 4.width, - const Icon( - Icons.keyboard_arrow_down, - color: Colors.black, - size: 16, - ), - ], - ), + padding: const EdgeInsets.all(8), + child: Row(children: [selectedType.toText12(), 4.width, const Icon(Icons.keyboard_arrow_down, color: Colors.black, size: 16)]), ).onPress(() { showMyBottomSheet( context, @@ -220,18 +284,16 @@ class _DelegateSheetState extends State { setState(() { isNeedEnableTextField = false; selectedFavLetter = null; - favLetters = null; - favUsersList = null; + filteredFavUsersList = null; }); } else if (value == "Favorites") { - isNeedEnableTextField = false; - fetchFavLetters(); + isNeedEnableTextField = true; + fetchFavUsers(); } else { setState(() { isNeedEnableTextField = true; selectedFavLetter = null; - favLetters = null; - favUsersList = null; + filteredFavUsersList = null; }); } }, @@ -241,143 +303,105 @@ class _DelegateSheetState extends State { ], ), ), - if (isNeedEnableTextField) + if (isNeedEnableTextField && selectedType != "Favorites") TextButton( onPressed: () { fetchUserByInput(); }, - child: const Text( - "Search", - style: TextStyle( - color: Colors.blue, - decoration: TextDecoration.underline, - ), - ), - ) + child: const Text("Search", style: TextStyle(color: Colors.blue, decoration: TextDecoration.underline)), + ), ], ), if (!isNeedEnableTextField) 12.height, Row( - children: [ + children: [ Expanded( - child: Container( + child: SizedBox( width: double.infinity, - child: selectedFavLetter == null && favLetters != null - ? Container( - width: double.infinity, - alignment: Alignment.center, - child: "Please select letter to see Fav results".toText12(), - ) - : favUsersList != null + child: + // selectedFavLetter == null && favLetters != null + // ? Container(width: double.infinity, alignment: Alignment.center, child: "Please select letter to see Fav results".toText12()) + // : + filteredFavUsersList != null ? ListView.separated( - itemBuilder: (context, index) { - return showFavUserItem(favUsersList![index]); - }, - separatorBuilder: (context, index) { - return Container( - color: MyColors.borderColor, - width: double.infinity, - height: 1, - margin: EdgeInsets.only(top: 8, bottom: 8), - ).onPress(() {}); - }, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: favUsersList!.length, - padding: EdgeInsets.only(top: 8, bottom: 8), - ) + itemBuilder: (BuildContext context, int index) { + return showFavUserItem(filteredFavUsersList![index]); + }, + separatorBuilder: (BuildContext context, int index) { + return Container(color: MyColors.borderColor, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8)).onPress(() {}); + }, + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: filteredFavUsersList!.length, + padding: const EdgeInsets.only(top: 8, bottom: 8), + ) : isNeedEnableTextField && replacementList == null - ? Container( - width: double.infinity, - alignment: Alignment.center, - child: "Search User".toText12(), - ) - : isNeedEnableTextField && replacementList!.length == 0 - ? Container( - width: double.infinity, - alignment: Alignment.center, - child: "No Data Found".toText12(), - ) - : isNeedEnableTextField - ? ListView.separated( - itemBuilder: (context, index) { - return showInputUserItem(replacementList![index]); - }, - separatorBuilder: (context, index) { - return Container( - color: MyColors.borderE3Color, - width: double.infinity, - height: 1, - margin: EdgeInsets.only(top: 8, bottom: 8), - ); - }, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: replacementList!.length, - padding: EdgeInsets.only(top: 8, bottom: 8), - ) - : (widget.wFHistory != null - ? ListView.separated( - itemBuilder: (context, index) { - return showItgItem(widget.wFHistory![index]); - }, - separatorBuilder: (context, index) { - return Container( - color: MyColors.borderE3Color, - width: double.infinity, - height: 1, - margin: EdgeInsets.only(top: 8, bottom: 8), - ); - }, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: widget.wFHistory!.length, - padding: EdgeInsets.only(top: 8, bottom: 8), - ) - : ListView.separated( - itemBuilder: (context, index) { - return showItem(widget.actionHistoryList![index]); - }, - separatorBuilder: (context, index) { - return Container( - color: MyColors.borderE3Color, - width: double.infinity, - height: 1, - margin: EdgeInsets.only(top: 8, bottom: 8), - ); - }, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: widget.actionHistoryList!.length, - padding: EdgeInsets.only(top: 8, bottom: 8), - )), + ? Container(width: double.infinity, alignment: Alignment.center, child: "Search User".toText12()) + : isNeedEnableTextField && replacementList!.isEmpty + ? Container(width: double.infinity, alignment: Alignment.center, child: "No Data Found".toText12()) + : isNeedEnableTextField + ? ListView.separated( + itemBuilder: (BuildContext context, int index) { + return showInputUserItem(replacementList![index]); + }, + separatorBuilder: (BuildContext context, int index) { + return Container(color: MyColors.borderE3Color, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8)); + }, + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: replacementList!.length, + padding: const EdgeInsets.only(top: 8, bottom: 8), + ) + : (widget.wFHistory != null + ? ListView.separated( + itemBuilder: (BuildContext context, int index) { + return showItgItem(widget.wFHistory![index]); + }, + separatorBuilder: (BuildContext context, int index) { + return Container(color: MyColors.borderE3Color, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8)); + }, + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: widget.wFHistory!.length, + padding: const EdgeInsets.only(top: 8, bottom: 8), + ) + : ListView.separated( + itemBuilder: (BuildContext context, int index) { + return showItem(widget.actionHistoryList![index]); + }, + separatorBuilder: (BuildContext context, int index) { + return Container(color: MyColors.borderE3Color, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8)); + }, + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: widget.actionHistoryList!.length, + padding: const EdgeInsets.only(top: 8, bottom: 8), + )), ), ), - if (favLetters != null) - Container( - width: 30, - // color: Colors.red, - child: ListView.separated( - itemBuilder: (context, index) { - return Container( - padding: EdgeInsets.all(8), - alignment: Alignment.center, - child: favLetters![index].toText14(color: selectedFavLetter == favLetters![index] ? MyColors.gradiantStartColor : Colors.black), - ).onPress(() { - selectedFavLetter = favLetters![index].toUpperCase(); - fetchFavUsersList(); - }); - }, - separatorBuilder: (context, index) { - return SizedBox( - height: 0, - ); - }, - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemCount: favLetters!.length, - ), - ), + // if (favLetters != null) + // SizedBox( + // width: 30, + // // color: Colors.red, + // child: ListView.separated( + // itemBuilder: (BuildContext context, int index) { + // return Container( + // padding: const EdgeInsets.all(8), + // alignment: Alignment.center, + // child: favLetters![index].toText14(color: selectedFavLetter == favLetters![index] ? MyColors.gradiantStartColor : Colors.black), + // ).onPress(() { + // selectedFavLetter = favLetters![index].toUpperCase(); + // fetchFavUsersList(); + // }); + // }, + // separatorBuilder: (BuildContext context, int index) { + // return const SizedBox(height: 0); + // }, + // physics: const NeverScrollableScrollPhysics(), + // shrinkWrap: true, + // itemCount: favLetters!.length, + // ), + // ), ], ), ], @@ -385,22 +409,15 @@ class _DelegateSheetState extends State { ), ), ), - Container( - width: double.infinity, - height: 1, - color: MyColors.borderColor, - ), + Container(width: double.infinity, height: 1, color: MyColors.borderColor), DefaultButton( "Cancel", () { Navigator.pop(context); }, textColor: Colors.black, - colors: [ - Color(0xffE6E6E6), - Color(0xffE6E6E6), - ], - ).insideContainer + colors: const [Color(0xffE6E6E6), Color(0xffE6E6E6)], + ).insideContainer, ], ), ); @@ -410,25 +427,22 @@ class _DelegateSheetState extends State { return InkWell( onTap: () { Navigator.pop(context); - showMyBottomSheet(context, - callBackFunc: widget.callBackFunc, - child: SelectedItemSheet( - "Comment", - apiMode: widget.apiMode, - actionHistoryList: actionHistory, - notificationID: widget.notificationID, - isITGRequest: widget.wFHistory != null, - getNotificationRespondAttributes: widget.getNotificationRespondAttributes, - )); + showMyBottomSheet( + context, + callBackFunc: widget.callBackFunc, + child: SelectedItemSheet( + "Comment", + apiMode: widget.apiMode, + actionHistoryList: actionHistory, + notificationID: widget.notificationID, + isITGRequest: widget.wFHistory != null, + getNotificationRespondAttributes: widget.getNotificationRespondAttributes, + ), + ); }, child: Row( - children: [ - CircularAvatar( - url: actionHistory.eMPLOYEEIMAGE ?? "", - height: 30, - width: 30, - isImageBase64: true, - ), + children: [ + CircularAvatar(url: actionHistory.eMPLOYEEIMAGE ?? "", height: 30, width: 30, isImageBase64: true), 9.width, (actionHistory.nAME ?? "").toText12().expanded, IconButton( @@ -444,12 +458,8 @@ class _DelegateSheetState extends State { isFav: true, ); }, - icon: Icon( - Icons.star, - size: 16, - color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor, - ), - ) + icon: Icon(Icons.star, size: 16, color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor), + ), ], ), ); @@ -459,25 +469,18 @@ class _DelegateSheetState extends State { return InkWell( onTap: () { Navigator.pop(context); - showMyBottomSheet(context, - callBackFunc: widget.callBackFunc, - child: SelectedItgItemSheet( - "Comment", - apiMode: widget.apiMode, - wfHistory: wfHistory, - // notificationID: widget.notificationID, - )); - }, - child: Row( - children: [ - CircularAvatar( - height: 30, - width: 30, + showMyBottomSheet( + context, + callBackFunc: widget.callBackFunc, + child: SelectedItgItemSheet( + "Comment", + apiMode: widget.apiMode, + wfHistory: wfHistory, + // notificationID: widget.notificationID, ), - 9.width, - (wfHistory.name ?? "").toText12().expanded, - ], - ), + ); + }, + child: Row(children: [CircularAvatar(height: 30, width: 30), 9.width, (wfHistory.name ?? "").toText12().expanded]), ); } @@ -485,47 +488,31 @@ class _DelegateSheetState extends State { return InkWell( onTap: () { Navigator.pop(context); - showMyBottomSheet(context, - callBackFunc: widget.callBackFunc, - child: SelectedItemSheet( - "Comment", - apiMode: widget.apiMode, - favoriteReplacements: actionHistory, - notificationID: widget.notificationID, - isITGRequest: widget.wFHistory != null, - getNotificationRespondAttributes: widget.getNotificationRespondAttributes, - )); + showMyBottomSheet( + context, + callBackFunc: widget.callBackFunc, + child: SelectedItemSheet( + "Comment", + apiMode: widget.apiMode, + favoriteReplacements: actionHistory, + notificationID: widget.notificationID, + isITGRequest: widget.wFHistory != null, + getNotificationRespondAttributes: widget.getNotificationRespondAttributes, + ), + ); }, child: Row( - children: [ - actionHistory.employeeImage != "" - ? CircularAvatar( - url: actionHistory.employeeImage, - height: 40, - width: 40, - isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false, - ) + children: [ + actionHistory.employeeImage != "" && actionHistory.employeeImage != null + ? CircularAvatar(url: actionHistory.employeeImage, height: 40, width: 40, isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false) : isImageLoaded - ? CircularAvatar( - height: 40, - width: 40, - isImageBase64: false, - ) - : ClipRRect( - borderRadius: const BorderRadius.all( - Radius.circular(50), - ), - child: Image.network( - "https://play-lh.googleusercontent.com/NPo88ojmhah4HDiposucJmfQIop4z4xc8kqJK9ITO9o-yCab2zxIp7PPB_XPj2iUojo", - fit: BoxFit.cover, - height: 40, - width: 40, - ).toShimmer(), - ), + ? CircularAvatar(height: 40, width: 40, isImageBase64: false) + : ClipRRect( + borderRadius: const BorderRadius.all(Radius.circular(50)), + child: Image.network("https://play-lh.googleusercontent.com/NPo88ojmhah4HDiposucJmfQIop4z4xc8kqJK9ITO9o-yCab2zxIp7PPB_XPj2iUojo", fit: BoxFit.cover, height: 40, width: 40).toShimmer(), + ), 16.width, - Expanded( - child: (actionHistory.employeeDisplayName ?? "").toText12(), - ), + Expanded(child: (actionHistory.employeeDisplayName ?? "").toText12()), IconButton( onPressed: () { fetchChangeFav( @@ -537,12 +524,8 @@ class _DelegateSheetState extends State { isNeedToRefresh: true, ); }, - icon: Icon( - Icons.star, - size: 16, - color: MyColors.yellowColor, - ), - ) + icon: const Icon(Icons.star, size: 16, color: MyColors.yellowColor), + ), ], ), ); @@ -552,29 +535,24 @@ class _DelegateSheetState extends State { return InkWell( onTap: () { Navigator.pop(context); - showMyBottomSheet(context, - callBackFunc: widget.callBackFunc, - child: SelectedItemSheet( - LocaleKeys.comments.tr(), - apiMode: widget.apiMode, - replacementList: actionHistory, - notificationID: widget.notificationID, - isITGRequest: widget.wFHistory != null, - getNotificationRespondAttributes: widget.getNotificationRespondAttributes, - )); + showMyBottomSheet( + context, + callBackFunc: widget.callBackFunc, + child: SelectedItemSheet( + LocaleKeys.comments.tr(), + apiMode: widget.apiMode, + replacementList: actionHistory, + notificationID: widget.notificationID, + isITGRequest: widget.wFHistory != null, + getNotificationRespondAttributes: widget.getNotificationRespondAttributes, + ), + ); }, child: Row( - children: [ - CircularAvatar( - url: actionHistory.employeeImage, - height: 30, - width: 30, - isImageBase64: actionHistory.employeeImage != null ? true : false, - ), + children: [ + CircularAvatar(url: actionHistory.employeeImage, height: 30, width: 30, isImageBase64: actionHistory.employeeImage != null ? true : false), 16.width, - Expanded( - child: (actionHistory.employeeDisplayName ?? "").toText12(), - ), + Expanded(child: (actionHistory.employeeDisplayName ?? "").toText12()), IconButton( onPressed: () { actionHistory.isFavorite = !(actionHistory.isFavorite ?? false); @@ -587,12 +565,8 @@ class _DelegateSheetState extends State { isNeedToRefresh: false, ); }, - icon: Icon( - Icons.star, - size: 16, - color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor, - ), - ) + icon: Icon(Icons.star, size: 16, color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor), + ), ], ), );