Skip to content

[#118] iOS 17이하일 때 HomeView에서 시트 -> 얼럿 사이의 상태 변경에 따른 문제를 해결한다 #121

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
opficdev merged 5 commits into from
Feb 24, 2026
Merged

[#118] iOS 17이하일 때 HomeView에서 시트 -> 얼럿 사이의 상태 변경에 따른 문제를 해결한다 #121

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
f1e9613
refactor: todoKindPicker -> contentPicker
opficdev Feb 24, 2026
56ae35f
style: is 접두사 제거
opficdev Feb 24, 2026
0c06967
fix: iOS 17 이하에서 시트와 얼럿 간 플래그 상태 변경 사이에 딜레이 추가하기
opficdev Feb 24, 2026
b671bb3
fix: Publishing 오류 해결
opficdev Feb 24, 2026
62ae318
refactor: gemini code assist 반영
opficdev Feb 24, 2026
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
50 changes: 32 additions & 18 deletions DevLog/Presentation/ViewModel/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ final class HomeViewModel: Store {
var todoKindPreferences = TodoKind.allCases.map { TodoKindPreference(kind: $0, isVisible: true) }
var pinnedTodos: [PinnedTodoItem] = []
var webPages: [WebPageItem] = []
var showTodoKindPicker: Bool = false
var showContentPicker: Bool = false
var showTodoEditor: Bool = false
var showSearchView: Bool = false
var webPageURLInput: String = "https://"
Expand Down Expand Up @@ -57,7 +57,7 @@ final class HomeViewModel: Store {
case deleteWebPage(String)
case fetchPinnedTodos
case fetchWebPages
case showTodoEditorAfterDelay(Double)
case showModalAfterDelay(ModalType)
}

enum AlertType {
Expand All @@ -66,6 +66,11 @@ final class HomeViewModel: Store {
case error
}

enum ModalType {
case todoEditor
case urlInputAlert
}

private let upsertTodoUseCase: UpsertTodoUseCase
private let addWebPageUseCase: AddWebPageUseCase
private let deleteWebPageUseCase: DeleteWebPageUseCase
Expand Down Expand Up @@ -166,10 +171,15 @@ final class HomeViewModel: Store {
send(.setAlert(isPresented: true, type: .error))
}
}
case .showTodoEditorAfterDelay(let delay):
case .showModalAfterDelay(let type):
Task {
try? await Task.sleep(for: .seconds(delay))
send(.setShowTodoEditor(true))
try? await Task.sleep(for: .seconds(0.1))

@gemini-code-assist gemini-code-assist Bot Feb 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using try? with Task.sleep ignores the CancellationError. It is better to use try await so that the task stops executing immediately if it is cancelled (for example, if the ViewModel is deinitialized or the view disappears).

Suggested change
try? await Task.sleep(for: .seconds(0.1))
try await Task.sleep(for: .seconds(0.1))

switch type {
case .todoEditor:
send(.setShowTodoEditor(true))
case .urlInputAlert:
send(.setAlert(isPresented: true, type: .webPageInput))
}
}
}
}
Expand All @@ -181,23 +191,27 @@ private extension HomeViewModel {
switch action {
case .tapTodoKind(let kind):
state.selectedTodoKind = kind
state.showTodoKindPicker = false
return [.showTodoEditorAfterDelay(0.1)]
state.showContentPicker = false
return [.showModalAfterDelay(.todoEditor)]
case .orderTodoKindPreferences(let preferences):
state.todoKindPreferences = preferences
case .setReorderTodo(let isPresented):
state.reorderTodo = isPresented
case .setShowTodoEditor(let isPresented):
state.showTodoEditor = isPresented
if !isPresented { state.selectedTodoKind = nil }
case .setShowContentPicker(let isPresented):
state.showTodoKindPicker = isPresented
case .setShowSearchView(let isPresented):
state.showSearchView = isPresented
case .setReorderTodo(let presented):
state.reorderTodo = presented
case .setShowTodoEditor(let presented):
state.showTodoEditor = presented
if !presented { state.selectedTodoKind = nil }
case .setShowContentPicker(let presented):
state.showContentPicker = presented
case .setShowSearchView(let presented):
state.showSearchView = presented
case .updateWebPageURLInput(let text):
state.webPageURLInput = text
case .setAlert(let isPresented, let type):
setAlert(&state, isPresented: isPresented, type: type)
case .setAlert(let presented, let type):
if type == .webPageInput && state.showContentPicker {
state.showContentPicker = false
return [.showModalAfterDelay(.urlInputAlert)]
}

@gemini-code-assist gemini-code-assist Bot Feb 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The logic should explicitly check if presented is true before triggering the delayed modal presentation. If setAlert is called with presented: false (e.g., for dismissal), we should not be checking the picker state or returning a side effect to show the alert again.

Suggested change
if type == .webPageInput && state.showContentPicker {
state.showContentPicker = false
return [.showModalAfterDelay(.urlInputAlert)]
}
if presented && type == .webPageInput && state.showContentPicker {
state.showContentPicker = false
return [.showModalAfterDelay(.urlInputAlert)]
}

setAlert(&state, isPresented: presented, type: type)
default:
break
}
Expand Down
6 changes: 4 additions & 2 deletions DevLog/UI/Home/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct HomeView: View {
)
}
.sheet(isPresented: Binding(
get: { viewModel.state.showTodoKindPicker },
get: { viewModel.state.showContentPicker },
set: { _, _ in }
)) {
contentPicker
Expand Down Expand Up @@ -334,7 +334,9 @@ struct HomeView: View {

Section {
Button {
viewModel.send(.setAlert(isPresented: true, type: .webPageInput))
DispatchQueue.main.async {
viewModel.send(.setAlert(isPresented: true, type: .webPageInput))
}
Comment on lines +337 to +339

@gemini-code-assist gemini-code-assist Bot Feb 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This DispatchQueue.main.async is redundant. The HomeViewModel already handles the necessary asynchronous boundary and timing via the .showModalAfterDelay side effect, which uses a Task and Task.sleep. Removing this makes the view code cleaner and adheres better to the Store pattern where the ViewModel manages state transition timing.

                        viewModel.send(.setAlert(isPresented: true, type: .webPageInput))

} label: {
labelImage(
text: "URL",
Expand Down