feat: #50 Connect all data flow

- 전체적으로 UI를 수정하고, 각 화면 전환시 데이터를 업데이트 시켜줍니다.
- 완독이 이미지를 추가합니다. (그 외에 이미지도)
- 다크 모드를 막습니다.

FiveGuyes/FiveGuyes.xcodeproj/project.pbxproj

@@ -18,7 +18,6 @@
 		1A27D9662CDB779000D1E14D /* TotalCalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A27D9652CDB779000D1E14D /* TotalCalendarView.swift */; };
 		1A54142B2CD9FEF400283FBD /* BookSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A54142A2CD9FEF400283FBD /* BookSearchView.swift */; };
 		1AA14A782CDDA30D00B763A6 /* TotalCalendarTextBubble.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AA14A772CDDA30D00B763A6 /* TotalCalendarTextBubble.swift */; };
-		24360D462CD8A2F800E83D2B /* EmptyDataMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D452CD8A2F800E83D2B /* EmptyDataMainView.swift */; };
 		24360D482CD8BAF100E83D2B /* EmptyNotiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D472CD8BAF100E83D2B /* EmptyNotiView.swift */; };
 		24360D4A2CD8BE3C00E83D2B /* FinishGoalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D492CD8BE3C00E83D2B /* FinishGoalView.swift */; };
 		24360D532CD9F3AF00E83D2B /* DailyProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24360D522CD9F3AF00E83D2B /* DailyProgressView.swift */; };
@@ -63,7 +62,6 @@
 		1A27D9652CDB779000D1E14D /* TotalCalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalCalendarView.swift; sourceTree = "<group>"; };
 		1A54142A2CD9FEF400283FBD /* BookSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BookSearchView.swift; path = FiveGuyes/Sources/Views/Screen/BookSetting/BookSearch/BookSearchView.swift; sourceTree = SOURCE_ROOT; };
 		1AA14A772CDDA30D00B763A6 /* TotalCalendarTextBubble.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalCalendarTextBubble.swift; sourceTree = "<group>"; };
-		24360D452CD8A2F800E83D2B /* EmptyDataMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyDataMainView.swift; sourceTree = "<group>"; };
 		24360D472CD8BAF100E83D2B /* EmptyNotiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyNotiView.swift; sourceTree = "<group>"; };
 		24360D492CD8BE3C00E83D2B /* FinishGoalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FinishGoalView.swift; sourceTree = "<group>"; };
 		24360D522CD9F3AF00E83D2B /* DailyProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyProgressView.swift; sourceTree = "<group>"; };
@@ -199,7 +197,6 @@
 			children = (
 				26890B962CAE811A008DFF49 /* ContentView.swift */,
 				24360D472CD8BAF100E83D2B /* EmptyNotiView.swift */,
-				24360D452CD8A2F800E83D2B /* EmptyDataMainView.swift */,
 				26D852F92CCE40930016239A /* Navigation */,
 				26D852FB2CCE40BC0016239A /* Screen */,
 				26D853052CCE44970016239A /* Components */,
@@ -415,7 +412,6 @@
 				24360D4A2CD8BE3C00E83D2B /* FinishGoalView.swift in Sources */,
 				26F19A682CD9EFD800F41D6D /* MainHomeView.swift in Sources */,
 				26F19A742CDB271E00F41D6D /* NavigationRootView.swift in Sources */,
-				24360D462CD8A2F800E83D2B /* EmptyDataMainView.swift in Sources */,
 				264440502CD8A3AC0031A290 /* CompletionReviewView.swift in Sources */,
 				264440502CD8A3AC0031A290 /* CompletionReviewView.swift in Sources */,
 				26890B952CAE811A008DFF49 /* FiveGuyesApp.swift in Sources */,
@@ -582,6 +578,7 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -617,6 +614,7 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

FiveGuyes/FiveGuyes/Resources/Assets.xcassets/CompletedWandoki.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "x1_Completed.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "x2_Completed.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "x3_Completed.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FiveGuyes/FiveGuyes/Resources/Assets.xcassets/wandoki.imageset/Contents.json → FiveGuyes/FiveGuyes/Resources/Assets.xcassets/NothingWandoki.imageset/Contents.json

@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "wandoki.png",
+      "filename" : "x1_Nothing.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "x2_Nothing.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "x3_Nothing.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

FiveGuyes/FiveGuyes/Resources/Assets.xcassets/wandoki2.imageset/Contents.json → FiveGuyes/FiveGuyes/Resources/Assets.xcassets/completionBackground.imageset/Contents.json

@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "wandoki2.png",
+      "filename" : "celebratex1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "celebratex2.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "celebratex3.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

FiveGuyes/FiveGuyes/Resources/Extensions/Date+Extension.swift

@@ -13,4 +13,35 @@ extension Date {
         let components = calendar.dateComponents([.year, .month], from: self)
         return calendar.date(from: components)!
     }
+
+    /// 지정된 일 수만큼 UTC 기준으로 날짜를 추가합니다.
+    /// - Parameter days: 추가할 일 수 (음수일 경우 감소)
+    /// - Returns: UTC 기준으로 일 수가 추가된 새로운 `Date`
+    func addDaysInUTC(_ days: Int) -> Date {
+        var utcCalendar = Calendar.current
+        utcCalendar.timeZone = TimeZone(secondsFromGMT: 0)! // UTC 시간대 설정
+        return utcCalendar.date(byAdding: .day, value: days, to: self) ?? self
+    }
+
+    /// 지정된 일 수만큼 날짜를 추가합니다.
+    /// - Parameter days: 추가할 일 수 (음수일 경우 감소)
+    /// - Returns: 일 수가 추가된 새로운 `Date`
+    func addDays(_ days: Int) -> Date {
+        return Calendar.current.date(byAdding: .day, value: days, to: self) ?? self
+    }
+
+    /// `yyyy년 MM월 dd일` 형식으로 변환하여 문자열로 반환합니다.
+    func toKoreanDateString() -> String {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy년 MM월 dd일"
+        return formatter.string(from: self)
+    }
+
+    /// `yyyy년 MM월 dd일` 형식으로 변환하여 문자열로 반환합니다.
+    func toKoreanDateStringWithoutYear() -> String {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "MM월 dd일"
+        return formatter.string(from: self)
+    }
+
 }

FiveGuyes/FiveGuyes/Sources/Models/BookDetails.swift

@@ -14,8 +14,8 @@ final class BookDetails {
     let coverURL: String?
     let totalPages: Int
 
-    let startDate: Date
-    let targetEndDate: Date
+    var startDate: Date
+    var targetEndDate: Date
 
     var nonReadingDays: [Date]
 
@@ -40,16 +40,48 @@ final class UserBook {
     var book: BookDetails
     var readingRecords: [String: ReadingRecord] = [:] // Keyed by formatted date strings
 
+    // 계산 로직을 더 편하게 하기 위해 마지막으로 읽은 날의 결과를 따로 저장합니다.
+    var lastReadDate: Date? // 마지막 읽은 날짜
+    var lastPagesRead: Int = 0 // 마지막으로 읽은 페이지 수
+
+    var completionReview = ""
+
     init(book: BookDetails) {
         self.book = book
     }
+
+    /// `pagesRead`가 0이 아닌 날의 수를 반환합니다.
+    /// 지금까지 독서를 한 날의 수
+    func nonZeroReadingDaysCount() -> Int {
+        // 첫 날은 1일 째 도전중이니까 + 1을 해준다.
+        let readingDays = readingRecords.values.filter { $0.pagesRead > 0 }
+        if readingDays.isEmpty {
+            return 1
+        }
+        return readingRecords.values.filter { $0.pagesRead > 0 }.count
+    }
 }
 
 @Observable
 final class UserLibrary {
     var currentReadingBook: UserBook?
-    var completedBooks: [BookDetails] = []
+    var completedBooks: [UserBook?] = []
 
+    /// 현재 읽고 있는 책을 완독 처리하고, `completedBooks`에 추가합니다.
+    func completeCurrentBook(_ book: UserBook, review: String) {
+        // 책의 완독 날짜를 오늘로 설정
+        book.book.targetEndDate = Date()
+        book.completionReview = review
+
+        // 시작 날짜가 종료 날짜보다 이후에 있으면 시작 날짜도 완료 날짜로 설정
+        if book.book.startDate > book.book.targetEndDate {
+            book.book.startDate = book.book.targetEndDate
+        }
+
+        // 완독한 책을 completedBooks에 추가하고 currentReadingBook을 nil로 설정
+        completedBooks.append(book)
+        currentReadingBook = nil
+    }
 }
 
 extension UserBook {
@@ -81,76 +113,3 @@ extension UserBook {
         return userBook
     }
 }
-
-
-//// BookDetails 더미 데이터
-//extension BookDetails {
-//    static func dummyBookDetails1() -> BookDetails {
-//        let dateFormatter = DateFormatter()
-//        dateFormatter.dateFormat = "yyyy-MM-dd"
-//        
-//        return BookDetails(
-//            title: "Swift Programming Basics",
-//            author: "John Doe",
-//            totalPages: 300,
-//            startDate: dateFormatter.date(from: "2024-01-01")!,
-//            targetEndDate: dateFormatter.date(from: "2024-02-01")!,
-//            nonReadingDays: [
-//                dateFormatter.date(from: "2024-01-07")!,
-//                dateFormatter.date(from: "2024-01-14")!,
-//                dateFormatter.date(from: "2024-01-21")!
-//            ]
-//        )
-//    }
-//    
-//    static func dummyBookDetails2() -> BookDetails {
-//        let dateFormatter = DateFormatter()
-//        dateFormatter.dateFormat = "yyyy-MM-dd"
-//        
-//        return BookDetails(
-//            title: "Advanced iOS Development",
-//            author: "Jane Smith",
-//            totalPages: 450,
-//            startDate: dateFormatter.date(from: "2023-11-01")!,
-//            targetEndDate: dateFormatter.date(from: "2023-12-01")!,
-//            nonReadingDays: [
-//                dateFormatter.date(from: "2023-11-10")!,
-//                dateFormatter.date(from: "2023-11-17")!
-//            ]
-//        )
-//    }
-//    
-//    static func dummyBookDetails3() -> BookDetails {
-//        let dateFormatter = DateFormatter()
-//        dateFormatter.dateFormat = "yyyy-MM-dd"
-//        
-//        return BookDetails(
-//            title: "UI/UX Design Principles",
-//            author: "Alex Johnson",
-//            totalPages: 200,
-//            startDate: dateFormatter.date(from: "2023-10-01")!,
-//            targetEndDate: dateFormatter.date(from: "2023-10-15")!,
-//            nonReadingDays: [
-//                dateFormatter.date(from: "2023-10-05")!
-//            ]
-//        )
-//    }
-//}
-//
-//// CurrentBook 더미 데이터
-//extension CurrentBook {
-//    static func dummyCurrentBook() -> CurrentBook {
-//        let dateFormatter = DateFormatter()
-//        dateFormatter.dateFormat = "yyyy-MM-dd"
-//        
-//        return CurrentBook(
-//            details: BookDetails.dummyBookDetails1(),
-//            currentPage: 150,
-//            dailyTargets: [
-//                dateFormatter.date(from: "2024-01-01")!: 100,
-//                dateFormatter.date(from: "2024-01-02")!: 100,
-//                dateFormatter.date(from: "2024-01-03")!: 100
-//            ]
-//        )
-//    }
-//}