Skip to content

Refactor/#91 다른 날짜 선택 시 시나리오, 텍스트필드 표출 수정 #98

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

Merged
dev-domo merged 5 commits into from
Dec 30, 2025
Merged

Refactor/#91 다른 날짜 선택 시 시나리오, 텍스트필드 표출 수정 #98

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6a0155
refactor: #91 비슷한 기능을 하는 메서드 합치기
dev-domo Dec 30, 2025
71f16ac
refactor: #91 메서드명 수정
dev-domo Dec 30, 2025
93e4bbd
refactor: #91 시나리오 가져오기, 날씨 업데이트를 viewDidLoad에서 수행
dev-domo Dec 30, 2025
a7b3d86
refactor: #91 홈 말풍선 뷰 양쪽 마진 조정
dev-domo Dec 30, 2025
e2843a0
refactor: #91 사용자가 선택한 날짜를 기준으로 시나리오를 가져오도록 수정
dev-domo Dec 30, 2025
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
5 changes: 2 additions & 3 deletions BeforeGoing/Presentation/Feature/Home/View/HomeHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,11 @@ final class HomeHeaderView: BaseView {
}
bubbleView.snp.makeConstraints {
$0.top.equalTo(dateStackView.snp.bottom).offset(16.adjustedH)
$0.leading.greaterThanOrEqualToSuperview().inset(20.adjustedW)
$0.trailing.lessThanOrEqualToSuperview().inset(20.adjustedW)
$0.leading.greaterThanOrEqualToSuperview().inset(5.adjustedW)
$0.trailing.lessThanOrEqualToSuperview().inset(5.adjustedW)
$0.centerX.equalToSuperview()
$0.height.equalTo(62.adjustedH)
}

wordLabel.snp.makeConstraints {
$0.edges.equalToSuperview().inset(
UIEdgeInsets(top: 8, left: 25, bottom: 8, right: 25)
Expand Down
13 changes: 6 additions & 7 deletions BeforeGoing/Presentation/Feature/Home/View/UserScenarioModalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,12 @@ extension UserScenarioModalView {
taskTextField.text = completeText
}

func updatePlaceHolder(text: String) {
taskTextField.placeholder = text
}

func updateTaskField(isEnable: Bool) {
taskTextField.currentType = isEnable ? .enableAddField : .disableAddField
taskTextField.isEnabled = isEnable
func updateTaskField(isEnabled: Bool, text: String) {
taskTextField.do {
$0.currentType = isEnabled ? .enableAddField : .disableAddField
$0.isEnabled = isEnabled
$0.placeholder = text
}
}

func enableAddTaskButton() {
Expand Down
37 changes: 20 additions & 17 deletions BeforeGoing/Presentation/Feature/Home/ViewController/HomeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ final class HomeViewController: BaseViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

let currentDate = DateUtil.getCurrentDate()
let currentDateString = DateUtil.getCurrentDate(format: "yyyy-MM-dd")

getScenarios(currentDate: currentDateString)
checkLoactionAuthorization()
updateWeatherInformation(date: currentDate)
}

override func viewDidLoad() {
super.viewDidLoad()

let currentDate = DateUtil.getCurrentDate()
let currentDateString = DateUtil.getCurrentDate(format: "yyyy-MM-dd")

setLocationManager()
requestDate()
getScenarios(currentDate: currentDateString)
updateWeatherInformation(date: currentDate)
}

override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
Expand All @@ -62,6 +62,7 @@ final class HomeViewController: BaseViewController {

override func setAction() {
setGesture()

rootView.headerView.viewCalendarButton.addTarget(
self,
action: #selector(viewCalendarButtonDidTap),
Expand Down Expand Up @@ -115,8 +116,10 @@ final class HomeViewController: BaseViewController {
}
self.homeDate = result.date
rootView.headerView.updateDateUI(date: result.date)
rootView.modalView.updatePlaceHolder(text: "\(monthAndDay)의 미션을 추가해요")
rootView.modalView.updateTaskField(isEnable: true)
rootView.modalView.updateTaskField(
isEnabled: true,
text: "\(monthAndDay)의 미션을 추가해요"
)
} catch (let error) {
self.handleError(error)
BeforeGoingLogger.error(error)
Expand Down Expand Up @@ -424,7 +427,7 @@ extension HomeViewController: ToastPresentable {
) {
self.homeDate = dateString
updateHeaderDate(date: dateString)
updatePlaceHolderByDate(
updateTaskByDate(
date: date,
currentDate: currentDate,
monthAndDay: monthAndDay
Expand Down Expand Up @@ -457,22 +460,22 @@ extension HomeViewController: ToastPresentable {
self.rootView.headerView.updateDateUI(date: date)
}

private func updatePlaceHolderByDate(
private func updateTaskByDate(
date: Date,
currentDate: Date,
monthAndDay: String
) {
if date >= currentDate {
self.rootView.modalView.do {
$0.updatePlaceHolder(text: "\(monthAndDay)의 미션을 추가해요")
$0.updateTaskField(isEnable: true)
}
self.rootView.modalView.updateTaskField(
isEnabled: true,
text: "\(monthAndDay)의 미션을 추가해요"
)
return
}
self.rootView.modalView.do {
$0.updatePlaceHolder(text: "지난 날짜의 리스트는 추가할 수 없어요")
$0.updateTaskField(isEnable: false)
}
self.rootView.modalView.updateTaskField(
isEnabled: false,
text: "지난 날짜의 리스트는 추가할 수 없어요"
)
}

private func moveScenarioTab() -> BottomNavigationViewController? {
Expand Down
Loading