[Feat] UI 업데이트 내용 반영

Qapple/Qapple/SourceCode/Entity/AcademyEventFor4th.swift

@@ -99,6 +99,11 @@ enum AcademyEventFor4th: CaseIterable {
         let (startDate, endDate) = period
         return daysBetween(startDate, endDate) + 1
     }
+
+    /// 현재 이벤트의 남은 일수를 반환합니다.
+    var leftDays: Int {
+        daysBetween(.now, self.period.1) + 1
+    }
 }
 
 // MARK: - Helper

Qapple/Qapple/SourceCode/Feature/1.MainFlow/MainFlowFeature.swift

@@ -238,7 +238,7 @@ extension MainFlowFeature {
         case bulletinBoard(BulletinBoardFeature)
         case bulletinBoardSearch(BulletinBoardSearchFeature)
         case bulletinBoardPost(BulletinBoardPostFeature)
-        case comment(CommentFeature)
+        case comment(BoardCommentFeature)
         case profileEdit(ProfileEditFeature)
         case myAnswerList(MyAnswerListFeature)
         case peopleWhoMadeQapple

Qapple/Qapple/SourceCode/Feature/1.MainFlow/MainFlowView.swift

@@ -52,7 +52,7 @@ struct MainFlowView: View {
             case let .bulletinBoard(store): BulletinBoardView(store: store)
             case let .bulletinBoardSearch(store): BulletinBoardSearchView(store: store)
             case let .bulletinBoardPost(store): BulletinBoardPostView(store: store)
-            case let .comment(store): CommentView(store: store)
+            case let .comment(store): BoardCommentView(store: store)
             case let .profileEdit(store): ProfileEditView(store: store)
             case let .myAnswerList(store): MyAnswerListView(store: store)
             case .peopleWhoMadeQapple: PeopleWhoMadeQappleView()

Qapple/Qapple/SourceCode/Feature/2.QuestionTab/2-2.TodayQuestion/TodayQuestionFeature.swift

@@ -28,6 +28,7 @@ struct TodayQuestionFeature {
     enum Action {
         case onAppear
         case onDisappear
+        case active
         case refresh
         case mainQuestionResponse(Question)
         case answerListResponse([Answer])
@@ -58,7 +59,7 @@ struct TodayQuestionFeature {
     var body: some ReducerOf<Self> {
         Reduce { state, action in
             switch action {
-            case .onAppear, .refresh:
+            case .onAppear, .active, .refresh:
                 return .run { [isFirstLaunch = state.isFirstLaunch] send in
                     if isFirstLaunch { await send(.toggleLoading(true), animation: .bouncy) }
                     do {

Qapple/Qapple/SourceCode/Feature/2.QuestionTab/2-2.TodayQuestion/TodayQuestionView.swift

@@ -10,6 +10,8 @@ import SwiftUI
 
 struct TodayQuestionView: View {
 
+    @Environment(\.scenePhase) private var scenePhase
+
     @Bindable var store: StoreOf<TodayQuestionFeature>
 
     var body: some View {
@@ -26,6 +28,11 @@ struct TodayQuestionView: View {
         }
         .background(.second)
         .scrollIndicators(.hidden)
+        .onChange(of: scenePhase) { _, newPhase in
+            if newPhase == .active {
+                store.send(.active)
+            }
+        }
         .onAppear {
             store.send(.onAppear)
         }

Qapple/Qapple/SourceCode/Feature/2.QuestionTab/2-7.AnswerCommentList/AnswerCommentView.swift

@@ -85,51 +85,63 @@ private struct CommentListView: View {
 
     var body: some View {
         ZStack {
-            ScrollView {
-                LazyVStack(spacing: 0) {
-                    seperator
-                    // TODO: 4/14 데이터 연결 필요
-//                    ForEach(Array(self.store.commentList.enumerated()), id: \.offset) { index, comment in
-//                        AnswerCommentCell(
-//                            comment: comment,
-//                            like: {
-//                                store.send(.likeCommentButtonTapped(comment))
-//                            },
-//                            delete: {
-//                                store.send(.deleteCommentButtonTapped(comment))
-//                            },
-//                            report: {
-//                                store.send(.reportButtonTapped(comment))
-//                            }
-//                        )
-//                        .configurePagination(
-//                            store.commentList,
-//                            currentIndex: index,
-//                            hasNext: store.paginationInfo.hasNext,
-//                            pagination: {
-//                                store.send(.pagination)
-//                            }
-//                        )
-//                        .disabled(store.isLoading)
-//                        
-//                        seperator
-//                    }
-
-                    ForEach(AnswerCommentFeature.sampleComment) { comment in
-                        AnswerCommentCell(
-                            comment: comment,
-                            like: {
-                                store.send(.likeCommentButtonTapped(comment))
-                            },
-                            delete: {
-                                store.send(.deleteCommentButtonTapped(comment))
-                            },
-                            report: {
-                                store.send(.reportButtonTapped(comment))
-                            }
-                        )
+            VStack {
+                seperator
+
+                HStack {
+                    Text("댓글")
+                        .pretendard(.medium, 14)
+                        .foregroundStyle(.sub3)
+                    Spacer()
+                }
+                .padding(.top, 12)
+                .padding(.horizontal, 20)
+
+                ScrollView {
+                    LazyVStack(spacing: 0) {
+                        // TODO: 4/14 데이터 연결 필요
+    //                    ForEach(Array(self.store.commentList.enumerated()), id: \.offset) { index, comment in
+    //                        AnswerCommentCell(
+    //                            comment: comment,
+    //                            like: {
+    //                                store.send(.likeCommentButtonTapped(comment))
+    //                            },
+    //                            delete: {
+    //                                store.send(.deleteCommentButtonTapped(comment))
+    //                            },
+    //                            report: {
+    //                                store.send(.reportButtonTapped(comment))
+    //                            }
+    //                        )
+    //                        .configurePagination(
+    //                            store.commentList,
+    //                            currentIndex: index,
+    //                            hasNext: store.paginationInfo.hasNext,
+    //                            pagination: {
+    //                                store.send(.pagination)
+    //                            }
+    //                        )
+    //                        .disabled(store.isLoading)
+    //
+    //                        seperator
+    //                    }
 
-                        seperator
+                        ForEach(AnswerCommentFeature.sampleComment) { comment in
+                            AnswerCommentCell(
+                                comment: comment,
+                                like: {
+                                    store.send(.likeCommentButtonTapped(comment))
+                                },
+                                delete: {
+                                    store.send(.deleteCommentButtonTapped(comment))
+                                },
+                                report: {
+                                    store.send(.reportButtonTapped(comment))
+                                }
+                            )
+
+                            seperator
+                        }
                     }
                 }
             }

Qapple/Qapple/SourceCode/Feature/3.BulletinBoard/3-1.BulletinBoard/BulletinBoardCell.swift

@@ -60,10 +60,11 @@ private struct NormalBoardCell: View {
                 board: board,
                 like: like
             )
+            .padding(.top, 16)
             .padding(.horizontal, 16)
 
             Divider()
-                .padding(.top, 16)
+                .padding(.top, 24)
         }
         .background(Background.first)
     }
@@ -158,7 +159,7 @@ private struct ContentView: View {
                     board: board,
                     like: like
                 )
-                .padding(.top, 12)
+                .padding(.top, 16)
                 .disabled(board.isReported)
             }
         }

Qapple/Qapple/SourceCode/Feature/3.BulletinBoard/3-1.BulletinBoard/BulletinBoardFeature.swift

@@ -16,13 +16,15 @@ struct BulletinBoardFeature {
         @Presents var alert: AlertState<Action.Alert>?
         var bulletinBoardList: [BulletinBoard] = []
         var todayQuestion: Question = .initialState
+        var event: AcademyEventFor4th = .fourthStart
         var paginationInfo = QappleAPI.PaginationInfo(threshold: "", hasNext: false)
         var isLoading: Bool = false
         var isFirstLaunch = true
     }
 
     enum Action {
         case onAppear
+        case active
         case refresh
         case pagination
         case bulletinBoardListResponse(Question, [BulletinBoard], QappleAPI.PaginationInfo)
@@ -61,9 +63,12 @@ struct BulletinBoardFeature {
     @Dependency(\.bulletinBoardRepository) var bulletinBoardRepository
 
     var body: some ReducerOf<Self> {
-        Reduce { state,action in
+        Reduce { state, action in
             switch action {
-            case .onAppear, .refresh:
+            case .onAppear, .active, .refresh:
+                if let currentEvent = AcademyEventFor4th.currentEvent {
+                    state.event = currentEvent
+                }
                 return .run { [isFirstLaunch = state.isFirstLaunch] send in
                     if isFirstLaunch { await send(.toggleLoading(true), animation: .bouncy) }
                     do {

Qapple/Qapple/SourceCode/Feature/3.BulletinBoard/3-1.BulletinBoard/BulletinBoardView.swift

@@ -12,6 +12,8 @@ import ComposableArchitecture
 
 struct BulletinBoardView: View {
 
+    @Environment(\.scenePhase) private var scenePhase
+
     @Bindable var store: StoreOf<BulletinBoardFeature>
 
     var body: some View {
@@ -22,7 +24,11 @@ struct BulletinBoardView: View {
                 .padding(.bottom, 20)
         }
         .background(.first)
-
+        .onChange(of: scenePhase) { _, newPhase in
+            if newPhase == .active {
+                store.send(.active)
+            }
+        }
         .onAppear{
             store.send(.onAppear)
         }
@@ -67,7 +73,7 @@ private struct BulletinBoardContentView: View {
             Button {
                 store.send(.academyDayCounterTapped)
             } label: {
-                QPAcademyDayCounter()
+                QPAcademyDayCounter(event: store.event)
                     .padding(.top, 8)
                     .padding(.horizontal, 16)
             }

Qapple/Qapple/SourceCode/Feature/4.Comment/CommentCell.swift → Qapple/Qapple/SourceCode/Feature/3.BulletinBoard/3-4.BoardComment/BoardCommentCell.swift

@@ -1,13 +1,13 @@
 //
-//  CommentCell.swift
+//  BoardCommentCell.swift
 //  Qapple
 //
 //  Created by 문인범 on 1/21/25.
 //
 
 import SwiftUI
 
-struct CommentCell: View {
+struct BoardCommentCell: View {
     let comment: BoardComment
     let like: () -> Void
     let delete: () -> Void
@@ -272,7 +272,7 @@ private struct CommentReportButton: View {
         anonymityId: 2
     )
 
-    CommentCell(
+    BoardCommentCell(
         comment: comment,
         like: {},
         delete: {},

Qapple/Qapple/SourceCode/Feature/4.Comment/CommentFeature.swift → Qapple/Qapple/SourceCode/Feature/3.BulletinBoard/3-4.BoardComment/BoardCommentFeature.swift

@@ -1,5 +1,5 @@
 //
-//  CommentFeature.swift
+//  BoardCommentFeature.swift
 //  Qapple
 //
 //  Created by 문인범 on 1/21/25.
@@ -9,7 +9,7 @@ import Foundation
 import ComposableArchitecture
 
 @Reducer
-struct CommentFeature {
+struct BoardCommentFeature {
     @ObservableState
     struct State: Equatable {
         var board: BulletinBoard
@@ -273,7 +273,7 @@ struct CommentFeature {
 
 // MARK: - BulletinBoardSheet
 
-extension CommentFeature {
+extension BoardCommentFeature {
     @Reducer(state: .equatable)
     enum Sheet {
         case seeMore(SeeMoreSheetFeature)
@@ -282,7 +282,7 @@ extension CommentFeature {
 
 // MARK: - CommentAlert
 
-extension AlertState where Action == CommentFeature.Action.Alert {
+extension AlertState where Action == BoardCommentFeature.Action.Alert {
     static func confirmDeletion(_ boardCommentId: Int) -> Self {
         return Self {
             TextState("정말로 댓글을 삭제하시겠습니까?")
@@ -305,7 +305,7 @@ extension AlertState where Action == CommentFeature.Action.Alert {
     }
 }
 
-extension CommentFeature {
+extension BoardCommentFeature {
     // 이름을 익명화 해주는 method
     private func anonymizeCommentList(_ BoardWriterId: Int, _ commentList: [BoardComment]) -> [BoardComment] {
         var anonymousArray: [Int: Int] = [:]