diff --git a/KkuMulKum/Resource/ObservablePattern/ObservablePattern.swift b/KkuMulKum/Resource/ObservablePattern/ObservablePattern.swift index a682989..05cbed3 100644 --- a/KkuMulKum/Resource/ObservablePattern/ObservablePattern.swift +++ b/KkuMulKum/Resource/ObservablePattern/ObservablePattern.swift @@ -30,8 +30,6 @@ class ObservablePattern { func bind(_ listener: @escaping (T) -> Void) { listeners.append(listener) - - listener(value) } func bind(with object: Object, _ listener: @escaping (Object, T) -> Void) { @@ -39,8 +37,6 @@ class ObservablePattern { guard let object else { return } listener(object, value) } - - listener(object, value) } func bindOnMain(_ listener: @escaping (T) -> Void) { @@ -49,10 +45,6 @@ class ObservablePattern { listener(value) } } - - DispatchQueue.main.async { - listener(self.value) - } } func bindOnMain(with object: Object, _ listener: @escaping (Object, T) -> Void) { @@ -62,9 +54,5 @@ class ObservablePattern { listener(object, value) } } - - DispatchQueue.main.async { - listener(object, self.value) - } } } diff --git a/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift b/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift index 5e436ba..31c04b1 100644 --- a/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift +++ b/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift @@ -171,7 +171,7 @@ class ReadyStatusProgressView: BaseView { } arrivalCheckImageView.snp.makeConstraints { - $0.centerX.equalTo(arrivalTimeLabel) + $0.trailing.equalToSuperview().inset(53.5) $0.centerY.equalTo(readyStartCheckImageView) $0.height.equalTo(Screen.height(16)) $0.width.equalTo(arrivalCheckImageView.snp.height) diff --git a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift index 9799362..747d556 100644 --- a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift +++ b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift @@ -120,7 +120,14 @@ extension ReadyStatusViewController { } viewModel.myReadyInfo.bindOnMain(with: self) { owner, status in + let preparationStartAt = status?.preparationStartAt ?? " " + let departureAt = status?.departureAt ?? " " + let arrivalAt = status?.arrivalAt ?? " " + owner.rootView.do { + $0.myReadyStatusProgressView.readyStartTimeLabel.text = preparationStartAt + $0.myReadyStatusProgressView.moveStartTimeLabel.text = departureAt + $0.myReadyStatusProgressView.arrivalTimeLabel.text = arrivalAt $0.enterReadyButtonView.isHidden = owner.viewModel.isReadyInfoEntered() $0.readyPlanInfoView.isHidden = !$0.enterReadyButtonView.isHidden } @@ -181,9 +188,9 @@ extension ReadyStatusViewController { $0.readyStartButton.isEnabled = false $0.moveStartButton.isEnabled = false $0.arrivalButton.isEnabled = false - $0.readyStartTitleLabel.isHidden = false - $0.moveStartTitleLabel.isHidden = false - $0.arrivalTitleLabel.isHidden = false + $0.readyStartTitleLabel.isHidden = true + $0.moveStartTitleLabel.isHidden = true + $0.arrivalTitleLabel.isHidden = true $0.readyStartTimeLabel.isHidden = false $0.moveStartTimeLabel.isHidden = false $0.arrivalTimeLabel.isHidden = false