From 0266f16bcb1d80041cc2fcb85e231a6949432196 Mon Sep 17 00:00:00 2001 From: JinUng41 Date: Tue, 6 Aug 2024 09:39:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix/#280=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20=ED=9D=90=EB=A0=A4?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingInfo/Cell/MeetingMemberCell.swift | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/KkuMulKum/Source/MeetingInfo/Cell/MeetingMemberCell.swift b/KkuMulKum/Source/MeetingInfo/Cell/MeetingMemberCell.swift index 5ac2480b..74850605 100644 --- a/KkuMulKum/Source/MeetingInfo/Cell/MeetingMemberCell.swift +++ b/KkuMulKum/Source/MeetingInfo/Cell/MeetingMemberCell.swift @@ -17,7 +17,6 @@ protocol MeetingMemberCellDelegate: AnyObject { final class MeetingMemberCell: BaseCollectionViewCell { private let profileImageButton = UIButton().then { - $0.backgroundColor = .gray2 $0.layer.cornerRadius = Screen.height(64) / 2 $0.isEnabled = false $0.clipsToBounds = true @@ -35,7 +34,7 @@ final class MeetingMemberCell: BaseCollectionViewCell { profileImageButton.do { $0.imageView?.image = nil - $0.backgroundColor = .gray2 + $0.backgroundColor = .clear $0.isEnabled = false } @@ -100,21 +99,15 @@ private extension MeetingMemberCell { func configureForProfile(with member: Member) { let name = member.name - let imageURL = member.profileImageURL + let imageURL = member.profileImageURL.flatMap { URL(string: $0) } nameLabel.setText(name ?? " ", style: .caption02, color: .gray6) - profileImageButton.setImage( - .imgProfile.withRenderingMode(.alwaysOriginal), - for: .normal - ) - setProfileImage(urlString: imageURL ?? "") - } - - func setProfileImage(urlString: String) { - guard let url = URL(string: urlString) else { return } - - profileImageButton.kf.setImage(with: url, for: .normal) + profileImageButton.kf.setImage( + with: imageURL, + for: .disabled, + placeholder: .imgProfile.withRenderingMode(.alwaysOriginal) + ) } @objc From a04638dd5413ea7a14cc1c19ec95bed95a0148fc Mon Sep 17 00:00:00 2001 From: JinUng41 Date: Tue, 6 Aug 2024 09:43:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor/#280=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EC=BD=94=EB=93=9C=20=EA=B0=84=EA=B2=B0?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift b/KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift index bf2ccc1c..80bddc9a 100644 --- a/KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift +++ b/KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift @@ -63,8 +63,8 @@ extension SelectMemberCell { self.member = member nameLabel.setText(member.name ?? " ", style: .body06, color: .gray6) - profileImageView.image = .imgProfile.withRenderingMode(.alwaysOriginal) - guard let imageURL = URL(string: member.profileImageURL ?? "") else { return } - profileImageView.kf.setImage(with: imageURL) + + let imageURL = member.profileImageURL.flatMap { URL(string: $0) } + profileImageView.kf.setImage(with: imageURL, placeholder: UIImage.imgProfile.withRenderingMode(.alwaysOriginal)) } } From 3c801d8dd15b4e38ca6f88c971aaaed182c6b875 Mon Sep 17 00:00:00 2001 From: JinUng41 Date: Tue, 6 Aug 2024 09:43:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore/#280=20=EA=B0=9C=ED=96=89=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EB=B9=88=20=EC=A4=84?= =?UTF-8?q?=20=EC=82=BD=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KkuMulKum/Source/AddPromise/Cell/PlaceListCell.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/KkuMulKum/Source/AddPromise/Cell/PlaceListCell.swift b/KkuMulKum/Source/AddPromise/Cell/PlaceListCell.swift index 083c54ac..d8dfce00 100644 --- a/KkuMulKum/Source/AddPromise/Cell/PlaceListCell.swift +++ b/KkuMulKum/Source/AddPromise/Cell/PlaceListCell.swift @@ -117,12 +117,14 @@ extension PlaceListCell { private extension PlaceListCell { func configureCell(title: String, roadAddress: String?, address: String?) { titleLabel.setText(title, style: .body05, color: .gray8) + roadAddressNameLabel.setText( roadAddress ?? " ", style: .caption02, color: .gray6, isSingleLine: true ) + addressNameLabel.setText( address ?? " ", style: .caption02,