Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] 최종 QA 반영 #393

Merged
merged 3 commits into from
Sep 22, 2024
Merged

[fix] 최종 QA 반영 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
700f1e7
fix/#388 약속 시간 12시간 형식으로 변경
youz2me Sep 20, 2024
9840949
feat/#388 꾸물거릴 시간이 없어요 팝업 도착 완료 시 숨겨지도록 구현
youz2me Sep 20, 2024
f61efb4
fix/#388 준비 현황 플로우 텍스트 수정
youz2me Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions KkuMulKum/Source/Promise/ReadyStatus/View/ReadyStatusProgressView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}

Expand All @@ -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
}

Expand Down
9 changes: 9 additions & 0 deletions KkuMulKum/Source/Promise/ReadyStatus/ViewController/ReadyStatusViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion KkuMulKum/Source/Promise/ViewModel/PromiseViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down