Merge pull request #100 from APP-iOS5th/Feature/LetterBoxDetailLetter…

…View Feature/letter box detail letter view
APP-iOS5th · Sep 3, 2024 · 14f5abe · 14f5abe
2 parents 14beb2f + 27e003b
commit 14f5abe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/Kabinett/Presentation/View/LetterBox/LetterBoxDetailLetterView.swift b/Kabinett/Presentation/View/LetterBox/LetterBoxDetailLetterView.swift
@@ -9,6 +9,8 @@ import SwiftUI
 
 struct LetterBoxDetailLetterView: View {
     @EnvironmentObject var viewModel: LetterViewModel
+    @EnvironmentObject var letterBoxDetailViewModel: LetterBoxDetailViewModel
+
     @State private var showDetailLetter = false
 
     var letterType: LetterType
@@ -59,6 +61,7 @@ struct LetterBoxDetailLetterView: View {
             }
         }
         .onAppear {
+            letterBoxDetailViewModel.fetchLetterBoxDetailLetters(letterType: letterType)
             viewModel.offset = 0
             viewModel.showDeleteButton = false
         }

diff --git a/Kabinett/Presentation/View/LetterBox/LetterBoxView.swift b/Kabinett/Presentation/View/LetterBox/LetterBoxView.swift
@@ -57,6 +57,7 @@ struct LetterBoxView: View {
                                         }
                                     }
                                 }
+                                .padding(.bottom, 65)
                         }
                     }
                 }

diff --git a/Kabinett/Presentation/View/LetterBox/LetterCell.swift b/Kabinett/Presentation/View/LetterBox/LetterCell.swift
@@ -30,7 +30,7 @@ struct LetterCell: View {
 
                 GeometryReader { geometry in
                     ZStack {
-                        ForEach(0..<totalPageCount, id: \.self) { index in
+                        ForEach(0..<max(totalPageCount, 1), id: \.self) { index in
                             if index == selectedIndex || index == selectedIndex + 1 {
                                 createPageView(index: index, geometry: geometry)
                                     .offset(x: CGFloat(index - selectedIndex) * 10, y: CGFloat(index - selectedIndex) * 10)
@@ -60,12 +60,13 @@ struct LetterCell: View {
 
     @ViewBuilder
     private func createPageView(index: Int, geometry: GeometryProxy) -> some View {
-        if index < letter.content.count {
+
+        if letter.content.isEmpty || index < letter.content.count {
             ContentRectangleView(
                 stationeryImageUrlString: letter.stationeryImageUrlString,
                 fromUserName: letter.fromUserName,
                 toUserName: letter.toUserName,
-                letterContent: letter.content[index].isEmpty ? " " : letter.content[index],
+                letterContent: letter.content.isEmpty ? " " : letter.content[index].isEmpty ? " " : letter.content[index],
                 fontString: letter.fontString ?? "SFDisplay",
                 date: letter.date,
                 currentPageIndex: index,

diff --git a/Kabinett/Presentation/View/LetterBox/SearchBarView.swift b/Kabinett/Presentation/View/LetterBox/SearchBarView.swift
@@ -25,6 +25,7 @@ struct SearchBarView: View {
                     .tint(.black)
                 TextField("Search", text: $searchText)
                     .focused($textFieldFocused)
+                    .textInputAutocapitalization(.never)
                     .onAppear {
                         textFieldFocused = isTextFieldFocused
                     }

diff --git a/Kabinett/Presentation/ViewModel/LetterBox/LetterBoxDetailViewModel.swift b/Kabinett/Presentation/ViewModel/LetterBox/LetterBoxDetailViewModel.swift
@@ -34,7 +34,7 @@ class LetterBoxDetailViewModel: ObservableObject {
         if findKeyword.isEmpty { return }
 
         Task { @MainActor in
-            let result = await letterBoxUseCase.searchBy(findKeyword: findKeyword, letterType: letterType)
+            let result = await letterBoxUseCase.searchBy(findKeyword: findKeyword.lowercased(), letterType: letterType)
             switch result {
             case .success(let resultLettersOfSearchKeyword):
                 self.letterBoxDetailLetters = resultLettersOfSearchKeyword ?? []
@@ -45,6 +45,10 @@ class LetterBoxDetailViewModel: ObservableObject {
     }
 
     func fetchSearchByDate(letterType: LetterType, startDate: Date, endDate: Date) {
+        let calendar = Calendar.current
+        let startDate = calendar.startOfDay(for: startDate)
+        let endDate = calendar.date(byAdding: .day, value: 1, to: calendar.startOfDay(for: endDate)) ?? endDate
+
         Task { @MainActor in
             let result = await letterBoxUseCase.searchBy(letterType: letterType, startDate: startDate, endDate: endDate)
             switch result {
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ struct LetterBoxView: View { @@
                                             }
                                         }
                                     }
+                                    .padding(.bottom, 65)
                             }
                         }
                     }
@@ Expand Down @@