Merge pull request #136 from DeveloperAcademy-POSTECH/develop

Update Version 1.3.1

FiveGuyes/FiveGuyes.xcodeproj/project.pbxproj

@@ -794,7 +794,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.FiveNorms.FiveNorms;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -834,7 +834,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.FiveNorms.FiveNorms;
 				PRODUCT_NAME = "$(TARGET_NAME)";

FiveGuyes/FiveGuyes/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,80 @@
-{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}
+{
+  "images" : [
+    {
+      "filename" : "40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FiveGuyes/FiveGuyes/Sources/Models/ReadingScheduleCalculator.swift

@@ -271,3 +271,19 @@ struct ReadingScheduleCalculator {
         return (pagesPerDay, remainder)
     }
 }
+
+extension ReadingScheduleCalculator {
+    /// 기록된 날짜의 수를 계산하는 메서드
+    func calculateRecordedDays<Progress: ReadingProgressProtocol>(
+        progress: Progress
+    ) -> Int {
+        return progress.readingRecords.values.filter { $0.pagesRead > 0 }.count
+    }
+
+    func calculateTotalReadingPages<Settings: UserSettingsProtocol>(
+        setttings: Settings
+    ) -> Int {
+        return setttings.targetEndPage - setttings.startPage
+    }
+
+}

FiveGuyes/FiveGuyes/Sources/Stores/NavigationCoordinator.swift

@@ -9,6 +9,7 @@ import SwiftUI
 
 // TODO: 추가되는 뷰 추가하기
 enum Screens: Hashable {
+    typealias UserBook = UserBookSchemaV2.UserBookV2
     case empty
     case mainHome
     case notiSetting
@@ -17,6 +18,7 @@ enum Screens: Hashable {
     case dailyProgress
     case completionCelebration
     case completionReview
+    case completionReviewUpdate(book: UserBook)
 }
 
 @Observable
@@ -42,6 +44,8 @@ final class NavigationCoordinator {
             CompletionCelebrationView()
         case .completionReview:
             CompletionReviewView()
+        case .completionReviewUpdate(book: let book):
+            CompletionReviewView(isUpdateMode: true, externalBook: book)
         }
     }
 

FiveGuyes/FiveGuyes/Sources/Views/Components/CompletionListView.swift

@@ -11,22 +11,24 @@ import SwiftUI
 struct CompletionListView: View {
     typealias UserBook = UserBookSchemaV2.UserBookV2
 
+    @Environment(NavigationCoordinator.self) var navigationCoordinator: NavigationCoordinator
     @Environment(\.modelContext) private var modelContext
 
     @State private var selectedBookIndex: Int = 0
     @State var showCompletionAlert: Bool = false
 
     // 완독한 책을 가져오는 쿼리
-    // TODO: 책 역순으로 받아오기 🐯🐯🐯🐯🐯
     @Query(
         filter: #Predicate<UserBook> { $0.completionStatus.isCompleted == true }
     )
-    private var completedBooks: [UserBook]
+    private var fetchCompletedBooks: [UserBook]
 
     let completionAlertMessage = "정말로 내용을 삭제할까요?"
     let completionAlertText = "삭제 후에는 복원할 수 없어요"
 
     var body: some View {
+        var completedBooks = Array(fetchCompletedBooks.reversed())
+
         VStack(alignment: .leading, spacing: 16) {
             HStack {
                 Text("완독 리스트")
@@ -92,22 +94,34 @@ struct CompletionListView: View {
                             .fontStyle(.body)
                             .foregroundStyle(Color.Labels.primaryBlack1)
                             .padding(.bottom, 10)
-                        // TODO: 수정 버튼 추가하기
+
                         HStack {
                             Text("\(selectedBook.userSettings.targetEndDate.toKoreanDateStringWithoutYear()) 완독완료")
                             Spacer()
-                            // TODO: ❗️❗️❗️ 수정하기 기능 추가
-                            // 데이터를 지우니까 튕김
-//                            Button {
-//                                showCompletionAlert = true
-//                            } label: {
-//                                Image(systemName: "ellipsis")
-//                                    .resizable()
-//                                    .scaledToFit()
-//                                    .frame(width: 20, height: 22)
-//                                    .tint(Color.Labels.secondaryBlack2) // 디자인 시스템으로 수정
-//                                    .padding(.trailing, 3)
-//                            }
+
+                            Menu {
+                                Button {
+                                    navigationCoordinator.push(.completionReviewUpdate(book: completedBooks[selectedBookIndex]))
+                                } label: {
+                                    Label("내용 수정하기", systemImage: "pencil")
+                                }
+
+                                Divider()
+
+                                Button(role: .destructive) {
+                                    showCompletionAlert = true
+                                } label: {
+                                    Label("삭제", systemImage: "trash")
+                                }
+                            } label: {
+                                Image(systemName: "ellipsis")
+                                    .resizable()
+                                    .scaledToFit()
+                                    .frame(width: 20, height: 22)
+                                    .tint(Color.Labels.secondaryBlack2)
+                                    .padding(.trailing, 3)
+
+                            }
                         }
                         .fontStyle(.caption2)
                         .foregroundStyle(Color.Labels.secondaryBlack2)
@@ -117,8 +131,7 @@ struct CompletionListView: View {
                         RoundedRectangle(cornerRadius: 16)
                             .foregroundStyle(Color.Fills.lightGreen)
                     }
-                    .padding(.horizontal, 20)
-
+                    .padding(.horizontal, 20)    
                 }
 
             } else {
@@ -128,21 +141,29 @@ struct CompletionListView: View {
                     .padding(.horizontal, 20)
             }
         }
-        // TODO: ❗️❗️❗️ 수정하기 기능 추가
-        // 데이터를 지우니까 튕김
-        // FontStyle 적용해놓음
-//        .alert(isPresented: $showCompletionAlert) {
-//            Alert(
-//                title: Text(completionAlertText)
-//                    .alertFontStyle(.title3, weight: .semibold),
-//                message: Text(completionAlertMessage)
-//                    .alertFontStyle(.caption1),
-//                primaryButton: .cancel(Text("취소하기")),
-//                secondaryButton: .destructive(Text("삭제")) {
-//                    let book = completedBooks[selectedBookIndex]
-//                    modelContext.delete(book)
-//                }
-//            )
-//        }
+        .alert(isPresented: $showCompletionAlert) {
+            Alert(
+                title: Text(completionAlertText)
+                    .alertFontStyle(.title3, weight: .semibold),
+                message: Text(completionAlertMessage)
+                    .alertFontStyle(.caption1),
+                primaryButton: .cancel(Text("취소하기")),
+                secondaryButton: .destructive(Text("삭제")) {
+                    let book = completedBooks[selectedBookIndex]
+
+                    modelContext.delete(book)
+
+                    // 처음 셀로 선택하기
+                    selectedBookIndex = 0
+
+                    // 데이저 저장이 느려서 직접 저장해주기
+                    do {
+                        try modelContext.save()
+                    } catch {
+                        print(error.localizedDescription)
+                    }
+                }
+            )
+        }
     }
 }

FiveGuyes/FiveGuyes/Sources/Views/Screen/BookCompletion/CompletionCelebrationView.swift

@@ -28,28 +28,28 @@ struct CompletionCelebrationView: View {
         let userSettings: UserSettingsProtocol = userBook.userSettings
         let readingProgress: any ReadingProgressProtocol = userBook.readingProgress
 
-        ZStack {
-            Image("completionBackground").ignoresSafeArea()
+        VStack(spacing: 0) {
+            Spacer()
+            celebrationTitle
+                .padding(.bottom, 14)
 
-            VStack(spacing: 0) {
-                Spacer()
-                celebrationTitle
-                    .padding(.bottom, 14)
-
-                celebrationMessage
-                    .padding(.bottom, 80)
-
-                celebrationBookImage(bookMetadata)
-                    .padding(.bottom, 28)
-
-                readingSummary(userSettings: userSettings, readingProgress: readingProgress)
-
-                Spacer()
-
-                reflectionButton
-                    .padding(.bottom, 42)
-            }
-            .padding(.horizontal, 16)
+            celebrationMessage
+                .padding(.bottom, 80)
+
+            celebrationBookImage(bookMetadata)
+                .padding(.bottom, 28)
+
+            readingSummary(userSettings: userSettings, readingProgress: readingProgress)
+
+            Spacer()
+
+            reflectionButton
+                .padding(.bottom, 21)
+        }
+        .padding(.horizontal, 16)
+        .background {
+            Image("completionBackground")
+                .ignoresSafeArea()
         }
         .customNavigationBackButton()
     }
@@ -102,16 +102,15 @@ struct CompletionCelebrationView: View {
 
     private func readingSummary(userSettings: UserSettingsProtocol, readingProgress: any ReadingProgressProtocol) -> some View {
         let readingScheduleCalculator = ReadingScheduleCalculator()
-         
+
         // TODO: 완독을 수정할 수도 있기 때문에 완독 날짜가 바뀔 수 있음, 그래서 완독 날짜는 최종에서 업데이트하고 여기서는 오늘 날짜로 보여주기 -> 초기 설정 날보다 빠를 수도 있음 🐯
         let endDateText = Date().toKoreanDateString()
         var startDateText = userSettings.startDate.toKoreanDateString()
         if startDateText > endDateText { startDateText = endDateText }
 
         // TODO: 위에 이유로 날짜가 바껴서 보이면 아래 로직에 파라미터 값도 바껴야 한다. 🐯
-        let pagesPerDay = readingScheduleCalculator.firstCalculatePagesPerDay(settings: userSettings, progress: readingProgress).pagesPerDay
-
-        let totalReadingDays = readingScheduleCalculator.firstCalculateTotalReadingDays(settings: userSettings, progress: readingProgress)
+        let totalReadingDays = readingScheduleCalculator.calculateRecordedDays(progress: readingProgress)
+        let pagesPerDay = readingScheduleCalculator.calculateTotalReadingPages(setttings: userSettings) / totalReadingDays
 
         return Text("\(startDateText)부터 \(endDateText)까지\n꾸준히 \(pagesPerDay)쪽씩 \(totalReadingDays)일동안 읽었어요 🎉")
             .fontStyle(.caption1)

FiveGuyes/FiveGuyes/Sources/Views/Screen/BookCompletion/CompletionReviewView.swift

@@ -22,11 +22,17 @@ struct CompletionReviewView: View {
     @Query(filter: #Predicate<UserBook> { $0.completionStatus.isCompleted == false })
     private var currentlyReadingBooks: [UserBook]  // 현재 읽고 있는 책을 가져오는 쿼리
 
+    // 업데이트 상황을 나타내는 불 변수
+    var isUpdateMode: Bool = false
+
+        // 외부에서 주입받을 수 있는 책 변수
+    var externalBook: UserBook?
+
     var body: some View {
-        let userBook = currentlyReadingBooks.first ?? UserBook.dummyUserBookV2
+        let userBook = isUpdateMode ? (externalBook ?? UserBook.dummyUserBookV2) : (currentlyReadingBooks.first ?? UserBook.dummyUserBookV2)
 
         let bookMetadata: BookMetaDataProtocol = userBook.bookMetaData
-        let completionStatus: CompletionStatusProtocol = userBook.completionStatus
+        var completionStatus: CompletionStatusProtocol = userBook.completionStatus
         let userSettings = userBook.userSettings
 
         let title = bookMetadata.title
@@ -58,12 +64,18 @@ struct CompletionReviewView: View {
                         if reflectionText.isEmpty {
                             showAlert = true
                         } else {
-                            completionStatus.markAsCompleted(review: reflectionText)
 
-                            // TODO: 해당 로직 모델로 옮기기 🐯
-                            userSettings.targetEndDate = Date()
-                            if userSettings.startDate > userSettings.targetEndDate {
-                                userSettings.startDate = userSettings.targetEndDate
+                            if !isUpdateMode {
+                                completionStatus.markAsCompleted(review: reflectionText)
+
+                                // TODO: 해당 로직 모델로 옮기기 🐯
+                                userSettings.targetEndDate = Date()
+                                if userSettings.startDate > userSettings.targetEndDate {
+                                    userSettings.startDate = userSettings.targetEndDate
+                                }
+                            } else {
+                                // 업데이트 모드인 경우
+                                completionStatus.completionReview = reflectionText
                             }
 
                             navigationCoordinator.popToRoot()
@@ -86,6 +98,7 @@ struct CompletionReviewView: View {
         }
         .customNavigationBackButton()
         .onAppear {
+            reflectionText = completionStatus.completionReview
             isFocusedTextEditor = true
         }
     }