From 8ff8bd2629777c3113c7fa1b65a8376156a73514 Mon Sep 17 00:00:00 2001 From: youz2me Date: Fri, 20 Sep 2024 00:57:02 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix/#388=20Observable=20Pattern=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 --- .../ObservablePattern/ObservablePattern.swift | 12 ------------ 1 file changed, 12 deletions(-) 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) - } } } From 3b0adf5fae07ac7c249e93836d74ca0d6087ba2e Mon Sep 17 00:00:00 2001 From: youz2me Date: Fri, 20 Sep 2024 15:32:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat/#388=20=EC=A4=80=EB=B9=84=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=B0=94=EC=9D=B8=EB=94=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/ReadyStatusProgressView.swift | 2 +- .../ReadyStatusViewController.swift | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) 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..e33ed7d 100644 --- a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift +++ b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift @@ -120,10 +120,19 @@ 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 } + + } viewModel.myReadyStatus.bindOnMain(with: self) { owner, state in @@ -181,9 +190,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 From 081b77cd2e0b3210ce10b91b2cf87912dd0959ae Mon Sep 17 00:00:00 2001 From: youz2me Date: Fri, 20 Sep 2024 15:33:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix/#388=20=EA=B0=9C=ED=96=89=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadyStatus/ViewController/ReadyStatusViewController.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift index e33ed7d..747d556 100644 --- a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift +++ b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift @@ -131,8 +131,6 @@ extension ReadyStatusViewController { $0.enterReadyButtonView.isHidden = owner.viewModel.isReadyInfoEntered() $0.readyPlanInfoView.isHidden = !$0.enterReadyButtonView.isHidden } - - } viewModel.myReadyStatus.bindOnMain(with: self) { owner, state in