Merge pull request #55 from YAPP-Github/TNT-208-mainTab

[TNT-208] 트레이너/트레이니 메인 탭 작성

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_feedback_empty.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icn_feedback.svg",
+      "filename" : "icn_feedback_empty.svg",
       "idiom" : "universal"
     }
   ],

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_home_empty.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icn_home.svg",
+      "filename" : "icn_home_empty.svg",
       "idiom" : "universal"
     }
   ],

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_list_empty.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icn_list.svg",
+      "filename" : "icn_list_empty.svg",
       "idiom" : "universal"
     }
   ],

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_mypage_empty.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icn_mypage.svg",
+      "filename" : "icn_mypage_empty.svg",
       "idiom" : "universal"
     }
   ],

TnT/Projects/DesignSystem/Sources/Button/TMainTabButton.swift

@@ -0,0 +1,48 @@
+//
+//  TMainTabButton.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 2/5/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+
+/// TnT 앱 내에서 바텀 탭에 사용되는 버튼 컴포넌트 입니다
+public struct TMainTabButton: View {
+    let unselectedIcon: ImageResource
+    let selectedIcon: ImageResource
+    let text: String
+    let isSelected: Bool
+    let action: () -> Void
+
+    public init(
+        unselectedIcon: ImageResource,
+        selectedIcon: ImageResource,
+        text: String,
+        isSelected: Bool,
+        action: @escaping () -> Void
+    ) {
+        self.unselectedIcon = unselectedIcon
+        self.selectedIcon = selectedIcon
+        self.text = text
+        self.isSelected = isSelected
+        self.action = action
+    }
+
+    public var body: some View {
+        Button(action: action) {
+            VStack(spacing: 4) {
+                Image(isSelected ? selectedIcon : unselectedIcon)
+                    .resizable()
+                    .frame(width: 24, height: 24)
+                Text(text)
+                    .typographyStyle(
+                        isSelected ? .label2Bold : .label1Medium,
+                        with: isSelected ? .neutral900 : .neutral400
+                    )
+            }
+        }
+        .padding(.vertical, 8)
+    }
+}

TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift

@@ -60,14 +60,14 @@ public struct TraineeHomeFeature {
 
     @Dependency(\.traineeUseCase) private var traineeUseCase: TraineeUseCase
 
-    public enum Action: Sendable, ViewAction {
+    public enum Action: Equatable, Sendable, ViewAction {
         /// 뷰에서 발생한 액션을 처리합니다.
         case view(View)
         /// 네비게이션 여부 설정
-        case setNavigating
+        case setNavigating(RoutingScreen)
 
         @CasePathable
-        public enum View: Sendable, BindableAction {
+        public enum View: Equatable, Sendable, BindableAction {
             /// 바인딩할 액션을 처리
             case binding(BindingAction<State>)
             /// 우측 상단 알림 페이지 보기 버튼 탭
@@ -96,14 +96,11 @@ public struct TraineeHomeFeature {
             case .view(let action):
                 switch action {
                 case .binding(\.selectedDate):
-                    print(state.events[state.selectedDate])
                     return .none
                 case .binding:
                     return .none
                 case .tapAlarmPageButton:
-                    // TODO: 네비게이션 연결 시 추가
-                    print("tapAlarmPageButton")
-                    return .none
+                    return .send(.setNavigating(.alarmPage))
                 case .tapShowSessionRecordButton(let id):
                     // TODO: 네비게이션 연결 시 추가
                     print("tapShowSessionRecordButton \(id)")
@@ -130,3 +127,18 @@ public struct TraineeHomeFeature {
         }
     }
 }
+
+extension TraineeHomeFeature {
+    public enum RoutingScreen: Sendable {
+        /// 알림 페이지
+        case alarmPage
+        /// 수업 기록 상세 페이지
+        case sessionRecordPage
+        /// 기록 피드백 페이지
+        case recordFeedbackPage
+        /// 운동 기록 추가 페이지
+        case addWorkoutRecordPage
+        /// 식단 기록 추가 페이지
+        case addMealRecordPage
+    }
+}

TnT/Projects/Presentation/Sources/Tabbar/TabInfo.swift → TnT/Projects/Presentation/Sources/MainTab/TabBar/TabInfo.swift

@@ -9,13 +9,13 @@
 import SwiftUI
 import DesignSystem
 
-public enum TrainerTabInfo: String, CaseIterable {
+public enum TrainerTabInfo: String, CaseIterable, Equatable, Sendable {
     case home = "홈"
     case feedback = "피드백"
     case traineeList = "회원목록"
-    case mypage = "마이페이지"
+    case mypage = "내 정보"
 
-    var filledIcn: ImageResource {
+    public var filledIcn: ImageResource {
         switch self {
         case .home:
             return .icnHomeFilled
@@ -28,7 +28,7 @@ public enum TrainerTabInfo: String, CaseIterable {
         }
     }
 
-    var emptyIcn: ImageResource {
+    public var emptyIcn: ImageResource {
         switch self {
         case .home:
             return .icnHomeEmpty
@@ -42,9 +42,9 @@ public enum TrainerTabInfo: String, CaseIterable {
     }
 }
 
-public enum TraineeTabInfo: String, CaseIterable {
+public enum TraineeTabInfo: String, CaseIterable, Equatable, Sendable {
     case home = "홈"
-    case mypage = "마이페이지"
+    case mypage = "내 정보"
 
     var filledIcn: ImageResource {
         switch self {

TnT/Projects/Presentation/Sources/MainTab/Trainee/TraineeMainTabFeature.swift

@@ -0,0 +1,106 @@
+//
+//  TraineeMainTabNavigationFeature.swift
+//  Presentation
+//
+//  Created by 박민서 on 2/4/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+import ComposableArchitecture
+
+@Reducer
+public struct TraineeMainTabFeature {
+    @ObservableState
+    public enum State: Equatable {
+        case home(TraineeHomeFeature.State)
+        case myPage(TraineeMyPageFeature.State)
+
+        /// state case와 tabinfo 연결
+        var tabInfo: TraineeTabInfo {
+            switch self {
+            case .home:
+                return .home
+            case .myPage:
+                return .mypage
+            }
+        }
+
+        public init() {
+            self = .home(TraineeHomeFeature.State())
+        }
+    }
+
+    public enum Action: Sendable, ViewAction {
+        /// 뷰에서 일어나는 액션을 처리합니다.
+        case view(View)
+        /// 하위 화면에서 일어나는 액션을 처리합니다
+        case subFeature(SubFeatureAction)
+        /// 화면 네비게이션 설정
+        case setNavigating(RoutingScreen)
+
+        @CasePathable
+        public enum View: Sendable {
+            /// 탭바 선택
+            case selectTab(TraineeTabInfo)
+        }
+
+        @CasePathable
+        public enum SubFeatureAction: Sendable {
+            /// 홈 화면에서 발생하는 액션 처리
+            case homeAction(TraineeHomeFeature.Action)
+            /// 마이페이지 화면에서 발생하는 액션 처리
+            case myPageAction(TraineeMyPageFeature.Action)
+        }
+    }
+
+    public init() {}
+
+    public var body: some ReducerOf<Self> {
+        Reduce { state, action in
+            switch action {
+            case let .view(view):
+                switch view {
+                case .selectTab(let tab):
+                    switch tab {
+                    case .home:
+                        state = .home(.init())
+                        return .none
+                    case .mypage:
+                        state = .myPage(.init())
+                        return .none
+                    }
+                }
+
+            case .subFeature(let internalAction):
+                switch internalAction {
+                case .homeAction(.setNavigating(let screen)):
+                    return .send(.setNavigating(.traineeHome(screen)))
+                case .myPageAction(.setNavigating(let screen)):
+                    return .send(.setNavigating(.traineeMyPage(screen)))
+                default:
+                    return .none
+                }
+
+            case .setNavigating:
+                return .none
+            }
+        }
+        .ifCaseLet(\.home, action: \.subFeature.homeAction) {
+            TraineeHomeFeature()
+        }
+        .ifCaseLet(\.myPage, action: \.subFeature.myPageAction) {
+            TraineeMyPageFeature()
+        }
+    }
+}
+
+extension TraineeMainTabFeature {
+    /// 하위 화면에서 파생되는 라우팅을 전달합니다
+    public enum RoutingScreen: Sendable {
+        /// 트레이니 홈
+        case traineeHome(TraineeHomeFeature.RoutingScreen)
+        /// 트레이니 마이페이지
+        case traineeMyPage(TraineeMyPageFeature.RoutingScreen)
+    }
+}