team-aliens · DSMInhyeKang · Feb 27, 2023 · Feb 15, 2023 · Feb 16, 2023 · Feb 16, 2023
@@ -10,6 +10,8 @@ public extension TargetDependency {
 }
 
 public extension TargetDependency.Project.Features {
+    static let RemainApplyFeature = TargetDependency.feature(name: "RemainApplyFeature")
+    static let StudyRoomFeature = TargetDependency.feature(name: "StudyRoomFeature")
     static let SplashFeature = TargetDependency.feature(name: "SplashFeature")
     static let MyPageFeature = TargetDependency.feature(name: "MyPageFeature")
     static let NoticeFeature = TargetDependency.feature(name: "NoticeFeature")

@@ -8,8 +8,14 @@ let isCI = (ProcessInfo.processInfo.environment["TUIST_CI"] ?? "0") == "1" ? tru
 let settinges: Settings =
     .settings(base: Environment.baseSetting,
               configurations: [
-                .debug(name: .dev, xcconfig: isCI ? nil : .relativeToXCConfig(type: .dev, name: Environment.targetName)),
-                .release(name: .prod, xcconfig: isCI ? nil : .relativeToXCConfig(type: .prod, name: Environment.targetName))
+                .debug(name: .dev, xcconfig: isCI ? nil : .relativeToXCConfig(
+                    type: .dev,
+                    name: Environment.targetName)
+                ),
+                .release(name: .prod, xcconfig: isCI ? nil : .relativeToXCConfig(
+                    type: .prod,
+                    name: Environment.targetName)
+                )
               ],
               defaultSettings: .recommended)
 

@@ -9,6 +9,8 @@ import RenewalPasswordFeature
 import MainTabFeature
 import HomeFeature
 import ApplyFeature
+import StudyRoomFeature
+import RemainApplyFeature
 import MyPageFeature
 import NoticeFeature
 import SplashFeature
@@ -112,4 +114,10 @@ public extension AppComponent {
     var studyRoomListComponent: StudyRoomListComponent {
         StudyRoomListComponent(parent: self)
     }
+    var applyPageComponent: ApplyPageComponent {
+        ApplyPageComponent(parent: self)
+    }
+    var remainApplyComponent: RemainApplyComponent {
+        RemainApplyComponent(parent: self)
+    }
 }
diff --git a/Projects/App/Sources/Application/DMSApp.swift b/Projects/App/Sources/Application/DMSApp.swift
@@ -5,6 +5,8 @@ import FindIDFeature
 import SigninFeature
 import SignupFeature
 import ApplyFeature
+import StudyRoomFeature
+import RemainApplyFeature
 
 @main
 struct DMSApp: App {
@@ -17,6 +19,8 @@ struct DMSApp: App {
         WindowGroup {
             AppComponent().makeRootView()
                 .environmentObject(appState)
+                .environmentObject(StudyRoomStateModel())
+                .environmentObject(RemainStateModel())
         }
     }
 }
@@ -5,6 +5,8 @@ let project = Project.makeModule(
     name: "ApplyFeature",
     product: .staticFramework,
     dependencies: [
-        .Project.Features.BaseFeature
+        .Project.Features.BaseFeature,
+        .Project.Features.StudyRoomFeature,
+        .Project.Features.RemainApplyFeature
     ]
 )
@@ -0,0 +1,19 @@
+import SwiftUI
+import StudyRoomFeature
+import RemainApplyFeature
+import NeedleFoundation
+
+public protocol ApplyPageDependency: Dependency {
+    var studyRoomListComponent: StudyRoomListComponent { get }
+    var remainApplyComponent: RemainApplyComponent { get }
+}
+
+public final class ApplyPageComponent: Component<ApplyPageDependency> {
+    public func makeView() -> some View {
+        ApplyPageView(
+            viewModel: ApplyPageViewModel(),
+            studyRoomListComponent: dependency.studyRoomListComponent,
+            remainApplyComponent: dependency.remainApplyComponent
+        )
+    }
+}
@@ -0,0 +1,94 @@
+import StudyRoomFeature
+import RemainApplyFeature
+import SwiftUI
+
+struct ApplyPageView: View {
+    @StateObject var viewModel: ApplyPageViewModel
+    @EnvironmentObject var studyState: StudyRoomStateModel
+    @EnvironmentObject var remainState: RemainStateModel
+    @Environment(\.tabbarHidden) var tabbarHidden
+    private let studyRoomListComponent: StudyRoomListComponent
+    private let remainApplyComponent: RemainApplyComponent
+
+    init(
+        viewModel: ApplyPageViewModel,
+        studyRoomListComponent: StudyRoomListComponent,
+        remainApplyComponent: RemainApplyComponent
+    ) {
+        _viewModel = StateObject(wrappedValue: viewModel)
+        self.studyRoomListComponent = studyRoomListComponent
+        self.remainApplyComponent = remainApplyComponent
+    }
+
+    var body: some View {
+        NavigationView {
+            VStack {
+                Spacer()
+                    .frame(height: 1)
+
+                ScrollView(showsIndicators: false) {
+                    VStack(spacing: 30) {
+                        Spacer()
+                            .frame(height: 5)
+
+                        applyListCellView(
+                            viewModel: viewModel,
+                            name: "자습실",
+                            content: """
+            자습실 사용이 필요한 경우, 자습실 신청을 통해서 원하는 자리를 신청해 보세요.
+            """,
+                            buttonTitle: "자습실 신청하기",
+                            state: "2층 자습실")
+
+                        applyListCellView(
+                            viewModel: viewModel,
+                            name: "잔류",
+                            content: """
+        주말 기숙사 잔류 여부를 확인하고, 잔류 신청을 통해서 잔류 또는 귀가를 신청해 보세요.
+        """,
+                            buttonTitle: "잔류 신청하기",
+                            state: "금요 귀가")
+                    }
+                    .padding(.horizontal, 24)
+                }
+            }
+            .navigationTitle("신청")
+            .navigationBarTitleDisplayMode(.inline)
+            .dmsBackground()
+            .onChange(of: viewModel.isNavigateToStudy) { newValue in
+                withAnimation {
+                    tabbarHidden.wrappedValue = newValue
+                }
+            }
+            .onChange(of: viewModel.isNavigateToRemain) { newValue in
+                withAnimation {
+                    tabbarHidden.wrappedValue = newValue
+                }
+            }
+            .navigate(
+                to: studyRoomListComponent.makeView(),
+                when: $viewModel.isNavigateToStudy
+            )
+            .navigate(
+                to: remainApplyComponent.makeView(),
+                when: $viewModel.isNavigateToRemain
+            )
+        }
+    }
+
+    @ViewBuilder
+    func applyListCellView(
+        viewModel: ApplyPageViewModel,
+        name: String,
+        content: String,
+        buttonTitle: String,
+        state: String?) -> some View {
+            ApplyListCellView(
+                viewModel: viewModel,
+                name: name,
+                content: content,
+                buttonTitle: buttonTitle,
+                state: state ?? ""
+            )
+        }
+}
@@ -0,0 +1,7 @@
+import BaseFeature
+import Combine
+
+final class ApplyPageViewModel: BaseViewModel {
+    @Published var isNavigateToStudy: Bool = false
+    @Published var isNavigateToRemain: Bool = false
+}
@@ -0,0 +1,61 @@
+import SwiftUI
+import StudyRoomFeature
+import RemainApplyFeature
+import DesignSystem
+
+struct ApplyListCellView: View {
+    @StateObject var viewModel: ApplyPageViewModel
+    @EnvironmentObject var studyState: StudyRoomStateModel
+    @EnvironmentObject var remainState: RemainStateModel
+    var name: String
+    var content: String
+    var buttonTitle: String
+    var state: String
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            HStack {
+                Text(name)
+                    .dmsFont(.title(.title2), color: .GrayScale.gray7)
+                    .frame(height: 32)
+                    .padding(.vertical, 20)
+                    .padding(.leading, 20)
+
+                Spacer()
+
+                Text(name == "자습실" ? studyState.appliedState : remainState.appliedState)
+                    .dmsFont(.etc(.button), color: .PrimaryVariant.primary)
+                    .frame(height: 22)
+                    .padding(.vertical, 6)
+                    .padding(.horizontal, 14)
+                    .background((studyState.appliedState.isEmpty && remainState.appliedState.isEmpty)
+                                ? .clear : Color.PrimaryVariant.lighten2)
+                    .cornerRadius(24)
+                    .padding(.trailing, 16)
+                    .padding(.top, -2)
+            }
+
+            Text(content)
+                .dmsFont(.body(.body3), color: .GrayScale.gray9)
+                .multilineTextAlignment(.leading)
+                .padding(.leading, 20)
+                .padding(.trailing, 29)
+
+            DMSWideButton(
+                text: buttonTitle,
+                color: .PrimaryVariant.primary) {
+                    if name == "자습실" {
+                        viewModel.isNavigateToStudy.toggle()
+                    } else {
+                        viewModel.isNavigateToRemain.toggle()
+                    }
+                }
+                .padding(20)
+        }
+        .environmentObject(studyState)
+        .environmentObject(remainState)
+        .background(Color.System.surface)
+        .cornerRadius(10)
+        .dmsShadow(style: .surface)
+    }
+}
@@ -7,7 +7,7 @@ import MyPageFeature
 
 public protocol MainTabDependency: Dependency {
     var homeComponent: HomeComponent { get }
-    var studyRoomListComponent: StudyRoomListComponent { get }
+    var applyPageComponent: ApplyPageComponent { get }
     var noticeListComponent: NoticeListComponent { get }
     var myPageComponent: MyPageComponent { get }
 }
@@ -16,7 +16,7 @@ public final class MainTabComponent: Component<MainTabDependency> {
     public func makeView() -> some View {
         MainTabView(
             homeComponent: dependency.homeComponent,
-            studyRoomListComponent: dependency.studyRoomListComponent,
+            applyPageComponent: dependency.applyPageComponent,
             noticeComponent: dependency.noticeListComponent,
             myPageComponent: dependency.myPageComponent
         )

@@ -26,18 +26,18 @@ struct MainTabView: View {
     }
 
     private let homeComponent: HomeComponent
-    private let studyRoomListComponent: StudyRoomListComponent
+    private let applyPageComponent: ApplyPageComponent
     private let noticeComponent: NoticeListComponent
     private let myPageComponent: MyPageComponent
 
     init(
         homeComponent: HomeComponent,
-        studyRoomListComponent: StudyRoomListComponent,
+        applyPageComponent: ApplyPageComponent,
         noticeComponent: NoticeListComponent,
         myPageComponent: MyPageComponent
     ) {
         self.homeComponent = homeComponent
-        self.studyRoomListComponent = studyRoomListComponent
+        self.applyPageComponent = applyPageComponent
         self.noticeComponent = noticeComponent
         self.myPageComponent = myPageComponent
         UITabBar.hideTabBar()
@@ -50,7 +50,7 @@ struct MainTabView: View {
                     .tag(TabFlow.home)
 
                 if appState.features.studyRoomService {
-                    studyRoomListComponent.makeView()
+                    applyPageComponent.makeView()
                         .tag(TabFlow.apply)
                 }
 

@@ -7,7 +7,7 @@ struct NoticeDetailView: View {
     @Environment(\.dismiss) var dismiss
 
     var body: some View {
-        ScrollView {
+        ScrollView(showsIndicators: false) {
             VStack {
                 VStack(alignment: .leading, spacing: 0) {
                     Text(viewModel.title)
@@ -29,7 +29,7 @@ struct NoticeDetailView: View {
                     .dmsFont(.body(.body2), color: .GrayScale.gray6)
                     .padding(.top, 24)
 
-                Spacer()
+                Spacer(minLength: 83)
             }
         }
         .dmsToast(isShowing: $viewModel.isErrorOcuured, message: viewModel.errorMessage, style: .error)

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
@@ -0,0 +1,9 @@
+import ProjectDescription
+import ProjectDescriptionHelpers
+
+let project = Project.makeModule(
+    name: "RemainApplyFeature",
+    product: .staticFramework,
+    dependencies: [
+        .Project.Features.BaseFeature
+    ])