[Feat] 트레이니 Home, Mypage - AppStroage-isConnected UI 로직 반영

YAPP-Github · Feb 12, 2025 · eb92309 · eb92309
1 parent 55812a1
commit eb92309
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift
@@ -19,6 +19,8 @@ public struct TraineeHomeFeature {
         // MARK: Data related state
         /// 3일 동안 보지 않기 시작 날짜
         @Shared(.appStorage(AppStorage.hideHomePopupUntil)) var hidePopupUntil: Date?
+        /// 트레이너 연결 여부
+        @Shared(.appStorage(AppStorage.isConnected)) var isConnected: Bool = false
         /// 선택된 날짜
         var selectedDate: Date
         /// 캘린더 이벤트
@@ -29,8 +31,6 @@ public struct TraineeHomeFeature {
         var records: [RecordListItemEntity]
         /// 3일 동안 보지 않기 선택되었는지 여부
         var isHideUntilSelected: Bool
-        /// 트레이너 연결 여부
-        var isConnected: Bool
 
         // MARK: UI related state
         /// 캘린더 표시 페이지
@@ -55,7 +55,6 @@ public struct TraineeHomeFeature {
             sessionInfo: WorkoutListItemEntity? = nil,
             records: [RecordListItemEntity] = [],
             isHideUntilSelected: Bool = false,
-            isConnected: Bool = false,
             view_currentPage: Date = .now,
             view_isBottomSheetPresented: Bool = false,
             view_isPopUpPresented: Bool = false
@@ -65,7 +64,6 @@ public struct TraineeHomeFeature {
             self.sessionInfo = sessionInfo
             self.records = records
             self.isHideUntilSelected = isHideUntilSelected
-            self.isConnected = isConnected
             self.view_currentPage = view_currentPage
             self.view_isBottomSheetPresented = view_isBottomSheetPresented
             self.view_isPopUpPresented = view_isPopUpPresented
@@ -172,11 +170,9 @@ public struct TraineeHomeFeature {
                     return .send(.setNavigating(.traineeInvitationCodeInput))
 
                 case .onAppear:
-                    if let hideUntil = state.hidePopupUntil, hideUntil > Date() {
-                        state.view_isPopUpPresented = false
-                    } else {
-                        state.view_isPopUpPresented = true
-                    }
+                    let hideUntil = state.hidePopupUntil ?? Date()
+                    let hidePopUp = state.isConnected || hideUntil > Date()
+                    state.view_isPopUpPresented = !hidePopUp
                     return .none
                 }
 

diff --git a/TnT/Projects/Presentation/Sources/MyPage/Trainee/TraineeMyPageFeature.swift b/TnT/Projects/Presentation/Sources/MyPage/Trainee/TraineeMyPageFeature.swift
@@ -24,6 +24,8 @@ public struct TraineeMyPageFeature {
         // MARK: Data related state
         /// 3일 동안 보지 않기 시작 날짜
         @Shared(.appStorage(AppStorage.hideHomePopupUntil)) var hidePopupUntil: Date?
+        /// 트레이너 연결 여부
+        @Shared(.appStorage(AppStorage.isConnected)) var isConnected: Bool = false
         /// 사용자 이름
         var userName: String
         /// 사용자 이미지 URL
@@ -240,6 +242,7 @@ public struct TraineeMyPageFeature {
                 }
 
             case .setMyPageInfo(let myPageInfo):
+                state.$isConnected.withLock { $0 = myPageInfo.isConnected }
                 state.userName = myPageInfo.name
                 state.userImageUrl = myPageInfo.profileImageUrl
                 return .none

diff --git a/TnT/Projects/Presentation/Sources/MyPage/Trainee/TraineeMyPageView.swift b/TnT/Projects/Presentation/Sources/MyPage/Trainee/TraineeMyPageView.swift
@@ -70,7 +70,7 @@ public struct TraineeMyPageView: View {
     @ViewBuilder
     private func TopItemSection() -> some View {
         VStack(spacing: 12) {
-            if !store.view_isTrainerConnected {
+            if !store.isConnected {
                 ProfileItemView(title: "트레이너 연결하기", tapAction: { send(.tapConnectTrainerButton) })
                     .padding(.vertical, 4)
                     .background(Color.common0)