Merge pull request #90 from YAPP-Github/TNT-254-commonQA

[TNT-254] commonQA 완료
YAPP-Github · Feb 14, 2025 · d64f873 · d64f873
2 parents 6dd9995 + 4766ef8
commit d64f873
Show file tree

Hide file tree

Showing 37 changed files with 414 additions and 199 deletions.
diff --git a/TnT/Projects/DesignSystem/Sources/Button/TBottomButton.swift b/TnT/Projects/DesignSystem/Sources/Button/TBottomButton.swift
@@ -33,13 +33,13 @@ public struct TBottomButton: View {
     }
 
     public var body: some View {
-        Button(title) {
-            action()
+        Button(action: { action() }) {
+            Text(title)
+                .typographyStyle(.heading4, with: isEnable ? ButtonState.true.textColor : ButtonState.false.textColor)
+                .padding(.vertical, 20)
+                .frame(maxWidth: .infinity)
+                .background(isEnable ? ButtonState.true.background : ButtonState.false.background)
         }
-        .typographyStyle(.heading4, with: isEnable ? ButtonState.true.textColor : ButtonState.false.textColor)
-        .padding(.vertical, 20)
-        .frame(maxWidth: .infinity)
-        .background(isEnable ? ButtonState.true.background : ButtonState.false.background)
     }
 }
 

diff --git a/TnT/Projects/DesignSystem/Sources/Components/DatePickerView/TDatePickerView.swift b/TnT/Projects/DesignSystem/Sources/Components/DatePickerView/TDatePickerView.swift
@@ -11,6 +11,8 @@ import SwiftUI
 /// - 날짜 선택할 수 있는 DatePicker View
 public struct TDatePickerView: View {
 
+    /// 커스텀/시스템 캘린더 선택
+    private let calendarType: CalendarType
     /// picker 제목
     private let title: String
     /// 버튼 실행 action
@@ -20,25 +22,29 @@ public struct TDatePickerView: View {
     /// 선택 날짜
     @State private var selectedDate: Date = .now
     /// 표시 날짜
-    @State private var currentDate: Date = .now
+    @State private var currentPageDate: Date = .now
 
     @Environment(\.dismiss) var dismiss
 
     /// `TDatePickerView` 생성자
     /// - Parameters:
+    ///   - calendarType: 시스템 캘린더 / 커스텀 캘린더 선택 (기본값: 커스텀)
     ///   - selectedDate: 초기 선택 날짜 (기본값: 현재 날짜)
     ///   - title: DatePicker의 제목
     ///   - buttonAction: 날짜 선택 후 실행할 액션
     public init(
+        calendarType: CalendarType = .custom,
         selectedDate: Date = .now,
         title: String,
         monthFormatter: @escaping (Date) -> String,
         buttonAction: @escaping (Date) -> Void
     ) {
+        self.calendarType = calendarType
         self.selectedDate = selectedDate
         self.title = title
         self.monthFormatter = monthFormatter
         self.buttonAction = buttonAction
+        currentPageDate = selectedDate
     }
 
     public var body: some View {
@@ -59,28 +65,59 @@ public struct TDatePickerView: View {
             }
             .padding(20)
 
+            Calendar(calendarType)
+
+            TButton(
+                title: "확인",
+                config: .large,
+                state: .default(.primary(isEnabled: true)),
+                action: {
+                    buttonAction(selectedDate)
+                }
+            )
+            .padding(20)
+        }
+    }
+
+    @ViewBuilder
+    private func Calendar(_ calendarType: CalendarType) -> some View {
+        switch calendarType {
+        case .custom:
             TCalendarHeader<EmptyView>(
-                currentPage: $currentDate,
+                currentPage: $currentPageDate,
                 formatter: monthFormatter
             )
             .padding(.top, 20)
 
             TCalendarView(
                 selectedDate: $selectedDate,
-                currentPage: $currentDate,
+                currentPage: $currentPageDate,
                 mode: .compactMonth
             )
             .padding(.horizontal, 16)
-
-            TButton(
-                title: "확인",
-                config: .large,
-                state: .default(.primary(isEnabled: true)),
-                action: {
-                    buttonAction(selectedDate)
+        case let .system(range):
+            Group {
+                if let range {
+                    DatePicker(title, selection: $selectedDate, in: range, displayedComponents: .date)
+                        .datePickerStyle(GraphicalDatePickerStyle())
+                        .environment(\.locale, Locale(identifier: "ko_KR"))
+
+                } else {
+                    DatePicker(title, selection: $selectedDate, displayedComponents: .date)
+                        .datePickerStyle(GraphicalDatePickerStyle())
+                        .environment(\.locale, Locale(identifier: "ko_KR"))
                 }
-            )
-            .padding(20)
+            }
+            .tint(.red400)
+            .padding(.top, 20)
+            .padding(.horizontal, 16)
         }
     }
 }
+
+public extension TDatePickerView {
+    enum CalendarType {
+        case system(in: PartialRangeThrough<Date>? = nil)
+        case custom
+    }
+}
diff --git a/TnT/Projects/Domain/Sources/Entity/ConnectedTraineeProfileEntity.swift b/TnT/Projects/Domain/Sources/Entity/ConnectedTraineeProfileEntity.swift
@@ -17,9 +17,9 @@ public struct ConnectedTraineeProfileEntity: Equatable, Sendable {
     /// 나이
     public let age: Int?
     /// 키
-    public let height: Double
+    public let height: Double?
     /// 몸무게
-    public let weight: Double
+    public let weight: Double?
     /// PT 목표
     public let ptGoal: String
     /// 주의 사항
@@ -29,8 +29,8 @@ public struct ConnectedTraineeProfileEntity: Equatable, Sendable {
         traineeName: String,
         imageUrl: String,
         age: Int?,
-        height: Double,
-        weight: Double,
+        height: Double?,
+        weight: Double?,
         ptGoal: String,
         cautionNote: String?
     ) {

diff --git a/TnT/Projects/Domain/Sources/Mapper/TrainerMapper.swift b/TnT/Projects/Domain/Sources/Mapper/TrainerMapper.swift
@@ -10,12 +10,14 @@ import Foundation
 
 public extension ConnectTraineeInfoDTO {
     func toEntity() -> ConnectedTraineeProfileEntity {
+        let height = self.height == 0 ? nil : self.height
+        let weight = self.weight == 0 ? nil : self.weight
         return .init(
             traineeName: self.traineeName,
             imageUrl: self.traineeProfileImageUrl,
             age: self.age,
-            height: self.height,
-            weight: self.weight,
+            height: height,
+            weight: weight,
             ptGoal: self.ptGoal,
             cautionNote: self.cautionNote
         )

diff --git a/TnT/Projects/Domain/Sources/Policy/AppLinks.swift b/TnT/Projects/Domain/Sources/Policy/AppLinks.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 public enum AppLinks {
-    public static let termsOfService: String = "https://yapp25thteam.com/terms"
-    public static let privacyPolicy: String = "https://yapp25thteam.com/privacy"
-    public static let openSourceLicense: String = "https://yapp25thteam.com/license"
+    public static let termsOfService: String = "https://www.notion.so/f1ee7a43b6d941068723163fda127699?pvs=4"
+    public static let privacyPolicy: String = "https://www.notion.so/775bc037dd1b4e8ba56679e51a7321e5?pvs=4"
+    public static let openSourceLicense: String = "https://www.notion.so/197cabde9e4b800d8e8ec6c22d343b32?pvs=4"
 }
diff --git a/TnT/Projects/Domain/Sources/Policy/UserPolicy.swift b/TnT/Projects/Domain/Sources/Policy/UserPolicy.swift
@@ -22,17 +22,17 @@ struct UserPolicy {
         isRequired: false
     )
 
-    /// 키 입력 검증 (정수 3자리, 필수)
+    /// 키 입력 검증 (정수 3자리)
     static let heightInput: PolicyInputInfo = .init(
         textValidation: { TextValidator.isValidInput($0, maxLength: 3, regexPattern: #"^\d{3}$"#) },
-        isRequired: true
+        isRequired: false
     )
 
-    /// 몸무게 입력 검증 (정수 3자리 + 소수점 1자리, 필수)
+    /// 몸무게 입력 검증 (정수 3자리 + 소수점 1자리)
     /// 정수 최소 2자리 이상, 소수점 1자리까지만
     static let weightInput: PolicyInputInfo = .init(
         textValidation: { TextValidator.isValidInput($0, maxLength: 5, regexPattern: #"^\d{2,3}(\.\d{1})?$"#) },
-        isRequired: true
+        isRequired: false
     )
 
     /// 주의사항 최대 길이 제한 (공백 포함)

diff --git a/TnT/Projects/Presentation/Sources/AddDietRecord/TraineeAddDietRecordView.swift b/TnT/Projects/Presentation/Sources/AddDietRecord/TraineeAddDietRecordView.swift
@@ -36,6 +36,8 @@ public struct TraineeAddDietRecordView: View {
                 ),
                 leftAction: { send(.tapNavBackButton) }
             )
+            TDivider(color: .neutral200)
+
             ScrollView {
                 VStack(alignment: .leading, spacing: 8) {
                     DietPhotoSection()
@@ -57,22 +59,24 @@ public struct TraineeAddDietRecordView: View {
         .onTapGesture { focusedField = nil }
         .navigationBarBackButtonHidden()
         .keyboardDismissOnTap()
-        .safeAreaInset(edge: .bottom) {
-            if store.view_focusField == nil {
-                TButton(
-                    title: "저장",
-                    config: .xLarge,
-                    state: .default(.primary(isEnabled: store.view_isSubmitButtonEnabled))
-                ) {
-                    send(.tapSubmitButton)
-                }
-                .padding(.horizontal, 16)
+        .bottomFixWith {
+            TButton(
+                title: "저장",
+                config: .xLarge,
+                state: .default(.primary(isEnabled: store.view_isSubmitButtonEnabled))
+            ) {
+                send(.tapSubmitButton)
             }
+            .padding(.bottom, .safeAreaBottom)
+            .disabled(!store.view_isSubmitButtonEnabled)
+            .debounce()
+            .padding(.horizontal, 16)
         }
         .sheet(item: $store.view_bottomSheetItem) { item in
             switch item {
             case .datePicker(let field):
                 TDatePickerView(
+                    selectedDate: store.dietDate ?? .now,
                     title: field.title,
                     monthFormatter: { TDateFormatUtility.formatter(for: .yyyy년_MM월).string(from: $0) },
                     buttonAction: {
@@ -82,9 +86,9 @@ public struct TraineeAddDietRecordView: View {
                 .autoSizingBottomSheet(presentationDragIndicator: .hidden)
             case .timePicker(let field):
                 TTimePickerView(
-                    selectedTime: store.dietDate ?? .now,
+                    selectedTime: store.dietTime ?? .now,
                     title: field.title,
-                    minuteStep: 10,
+                    minuteStep: 1,
                     buttonAction: {
                         send(.tapBottomSheetSubmitButton(field, $0))
                     }
@@ -163,7 +167,7 @@ public struct TraineeAddDietRecordView: View {
     @ViewBuilder
     private func DietDateSection() -> some View {
         TTextField(
-            placeholder: "2025/11/19",
+            placeholder: Date().toString(format: .yyyyMMddSlash),
             text: Binding(get: {
                 store.dietDate?.toString(format: .yyyyMMddSlash) ?? ""
             }, set: { _ in }),
@@ -185,7 +189,7 @@ public struct TraineeAddDietRecordView: View {
     @ViewBuilder
     private func DietTimeSection() -> some View {
         TTextField(
-            placeholder: "09:00",
+            placeholder: Date().toString(format: .HHmm),
             text: Binding(get: {
                 store.dietTime?.toString(format: .HHmm) ?? ""
             }, set: { _ in }),

diff --git a/TnT/Projects/Presentation/Sources/AddPTSession/TrainerAddPTSessionView.swift b/TnT/Projects/Presentation/Sources/AddPTSession/TrainerAddPTSessionView.swift
@@ -36,6 +36,7 @@ public struct TrainerAddPTSessionView: View {
                 leftAction: { send(.tapNavBackButton) }
             )
             TDivider(height: 1, color: .neutral200)
+
             ScrollView {
                 VStack(alignment: .leading, spacing: 0) {
                     Header()
@@ -62,19 +63,20 @@ public struct TrainerAddPTSessionView: View {
                 .padding(.bottom, .safeAreaBottom + 20)
             }
         }
+        .bottomFixWith {
+            TBottomButton(
+                title: "완료",
+                isEnable: store.view_isSubmitButtonEnabled
+            ) {
+                send(.tapSubmitButton)
+            }
+            .padding(.bottom, .safeAreaBottom)
+            .disabled(!store.view_isSubmitButtonEnabled)
+            .debounce()
+        }
         .onTapGesture { focusedField = nil }
         .navigationBarBackButtonHidden()
         .keyboardDismissOnTap()
-        .safeAreaInset(edge: .bottom) {
-            if store.view_focusField == nil {
-                TBottomButton(
-                    title: "완료",
-                    isEnable: store.view_isSubmitButtonEnabled
-                ) {
-                    send(.tapSubmitButton)
-                }
-            }
-        }
         .sheet(item: $store.view_bottomSheetItem) { item in
             switch item {
             case .traineeList:
@@ -86,6 +88,7 @@ public struct TrainerAddPTSessionView: View {
                 )
             case .datePicker(let field):
                 TDatePickerView(
+                    selectedDate: store.ptDate ?? .now,
                     title: field.title,
                     monthFormatter: { TDateFormatUtility.formatter(for: .yyyy년_MM월).string(from: $0) },
                     buttonAction: {
@@ -196,7 +199,7 @@ public struct TrainerAddPTSessionView: View {
         HStack(alignment: .bottom, spacing: 12) {
             // StartTime
             TTextField(
-                placeholder: "09:00",
+                placeholder: Date().toString(format: .HHmm),
                 text: Binding(get: {
                     store.startTime?.toString(format: .HHmm) ?? ""
                 }, set: { _ in }),
@@ -227,7 +230,7 @@ public struct TrainerAddPTSessionView: View {
 
             // EndTime
             TTextField(
-                placeholder: "10:00",
+                placeholder: Date().addingTimeInterval(3600).toString(format: .HHmm),
                 text: Binding(get: {
                     store.endTime?.toString(format: .HHmm) ?? ""
                 }, set: { _ in }),

diff --git a/TnT/Projects/Presentation/Sources/Alarm/AlarmCheckView.swift b/TnT/Projects/Presentation/Sources/Alarm/AlarmCheckView.swift
@@ -12,7 +12,7 @@ import ComposableArchitecture
 import Domain
 import DesignSystem
 
-/// 알람 목록을 입력하는 화면
+/// 알람 목록을 확인하는 화면
 /// 유저에게 도착한 알람을 표시 - 유저 타입에 따라 분류
 @ViewAction(for: AlarmCheckFeature.self)
 public struct AlarmCheckView: View {
@@ -30,6 +30,7 @@ public struct AlarmCheckView: View {
                 type: .LButtonWithTitle(leftImage: .icnArrowLeft, centerTitle: "알림"),
                 leftAction: { send(.tapNavBackButton) }
             )
+            TDivider(color: .neutral200)
 
             ScrollView(showsIndicators: false) {
                 AlarmList()

diff --git a/TnT/Projects/Presentation/Sources/Coordinator/OnboardingFlow/OnboardingFlowFeature.swift b/TnT/Projects/Presentation/Sources/Coordinator/OnboardingFlow/OnboardingFlowFeature.swift
@@ -103,7 +103,7 @@ public struct OnboardingFlowFeature {
 
                 /// 트레이니 회원가입 완료 화면 -> 트레이너 초대코드 입력 화면 이동
                 case .element(id: _, action: .traineeProfileCompletion(.setNavigating)):
-                    state.path.append(.traineeInvitationCodeInput(.init(view_popUp: .invitePopUp, view_isPopupPresented: true)))
+                    state.path.append(.traineeInvitationCodeInput(.init()))
                     return .none
 
                 /// 트레이니 초대코드 입력 화면 -> 트레이니 홈화면/PT 정보 입력 화면

diff --git a/TnT/Projects/Presentation/Sources/Coordinator/TraineeMainFlow/TraineeMainFlowFeature.swift b/TnT/Projects/Presentation/Sources/Coordinator/TraineeMainFlow/TraineeMainFlowFeature.swift
@@ -89,14 +89,14 @@ public struct TraineeMainFlowFeature {
 
                     /// 식단 기록 화면 등록 -> 홈화면으로 이동
                 case .element(id: _, action: .addDietRecordPage(.setNavigating)):
-                    state.path.removeLast()
+                    state.path.removeSubrange(1...)
                     return .none
 
                     /// 마이페이지 초대코드 입력화면 다음 버튼 탭 - > PT 정보 입력 화면 or 홈 이동
                 case .element(_, action: .traineeInvitationCodeInput(.setNavigating(let screen))):
                     switch screen {
                     case .traineeHome:
-                        state.path.removeLast()
+                        state.path.removeSubrange(1...)
                     case let .trainingInfoInput(trainerName, invitationCode):
                         state.path.append(.traineeTrainingInfoInput(.init(trainerName: trainerName, invitationCode: invitationCode)))
                     }
@@ -119,7 +119,7 @@ public struct TraineeMainFlowFeature {
 
                     /// 연결 완료 화면 -> 홈으로 이동
                 case .element(id: _, action: .traineeConnectionComplete(.setNavigating)):
-                    state.path.removeLast(2)
+                    state.path.removeSubrange(1...)
                     return .none
 
                 default: