Skip to content

Commit 6d803b3

Browse files
wltnryuwltnryu
committed
[#477] 불필요한 코드 삭제
1 parent 82c61bc commit 6d803b3

File tree

5 files changed

+2
-337
lines changed

5 files changed

+2
-337
lines changed

‎Presentation/Home/Paper/PaperListView.swift

-133
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ struct PaperListView: View {
3333
@State private var isIPadMini: Bool = false
3434
@State private var isVertical = false
3535

36-
// 검색 관련 변수
37-
@State private var isMenuOpen: Bool = false
38-
@State private var buttonPosition: CGRect = .zero
39-
4036
var body: some View {
4137
GeometryReader { geometry in
4238
ZStack {
@@ -80,9 +76,6 @@ struct PaperListView: View {
8076

8177
Spacer()
8278
}
83-
} else if homeViewModel.isSearching {
84-
searchFilter()
85-
.frame(height: 52)
8679
} else {
8780
HStack(spacing: 0) {
8881
// 최상위 폴더가 아닐 경우에 등장
@@ -140,7 +133,6 @@ struct PaperListView: View {
140133
ForEach(homeViewModel.filteredLists.indices, id: \.self) { index in
141134
let item = homeViewModel.filteredLists[index]
142135
switch item {
143-
// 논문 추가
144136
case .paper(let paperInfo):
145137
// MARK: searchview 들어갈 위치
146138
PaperListCell(
@@ -153,15 +145,6 @@ struct PaperListView: View {
153145
isEditingSelected: selectedItems.contains(item.id),
154146
onSelect: {
155147
if !isEditing && !isNavigationPushed {
156-
// 검색 중에 문서를 클릭한다면 바로 이동
157-
if homeViewModel.isSearching {
158-
// 검색 후 이동 시 최근 검색어 저장
159-
homeViewModel.addSearchTerm(homeViewModel.searchText)
160-
homeViewModel.recentSearches = UserDefaults.standard.recentSearches
161-
162-
selectedItemID = paperInfo.id
163-
}
164-
165148
if selectedItemID == paperInfo.id {
166149
self.isNavigationPushed = true
167150
navigateToPaper()
@@ -194,18 +177,6 @@ struct PaperListView: View {
194177
isEditingSelected: selectedItems.contains(item.id),
195178
onSelect: {
196179
if !isEditing && !isNavigationPushed {
197-
// 검색 중에 폴더를 선택한다면 해당 폴더로 navigate
198-
if homeViewModel.isSearching {
199-
// 검색 후 이동 시 최근 검색어 저장
200-
homeViewModel.addSearchTerm(homeViewModel.searchText)
201-
homeViewModel.recentSearches = UserDefaults.standard.recentSearches
202-
203-
homeViewModel.isSearching.toggle()
204-
homeViewModel.selectedMenu = .main
205-
homeViewModel.searchText = ""
206-
selectedItemID = folder.id
207-
}
208-
209180
if selectedItemID == folder.id {
210181
homeViewModel.navigateTo(folder: folder)
211182
} else {
@@ -235,81 +206,13 @@ struct PaperListView: View {
235206
}
236207
.background(.gray300)
237208
}
238-
239-
if isMenuOpen {
240-
VStack(spacing: 0) {
241-
ForEach(SearchFilter.allCases, id: \.self) { filter in
242-
Button(action: {
243-
self.homeViewModel.selectedFilter = filter
244-
withAnimation {
245-
self.isMenuOpen.toggle()
246-
}
247-
}) {
248-
HStack(spacing: 0) {
249-
Text(filter.title)
250-
.reazyFont(.button1)
251-
.foregroundColor(.gray700)
252-
253-
Spacer()
254-
255-
// 선택된 항목에만 체크 표시
256-
if homeViewModel.selectedFilter == filter {
257-
Image(.check)
258-
.renderingMode(.template)
259-
.resizable()
260-
.scaledToFit()
261-
.frame(width: 20, height: 20)
262-
.foregroundStyle(.primary1)
263-
}
264-
}
265-
.padding(.horizontal, 20)
266-
.padding(.vertical, 12)
267-
}
268-
}
269-
}
270-
.frame(width: 156)
271-
.background(
272-
RoundedRectangle(cornerRadius: 12)
273-
.foregroundStyle(.gray100)
274-
.shadow(color: Color(hex: "3C3D4B").opacity(0.08), radius: 16, x: 0, y: 0)
275-
)
276-
.overlay(
277-
Image(systemName: "triangle.fill")
278-
.resizable()
279-
.foregroundStyle(.gray100)
280-
.frame(width: 46, height: 30)
281-
.offset(x: -30, y: -15),
282-
alignment: .top
283-
)
284-
.position(
285-
x: buttonPosition.midX + 46, // 버튼의 중심 X축 위치
286-
y: buttonPosition.maxY - 10 // 버튼의 아래 Y축 위치
287-
)
288-
}
289209
}
290210
.onAppear {
291211
initializeSelectedItemID()
292212
detectIPadMini()
293213
updateOrientation(with: geometry)
294-
295-
// 키보드 높이에 맞게 검색 Text 위치 조정
296-
NotificationCenter.default.addObserver(forName: UIResponder.keyboardWillShowNotification, object: nil, queue: .main) { notification in
297-
if let keyboardFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect {
298-
withAnimation {
299-
self.keyboardHeight = keyboardFrame.height
300-
}
301-
}
302-
}
303-
NotificationCenter.default.addObserver(forName: UIResponder.keyboardWillHideNotification, object: nil, queue: .main) { _ in
304-
withAnimation {
305-
self.keyboardHeight = 0
306-
}
307-
}
308214
}
309215
.onDisappear {
310-
// Notification 제거
311-
NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil)
312-
NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
313216
self.isNavigationPushed = false
314217
}
315218
.onChange(of: selectedItemID) {
@@ -324,48 +227,12 @@ struct PaperListView: View {
324227
self.selectAll = true
325228
}
326229
}
327-
.onChange(of: homeViewModel.selectedFilter) {
328-
homeViewModel.updateSearchList(with: homeViewModel.selectedFilter)
329-
}
330230
.background(.gray200)
331231
.ignoresSafeArea()
332232
}
333233
}
334234
}
335235

336-
extension PaperListView {
337-
@ViewBuilder
338-
func searchFilter() -> some View {
339-
HStack(spacing: 0) {
340-
GeometryReader { geometry in
341-
Button(action: {
342-
withAnimation {
343-
self.isMenuOpen.toggle()
344-
}
345-
buttonPosition = geometry.frame(in: .global)
346-
}) {
347-
HStack(spacing: 0) {
348-
Text(homeViewModel.selectedFilter.title)
349-
.reazyFont(.button1)
350-
.foregroundStyle(.gray700)
351-
.padding(.trailing, 10)
352-
353-
Image(systemName: "chevron.down")
354-
.font(.system(size: 12))
355-
.foregroundStyle(.gray700)
356-
}
357-
.padding(.leading, 22)
358-
.padding(.vertical, 12)
359-
}
360-
}
361-
.frame(width: 100)
362-
363-
Spacer()
364-
}
365-
}
366-
}
367-
368-
369236
extension PaperListView {
370237

371238
// TODO: URL 분리 필요

‎Presentation/Home/SearchWordView.swift

-120
This file was deleted.

0 commit comments

Comments
 (0)