Skip to content

Commit

Permalink
chore/#373 불필요한 프로퍼티 삭제, 네이밍 변경, 세그먼트 컨트롤 설정
Browse files Browse the repository at this point in the history
  • Loading branch information
JinUng41 committed Sep 9, 2024
1 parent d057715 commit 4335495
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion KkuMulKum/Source/MeetingInfo/View/MeetingInfoView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<MeetingInfoModel?>(value: nil)
private let meetingMemberModelRelay = BehaviorRelay<MeetingMembersModel?>(value: nil)
private let meetingPromisesModelRelay = BehaviorRelay<MeetingPromisesModel?>(value: nil)
private let partipatedPromisesModelRelay = BehaviorRelay<MeetingPromisesModel?>(value: nil)
private let participatedPromisesModelRelay = BehaviorRelay<MeetingPromisesModel?>(value: nil)

init(meetingID: Int, service: MeetingInfoServiceProtocol) {
self.meetingID = meetingID
Expand Down Expand Up @@ -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) }
Expand All @@ -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
Expand Down

0 comments on commit 4335495

Please sign in to comment.