Merge pull request #161 from YAPP-Github/fix/#159

fix: 알려진 UI 이슈 수정

Author: clxxrlove

Projects/Feature/Home/Sources/Goal/MakeGoalView.swift

@@ -42,16 +42,13 @@ struct MakeGoalView: View {
         .toolbar(.hidden, for: .navigationBar)
         .onAppear { store.send(.onAppear) }
         .onDisappear { store.send(.onDisappear) }
-        .txBottomSheet(
-            isPresented: $store.isCalendarSheetPresented
-        ) {
-            TXCalendarBottomSheet(
-                selectedDate: $store.calendarSheetDate,
-                completeButtonText: "완료",
-                onComplete: { store.send(.monthCalendarConfirmTapped) },
-                isDateEnabled: store.isCalendarDateEnabled
-            )
-        }
+        .calendarSheet(
+            isPresented: $store.isCalendarSheetPresented,
+            selectedDate: $store.calendarSheetDate,
+            completeButtonText: "완료",
+            onComplete: { store.send(.monthCalendarConfirmTapped) },
+            isDateEnabled: store.isCalendarDateEnabled
+        )
         .txBottomSheet(
             isPresented: $store.isPeriodSheetPresented
         ) {

Projects/Feature/Home/Sources/Home/HomeView.swift

@@ -70,15 +70,12 @@ public struct HomeView: View {
         .transaction { transaction in
             transaction.disablesAnimations = false
         }
-        .txBottomSheet(
-            isPresented: $store.isCalendarSheetPresented
-        ) {
-            TXCalendarBottomSheet(
-                selectedDate: $store.calendarSheetDate,
-                completeButtonText: "완료",
-                onComplete: { store.send(.monthCalendarConfirmTapped) }
-            )
-        }
+        .calendarSheet(
+            isPresented: $store.isCalendarSheetPresented,
+            selectedDate: $store.calendarSheetDate,
+            completeButtonText: "완료",
+            onComplete: { store.send(.monthCalendarConfirmTapped) }
+        )
         .txModal(
             item: $store.modal,
             onAction: { action in

Projects/Feature/MainTab/Sources/Reducer/MainTabReducer.swift

@@ -44,7 +44,9 @@ public struct MainTabReducer {
         public var home = HomeCoordinator.State()
         public var selectedTab: TXTabItem = .home
         public var isTabBarHidden: Bool = false
-        
+        // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
+        public var settings = SettingsReducer.State(showBackButton: false)
+
         /// 기본 상태를 생성합니다.
         ///
         /// ## 사용 예시
@@ -65,14 +67,12 @@ public struct MainTabReducer {
 
         // MARK: - Child Action
         case home(HomeCoordinator.Action)
+        // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
+        case settings(SettingsReducer.Action)
 
         // MARK: - User Action
         case selectedTabChanged(TXTabItem)
 
-        // MARK: - Temporary Settings Access
-        // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
-        case showSettings
-
         // MARK: - Delegate
         case delegate(Delegate)
 
@@ -93,7 +93,7 @@ public struct MainTabReducer {
 
     public var body: some ReducerOf<Self> {
         BindingReducer()
-        
+
         Scope(state: \.home, action: \.home) {
             let proofPhotoReducer = ProofPhotoReducer()
             HomeCoordinator(
@@ -105,26 +105,26 @@ public struct MainTabReducer {
             )
         }
 
+        // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
+        Scope(state: \.settings, action: \.settings) {
+            SettingsReducer()
+        }
+
         Reduce { state, action in
             switch action {
                 // MARK: - User Action
             case .selectedTabChanged:
                 switch state.selectedTab {
                 case .home:
                     state.isTabBarHidden = !state.home.routes.isEmpty
+                        || state.home.home.isCalendarSheetPresented
 
                 case .statistics, .couple, .settings:
                     state.isTabBarHidden = false
                 }
                 return .none
 
-            // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
-            case .showSettings:
-                state.home.settings = SettingsReducer.State()
-                state.home.isSettingsPresented = true
-                return .none
-
-                // MARK: - Child Action
+                // MARK: - Child Action (Home)
             case .home(.delegate(.logoutCompleted)):
                 return .send(.delegate(.logoutCompleted))
 
@@ -134,20 +134,31 @@ public struct MainTabReducer {
             case .home(.delegate(.sessionExpired)):
                 return .send(.delegate(.sessionExpired))
 
-            // FIXME: 삭제 예정 - 설정 탭 제거 시 함께 제거
-            case .home(.settingsDismissed):
-                // 설정 화면이 닫히면 홈 탭으로 복귀
-                if state.selectedTab == .settings {
-                    state.selectedTab = .home
-                }
-                return .none
-
             case .home:
                 if state.selectedTab == .home {
                     state.isTabBarHidden = !state.home.routes.isEmpty
+                        || state.home.home.isCalendarSheetPresented
                 }
                 return .none
 
+                // MARK: - Child Action (Settings)
+                // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
+            case .settings(.delegate(.logoutCompleted)):
+                return .send(.delegate(.logoutCompleted))
+
+            case .settings(.delegate(.withdrawCompleted)):
+                return .send(.delegate(.withdrawCompleted))
+
+            case .settings(.delegate(.sessionExpired)):
+                return .send(.delegate(.sessionExpired))
+
+            case .settings(.delegate(.navigateBack)):
+                // 탭에서는 백버튼 동작 무시
+                return .none
+
+            case .settings:
+                return .none
+
             case .delegate:
                 return .none
 

Projects/Feature/MainTab/Sources/View/MainTabView.swift

@@ -12,6 +12,7 @@ import FeatureHome
 import FeatureHomeInterface
 import FeatureGoalDetail
 import FeatureProofPhoto
+import FeatureSettings
 import SharedDesignSystem
 
 /// 메인 탭 화면을 표시하는 View입니다.
@@ -59,13 +60,7 @@ public struct MainTabView: View {
 
             // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
             case .settings:
-                HomeCoordinatorView(store: store.scope(state: \.home, action: \.home))
-            }
-        }
-        .onChange(of: store.selectedTab) { _, newValue in
-            // FIXME: 삭제 예정 - 설정 탭에서 설정 화면 표시
-            if newValue == .settings {
-                store.send(.showSettings)
+                SettingsView(store: store.scope(state: \.settings, action: \.settings))
             }
         }
     }

Projects/Feature/Settings/Interface/Sources/SettingsReducer.swift

@@ -57,6 +57,9 @@ public struct SettingsReducer {
         public var isMarketingPushEnabled: Bool
         public var isNightMarketingPushEnabled: Bool
 
+        // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 제거
+        public var showBackButton: Bool
+
         public static let minLength = 2
         public static let maxLength = 8
         // FIXME: 로컬라이징 지원 이후 해제
@@ -77,7 +80,8 @@ public struct SettingsReducer {
             storeVersion: String = "",
             isPokePushEnabled: Bool = true,
             isMarketingPushEnabled: Bool = false,
-            isNightMarketingPushEnabled: Bool = false
+            isNightMarketingPushEnabled: Bool = false,
+            showBackButton: Bool = true
         ) {
             self.nickname = nickname
             self.originalNickname = nickname
@@ -91,6 +95,7 @@ public struct SettingsReducer {
             self.isPokePushEnabled = isPokePushEnabled
             self.isMarketingPushEnabled = isMarketingPushEnabled
             self.isNightMarketingPushEnabled = isNightMarketingPushEnabled
+            self.showBackButton = showBackButton
         }
     }
 

Projects/Feature/Settings/Sources/Settings/SettingsView.swift

@@ -52,7 +52,8 @@ public struct SettingsView: View {
                     settingsListSection
                         .padding(.horizontal, Spacing.spacing8)
                 }
-                .padding(.top, Spacing.spacing9)
+                // FIXME: 설정 화면 탭바에서 다시 돌릴 때 아래 주석 제거
+//                .padding(.top, Spacing.spacing9)
             }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -81,14 +82,19 @@ public struct SettingsView: View {
 
 private extension SettingsView {
     var navigationBar: some View {
-        TXNavigationBar(style: .subTitle(title: "설정", rightText: "")) { action in
-            switch action {
-            case .backTapped:
-                store.send(.backButtonTapped)
-
-            default:
-                break
+        // FIXME: 삭제 예정 - 설정 화면 진입점 확정 후 showBackButton 조건 제거
+        if store.showBackButton {
+            TXNavigationBar(style: .subTitle(title: "설정", rightText: "")) { action in
+                switch action {
+                case .backTapped:
+                    store.send(.backButtonTapped)
+
+                default:
+                    break
+                }
             }
+        } else {
+            TXNavigationBar(style: .mainTitle(title: "설정"))
         }
     }
 }

Projects/Shared/DesignSystem/Sources/Components/Bar/TabBar/TXTabBar.swift

@@ -37,13 +37,17 @@ struct TXTabBar: View {
 // MARK: - SubViews
 private extension TXTabBar {
     func tabItemView(item: TXTabItem) -> some View {
-        Button {
+        let isSelected = selectedItem == item
+
+        return Button {
             selectedItem = item
         } label: {
             VStack(spacing: Constants.iconLabelSpacing) {
-                item.icon(isSelected: selectedItem == item)
+                item.icon(isSelected: isSelected)
                     .resizable()
                     .frame(width: Constants.iconSize, height: Constants.iconSize)
+                    // FIXME: 삭제 예정 - 설정 탭 선택/비선택 아이콘 추가 후 제거
+                    .opacity(item == .settings && !isSelected ? 0.4 : 1.0)
 
                 Text(item.title)
                     .typography(Constants.labelFont)