Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions DevLog/Resource/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
},
"%@ 검색" : {

},
"%@의 제목이나 내용을 검색해 보세요." : {

},
"%lld" : {

Expand Down
42 changes: 25 additions & 17 deletions DevLog/UI/Home/TodoListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,21 @@ struct TodoListView: View {
}
} else {
Group {
if viewModel.state.searchText.isEmpty {
todoListContent
} else {
if viewModel.state.isSearching {
searchResultsContent
} else {
todoListContent
}
}
.searchable(
text: Binding(
get: { viewModel.state.searchText },
set: { viewModel.send(.setSearchText($0)) }
),
isPresented: Binding(
get: { viewModel.state.isSearching },
set: { viewModel.send(.setIsSearching($0)) }
),
placement: .navigationBarDrawer(displayMode: .always),
prompt: "\(viewModel.state.kind.localizedName) 검색"
)
Expand Down Expand Up @@ -162,9 +166,8 @@ struct TodoListView: View {
.listRowBackground(Color.clear)
}
.listStyle(.plain)
.refreshable {
viewModel.send(.refresh)
}
.refreshable { viewModel.send(.refresh) }
.scrollDisabled(viewModel.state.todos.isEmpty || viewModel.state.isLoading)

if viewModel.state.isLoading {
LoadingView()
Expand All @@ -189,24 +192,29 @@ struct TodoListView: View {
)
}

@ViewBuilder
private var searchResultsContent: some View {
let searchResults = viewModel.state.searchResults
let limit = viewModel.searchResultsLimit
let displayedTodos = viewModel.state.showAllSearchResults
? searchResults
: Array(searchResults.prefix(limit))

return ScrollView {
LazyVStack(spacing: 0) {
if viewModel.state.isLoading {
LoadingView()
.padding(.top, 40)
} else if searchResults.isEmpty {
Text("검색 결과가 없습니다.")
.foregroundStyle(Color.gray)
.frame(maxWidth: .infinity)
.padding(.top, 40)
} else {
if viewModel.state.searchText.isEmpty {
Text("\(viewModel.state.kind.localizedName)의 제목이나 내용을 검색해 보세요.")
.foregroundStyle(Color.gray)
.frame(maxWidth: .infinity)
} else if viewModel.state.isLoading {
LoadingView()
} else if searchResults.isEmpty {
Spacer()
Text("검색 결과가 없습니다.")
.foregroundStyle(Color.gray)
.frame(maxWidth: .infinity)
Spacer()
} else {
ScrollView {
LazyVStack(spacing: 0) {
ForEach(displayedTodos) { todo in
Button {
router.push(Path.detail(todo.id))
Expand Down
26 changes: 14 additions & 12 deletions DevLog/UI/Search/SearchView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,25 @@ struct SearchView: View {

@ViewBuilder
private var searchableContent: some View {
ScrollView {
LazyVStack(alignment: .leading, spacing: 0) {
if viewModel.state.isLoading {
LoadingView()
} else if viewModel.state.searchQuery.isEmpty {
if viewModel.state.recentQueries.isEmpty {
searchInstruction
} else {
Group {
if viewModel.state.isLoading {
LoadingView()
} else if viewModel.state.searchQuery.isEmpty {
if viewModel.state.recentQueries.isEmpty {
searchInstruction
} else {
ScrollView {
recentQueries
}
} else if viewModel.state.webPages.isEmpty && viewModel.state.todos.isEmpty {
emptySearchResult
} else {
}
} else if viewModel.state.webPages.isEmpty && viewModel.state.todos.isEmpty {
emptySearchResult
} else {
ScrollView {
searchResults
.frame(maxWidth: .infinity, alignment: .leading)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
}
.searchable(
text: Binding(
Expand Down