From f315736c5d417b23a060cba7b48a6b8d026af900 Mon Sep 17 00:00:00 2001 From: KuKaH Date: Fri, 10 Apr 2026 06:04:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=EC=A0=90=EC=88=98=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EC=A0=9C=EA=B1=B0=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MatchResultCardView.swift | 55 ++----------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/SMASHING/Presentation/MatchResultCreate/MatchResultComponents/MatchResultCardView.swift b/SMASHING/Presentation/MatchResultCreate/MatchResultComponents/MatchResultCardView.swift index a9ec031..2afac54 100644 --- a/SMASHING/Presentation/MatchResultCreate/MatchResultComponents/MatchResultCardView.swift +++ b/SMASHING/Presentation/MatchResultCreate/MatchResultComponents/MatchResultCardView.swift @@ -12,8 +12,6 @@ import Then import SnapKit final class MatchResultCardView: BaseUIView { - private var currentMyScore: Int = 0 - private var currentRivalScore: Int = 0 private let containerView = UIView().then { $0.backgroundColor = .Background.surface @@ -41,23 +39,9 @@ final class MatchResultCardView: BaseUIView { $0.textAlignment = .center } - private let myScore = UILabel().then { - $0.text = "0" - $0.setPretendard(.headerHeroB) - $0.textColor = .Text.secondary - $0.textAlignment = .center - } - - private let scoreSemicolon = UILabel().then { - $0.text = ":" - $0.setPretendard(.headerHeroB) - $0.textColor = .Text.secondary - $0.textAlignment = .center - } - - private let rivalScore = UILabel().then { - $0.text = "0" - $0.setPretendard(.headerHeroB) + private let vsLabel = UILabel().then { + $0.text = "vs" + $0.setPretendard(.headerHeroSb) $0.textColor = .Text.secondary $0.textAlignment = .center } @@ -90,9 +74,7 @@ final class MatchResultCardView: BaseUIView { myNickName, rivalImage, rivalNickName, - myScore, - scoreSemicolon, - rivalScore) + vsLabel) addSubviews(containerView) } @@ -120,21 +102,11 @@ final class MatchResultCardView: BaseUIView { $0.centerX.equalTo(myImage) } - myScore.snp.makeConstraints { - $0.trailing.equalTo(scoreSemicolon.snp.leading).offset(-6) - $0.centerY.equalTo(scoreSemicolon) - } - - scoreSemicolon.snp.makeConstraints { + vsLabel.snp.makeConstraints { $0.centerX.equalToSuperview() $0.centerY.equalTo(myImage) } - rivalScore.snp.makeConstraints { - $0.leading.equalTo(scoreSemicolon.snp.trailing).offset(6) - $0.centerY.equalTo(scoreSemicolon) - } - rightCrownImageView.snp.makeConstraints { $0.bottom.equalTo(rivalImage.snp.top).offset(2) $0.centerX.equalTo(rivalImage) @@ -155,29 +127,12 @@ final class MatchResultCardView: BaseUIView { // MARK: UI Methods - // 텍스트 필드에서 받은 스코어로 CardView의 스코어 갱신하기 - func updateScore(myScore: String, rivalScore: String) { - self.currentMyScore = Int(myScore) ?? 0 - self.currentRivalScore = Int(rivalScore) ?? 0 - - self.myScore.text = myScore - self.rivalScore.text = rivalScore - } - // 드롭다운에서 선택한 승자에 왕관 씌우기 func updateWinnerCrown(isMyWin: Bool) { leftCrownImageView.isHidden = !isMyWin rightCrownImageView.isHidden = isMyWin } - func getMyScore() -> Int { - return currentMyScore - } - - func getRivalScore() -> Int { - return currentRivalScore - } - func configure(myName: String, myImage: UIImage?, rivalName: String, rivalImage: UIImage?) { myNickName.text = myName rivalNickName.text = rivalName From cd0c6957b90a29f1166f19eabca9e45f9a2eab14 Mon Sep 17 00:00:00 2001 From: KuKaH Date: Fri, 10 Apr 2026 06:56:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=ED=99=88=20=EC=A7=80=EC=97=AD?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=8A=A4=ED=8F=AC=EC=B8=A0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EC=A0=95=EB=B3=B4=20=EB=B0=94?= =?UTF-8?q?=EB=A1=9C=20=EB=B0=98=EC=98=81=EB=90=98=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SMASHING/Presentation/Home/HomeViewController.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SMASHING/Presentation/Home/HomeViewController.swift b/SMASHING/Presentation/Home/HomeViewController.swift index 47ad2db..1bd8967 100644 --- a/SMASHING/Presentation/Home/HomeViewController.swift +++ b/SMASHING/Presentation/Home/HomeViewController.swift @@ -28,6 +28,7 @@ final class HomeViewController: BaseViewController { private var tooltipView: TooltipView? private var tooltipDismissTap: UITapGestureRecognizer? + private var shouldRefreshAfterSportChange = false override func loadView() { view = rootView @@ -255,6 +256,10 @@ final class HomeViewController: BaseViewController { self.latestMyProfile = response self.dropDownView?.configure(profile: response, myRegion: self.myRegion) self.homeView.reloadSections(IndexSet(integer: HomeViewLayout.navigationBar.rawValue)) + if self.shouldRefreshAfterSportChange { + self.shouldRefreshAfterSportChange = false + self.input.send(.viewWillAppear) + } } .store(in: &cancellables) } @@ -422,7 +427,9 @@ final class HomeViewController: BaseViewController { UserDefaults.standard.set(address, forKey: UserDefaultKey.region) self.userProfileService.updateRegion(region: address) .receive(on: DispatchQueue.main) - .sink(receiveCompletion: { _ in }, receiveValue: { _ in }) + .sink(receiveCompletion: { _ in }, receiveValue: { [weak self] _ in + self?.input.send(.viewWillAppear) + }) .store(in: &self.cancellables) } NavigationManager.shared.push(addressVC, hidesBottomBar: true) @@ -629,6 +636,7 @@ extension HomeViewController { dd.onSportsCellTapped = { [weak self] sport in guard let self else { return } if let sport { + self.shouldRefreshAfterSportChange = true self.myProfileInput.send(.sportsCellTapped(sport)) } else { self.input.send(.addSportsTapped)