Merge pull request #393 from OMZigak/fix/#392-promise-qa

[fix] 최종 QA 반영
OMZigak · Sep 22, 2024 · 7486c03 · 7486c03
2 parents 1974e03 + f61efb4
commit 7486c03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git 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
     }
 

diff --git 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

diff --git 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)
     }