From 433549554d904e293c49b9ae0618bbf08d652aa6 Mon Sep 17 00:00:00 2001 From: JinUng41 Date: Mon, 9 Sep 2024 12:52:30 +0900 Subject: [PATCH] =?UTF-8?q?chore/#373=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C,=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD,?= =?UTF-8?q?=20=EC=84=B8=EA=B7=B8=EB=A8=BC=ED=8A=B8=20=EC=BB=A8=ED=8A=B8?= =?UTF-8?q?=EB=A1=A4=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift | 4 +++- .../MeetingInfo/ViewModel/MeetingInfoViewModel.swift | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift b/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift index e802e016..480ae715 100644 --- a/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift +++ b/KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift @@ -74,7 +74,9 @@ final class MeetingInfoView: BaseView { $0.setText("남은 약속을 확인해보세요", style: .body01, color: .gray7) } - private let segmentedControl = UnderlineSegmentedControl(items: ["내가 속한 약속", "모든 약속"]) + private let segmentedControl = UnderlineSegmentedControl(items: ["내가 속한 약속", "모든 약속"]).then { + $0.selectedSegmentIndex = 0 + } private let emptyDescriptionView = UIView(backgroundColor: .white).then { $0.layer.cornerRadius = 8 diff --git a/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift b/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift index 2de15d98..75a5b942 100644 --- a/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift +++ b/KkuMulKum/Source/MeetingInfo/ViewModel/MeetingInfoViewModel.swift @@ -15,13 +15,12 @@ final class MeetingInfoViewModel { var meetingName: String { infoRelay.value?.name ?? "" } var meetingInvitationCode: String? { infoRelay.value?.invitationCode } - var meetingPromises: [MeetingPromise] { meetingPromisesModelRelay.value?.promises ?? [] } private let service: MeetingInfoServiceProtocol private let infoRelay = BehaviorRelay(value: nil) private let meetingMemberModelRelay = BehaviorRelay(value: nil) private let meetingPromisesModelRelay = BehaviorRelay(value: nil) - private let partipatedPromisesModelRelay = BehaviorRelay(value: nil) + private let participatedPromisesModelRelay = BehaviorRelay(value: nil) init(meetingID: Int, service: MeetingInfoServiceProtocol) { self.meetingID = meetingID @@ -109,7 +108,7 @@ extension MeetingInfoViewModel: ViewModelType { return Observable.just([]) } - let source = index == 0 ? self.partipatedPromisesModelRelay : self.meetingPromisesModelRelay + let source = index == 0 ? self.participatedPromisesModelRelay : self.meetingPromisesModelRelay return source .compactMap { $0?.promises } .map { self.convertToMeetingInfoPromiseModels(from: $0) } @@ -135,7 +134,7 @@ extension MeetingInfoViewModel: ViewModelType { } .map { [weak self] selectedIndex, selectedItem in let promises = selectedIndex == 0 - ? self?.partipatedPromisesModelRelay.value?.promises + ? self?.participatedPromisesModelRelay.value?.promises : self?.meetingPromisesModelRelay.value?.promises return promises?[selectedItem].promiseID