From 700f1e796fed27ac137b47b606a6eac32bbe6297 Mon Sep 17 00:00:00 2001 From: youz2me Date: Sat, 21 Sep 2024 04:07:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix/#388=20=EC=95=BD=EC=86=8D=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=2012=EC=8B=9C=EA=B0=84=20=ED=98=95=EC=8B=9D=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KkuMulKum/Source/Promise/ViewModel/PromiseViewModel.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/KkuMulKum/Source/Promise/ViewModel/PromiseViewModel.swift b/KkuMulKum/Source/Promise/ViewModel/PromiseViewModel.swift index 06243ea..3f241a9 100644 --- a/KkuMulKum/Source/Promise/ViewModel/PromiseViewModel.swift +++ b/KkuMulKum/Source/Promise/ViewModel/PromiseViewModel.swift @@ -157,7 +157,10 @@ extension PromiseViewModel { guard let promiseDate = dateFormatter.date(from: promiseTime) else { return promiseTime } let timeFormatter = DateFormatter() - timeFormatter.dateFormat = "M월 d일 a H:mm" + timeFormatter.dateFormat = "M월 d일 a h:mm" + timeFormatter.locale = Locale(identifier: "ko_KR") + timeFormatter.amSymbol = "AM" + timeFormatter.pmSymbol = "PM" return timeFormatter.string(from: promiseDate) } From 9840949a458b57ffa7c9df22dd5865487f65e4eb Mon Sep 17 00:00:00 2001 From: youz2me Date: Sat, 21 Sep 2024 04:12:09 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat/#388=20=EA=BE=B8=EB=AC=BC=EA=B1=B0?= =?UTF-8?q?=EB=A6=B4=20=EC=8B=9C=EA=B0=84=EC=9D=B4=20=EC=97=86=EC=96=B4?= =?UTF-8?q?=EC=9A=94=20=ED=8C=9D=EC=97=85=20=EB=8F=84=EC=B0=A9=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20=EC=88=A8=EA=B2=A8=EC=A7=80=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewController/ReadyStatusViewController.swift | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift index 61c2e4f..4603913 100644 --- a/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift +++ b/KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift @@ -204,6 +204,15 @@ extension ReadyStatusViewController { $0.statusProgressView.setProgress(1, animated: false) } } + + owner.rootView.popUpImageView.do { + switch state { + case .none, .ready, .move: + $0.isHidden = false + case .done: + $0.isHidden = true + } + } } viewModel.requestReadyTime.bindOnMain(with: self) { owner, time in From f61efb40a3cdb56f054b39e9e4bd35efdc3ccc3e Mon Sep 17 00:00:00 2001 From: youz2me Date: Sat, 21 Sep 2024 04:13:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix/#388=20=EC=A4=80=EB=B9=84=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=ED=94=8C=EB=A1=9C=EC=9A=B0=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=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 --- .../Promise/ReadyStatus/View/ReadyStatusProgressView.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift b/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift index 31c04b1..67c2fcf 100644 --- a/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift +++ b/KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift @@ -36,7 +36,7 @@ class ReadyStatusProgressView: BaseView { } let readyStartTitleLabel: UILabel = UILabel().then { - $0.setText("준비를 시작 시 눌러주세요", style: .label02, color: .gray5) + $0.setText("준비 시작 시 눌러주세요", style: .label02, color: .gray5) } let moveStartTimeLabel: UILabel = UILabel().then { @@ -59,7 +59,7 @@ class ReadyStatusProgressView: BaseView { } let moveStartTitleLabel: UILabel = UILabel().then { - $0.setText("이동을 시작 시 눌러주세요", style: .label02, color: .gray5) + $0.setText("이동 시작 시 눌러주세요", style: .label02, color: .gray5) $0.isHidden = true } @@ -83,7 +83,7 @@ class ReadyStatusProgressView: BaseView { } let arrivalTitleLabel: UILabel = UILabel().then { - $0.setText("도착 시작 시 눌러주세요", style: .label02, color: .gray5) + $0.setText("도착 완료 시 눌러주세요", style: .label02, color: .gray5) $0.isHidden = true }