From a9e8dcf84479db193b09382388c9585564394b7d Mon Sep 17 00:00:00 2001 From: Gongchaeyeon Date: Thu, 23 May 2024 22:27:02 +0900 Subject: [PATCH] =?UTF-8?q?[remove]=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0=20#306?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/lib/widgets/choose_purpose.dart | 3 +- frontend/lib/widgets/user_item.dart | 37 ++++++------------------ 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/frontend/lib/widgets/choose_purpose.dart b/frontend/lib/widgets/choose_purpose.dart index 7d81fefd8c..910e955fa5 100644 --- a/frontend/lib/widgets/choose_purpose.dart +++ b/frontend/lib/widgets/choose_purpose.dart @@ -104,8 +104,7 @@ class _ChoosePurposeState extends State { return; } - Map response = - await matchRequest(senderId, receiverId, _selectedIndex!); + matchRequest(senderId, receiverId, _selectedIndex!); Navigator.of(context).pop(); Navigator.of(context).pop(); selectedIndexProvider.selectedIndex = 1; diff --git a/frontend/lib/widgets/user_item.dart b/frontend/lib/widgets/user_item.dart index 629c748316..02dabde5b9 100644 --- a/frontend/lib/widgets/user_item.dart +++ b/frontend/lib/widgets/user_item.dart @@ -88,12 +88,12 @@ class UserItem extends StatelessWidget { borderRadius: const BorderRadius.all(Radius.circular(10))), child: Row( children: [ - (company == '') - ? const ProfileImgMedium( + (company == '무소속') + ? const ProfileImgSmall( isLocal: true, logoUrl: "assets/coffee_bean.png", ) - : ProfileImgMedium( + : ProfileImgSmall( isLocal: true, logoUrl: "assets/$company-logo.png", ), @@ -104,10 +104,12 @@ class UserItem extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - nickname, - overflow: TextOverflow.ellipsis, - ), + Text(nickname, + overflow: TextOverflow.ellipsis, + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + )), Text( "$company / $position", overflow: TextOverflow.ellipsis, @@ -252,7 +254,6 @@ class ReceivedReqDialog extends StatelessWidget { context, MaterialPageRoute( builder: (context) => ChatScreen( - // chatroomId: response["data"]["chatroomId"], matchId: matchId, nickname: nickname, logoUrl: logoUrl, @@ -260,28 +261,8 @@ class ReceivedReqDialog extends StatelessWidget { ), ), ); - // 오프라인으로 전환 autoOfflineService.autoOffline(); - - // 커피챗 진행중 여부 true로, 매칭정보 가져오기 - Map userDetail = await getUserDetail(); - getMatchingInfo(userDetail["data"]["userId"]).then((value) { - matchingInfo.setIsMatching(value["isMatching"]); - - // 커피챗 진행중이면 상대방 정보도 가져오기 - if (value["isMatching"]) { - matchingInfo.setMatching( - matchId: value["matchId"], - myId: value["myId"], - myNickname: value["myNickname"], - myCompany: value["myCompany"], - partnerId: value["partnerId"], - partnerCompany: value["partnerCompany"], - partnerNickname: value["partnerNickname"], - ); - } - }); }, handleSecondClick: () async { onReject?.call(); // onReject 함수 호출