merge :: 자습 신청 디테일

Projects/App/Sources/Application/DI/AppComponent.swift

@@ -85,8 +85,8 @@ public extension AppComponent {
     var homeComponent: HomeComponent {
         HomeComponent(parent: self)
     }
-    var applyComponent: ApplyComponent {
-        ApplyComponent(parent: self)
+    var studyRoomDetailComponent: StudyRoomDetailComponent {
+        StudyRoomDetailComponent(parent: self)
     }
     var noticeListComponent: NoticeListComponent {
         NoticeListComponent(parent: self)

Projects/App/Sources/Application/DI/Auth/AppComponent+Auth.swift

@@ -63,6 +63,8 @@ public extension AppComponent {
     }
 
     var logoutUseCase: any LogoutUseCase {
-        LogoutUseCaseImpl(authRepository: authRepository)
+        shared {
+            LogoutUseCaseImpl(authRepository: authRepository)
+        }
     }
 }

Projects/App/Sources/Application/NeedleGenerated.swift

@@ -340,16 +340,30 @@ private class HomeDependency443c4e1871277bd8432aProvider: HomeDependency {
 private func factory67229cdf0f755562b2b1f47b58f8f304c97af4d5(_ component: NeedleFoundation.Scope) -> AnyObject {
     return HomeDependency443c4e1871277bd8432aProvider(appComponent: parent1(component) as! AppComponent)
 }
-private class ApplyDependency468ec8d97f04fe0ebd10Provider: ApplyDependency {
-
-
-    init() {
-
+private class StudyRoomDetailDependency00589e4f8d1416a01b43Provider: StudyRoomDetailDependency {
+    var fetchStudyAvailableTimeUseCase: any FetchStudyAvailableTimeUseCase {
+        return appComponent.fetchStudyAvailableTimeUseCase
+    }
+    var fetchSeatTypesUseCase: any FetchSeatTypesUseCase {
+        return appComponent.fetchSeatTypesUseCase
+    }
+    var fetchDetailStudyRoomUseCase: any FetchDetailStudyRoomUseCase {
+        return appComponent.fetchDetailStudyRoomUseCase
+    }
+    var applyStudyRoomSeatUseCase: any ApplyStudyRoomSeatUseCase {
+        return appComponent.applyStudyRoomSeatUseCase
+    }
+    var cancelStudyRoomSeatUseCase: any CancelStudyRoomSeatUseCase {
+        return appComponent.cancelStudyRoomSeatUseCase
+    }
+    private let appComponent: AppComponent
+    init(appComponent: AppComponent) {
+        self.appComponent = appComponent
     }
 }
-/// ^->AppComponent->ApplyComponent
-private func factory3cbfeafbe8b73941b232e3b0c44298fc1c149afb(_ component: NeedleFoundation.Scope) -> AnyObject {
-    return ApplyDependency468ec8d97f04fe0ebd10Provider()
+/// ^->AppComponent->StudyRoomDetailComponent
+private func factorya36f40c25dcb280bae0ff47b58f8f304c97af4d5(_ component: NeedleFoundation.Scope) -> AnyObject {
+    return StudyRoomDetailDependency00589e4f8d1416a01b43Provider(appComponent: parent1(component) as! AppComponent)
 }
 private class StudyRoomListDependencyef56e26c25d5de596604Provider: StudyRoomListDependency {
     var fetchStudyRoomListUseCase: any FetchStudyRoomListUseCase {
@@ -358,6 +372,9 @@ private class StudyRoomListDependencyef56e26c25d5de596604Provider: StudyRoomList
     var fetchStudyAvailableTimeUseCase: any FetchStudyAvailableTimeUseCase {
         return appComponent.fetchStudyAvailableTimeUseCase
     }
+    var studyRoomDetailComponent: StudyRoomDetailComponent {
+        return appComponent.studyRoomDetailComponent
+    }
     private let appComponent: AppComponent
     init(appComponent: AppComponent) {
         self.appComponent = appComponent
@@ -500,7 +517,7 @@ extension AppComponent: Registration {
         localTable["signupTermsComponent-SignupTermsComponent"] = { self.signupTermsComponent as Any }
         localTable["mainTabComponent-MainTabComponent"] = { self.mainTabComponent as Any }
         localTable["homeComponent-HomeComponent"] = { self.homeComponent as Any }
-        localTable["applyComponent-ApplyComponent"] = { self.applyComponent as Any }
+        localTable["studyRoomDetailComponent-StudyRoomDetailComponent"] = { self.studyRoomDetailComponent as Any }
         localTable["noticeListComponent-NoticeListComponent"] = { self.noticeListComponent as Any }
         localTable["myPageComponent-MyPageComponent"] = { self.myPageComponent as Any }
         localTable["changeProfileComponent-ChangeProfileComponent"] = { self.changeProfileComponent as Any }
@@ -659,15 +676,20 @@ extension HomeComponent: Registration {
         keyPathToName[\HomeDependency.fetchWhetherNewNoticeUseCase] = "fetchWhetherNewNoticeUseCase-any FetchWhetherNewNoticeUseCase"
     }
 }
-extension ApplyComponent: Registration {
+extension StudyRoomDetailComponent: Registration {
     public func registerItems() {
-
+        keyPathToName[\StudyRoomDetailDependency.fetchStudyAvailableTimeUseCase] = "fetchStudyAvailableTimeUseCase-any FetchStudyAvailableTimeUseCase"
+        keyPathToName[\StudyRoomDetailDependency.fetchSeatTypesUseCase] = "fetchSeatTypesUseCase-any FetchSeatTypesUseCase"
+        keyPathToName[\StudyRoomDetailDependency.fetchDetailStudyRoomUseCase] = "fetchDetailStudyRoomUseCase-any FetchDetailStudyRoomUseCase"
+        keyPathToName[\StudyRoomDetailDependency.applyStudyRoomSeatUseCase] = "applyStudyRoomSeatUseCase-any ApplyStudyRoomSeatUseCase"
+        keyPathToName[\StudyRoomDetailDependency.cancelStudyRoomSeatUseCase] = "cancelStudyRoomSeatUseCase-any CancelStudyRoomSeatUseCase"
     }
 }
 extension StudyRoomListComponent: Registration {
     public func registerItems() {
         keyPathToName[\StudyRoomListDependency.fetchStudyRoomListUseCase] = "fetchStudyRoomListUseCase-any FetchStudyRoomListUseCase"
         keyPathToName[\StudyRoomListDependency.fetchStudyAvailableTimeUseCase] = "fetchStudyAvailableTimeUseCase-any FetchStudyAvailableTimeUseCase"
+        keyPathToName[\StudyRoomListDependency.studyRoomDetailComponent] = "studyRoomDetailComponent-StudyRoomDetailComponent"
     }
 }
 extension AuthenticationEmailComponent: Registration {
@@ -720,7 +742,7 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi
 
 #if !NEEDLE_DYNAMIC
 
-private func register1() {
+@inline(never) private func register1() {
     registerProviderFactory("^->AppComponent", factoryEmptyDependencyProvider)
     registerProviderFactory("^->AppComponent->SplashComponent", factoryace9f05f51d68f4c0677f47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->SchoolConfirmationQuestionsComponent", factoryd462667f0418a53210fcf47b58f8f304c97af4d5)
@@ -740,7 +762,7 @@ private func register1() {
     registerProviderFactory("^->AppComponent->RootComponent", factory264bfc4d4cb6b0629b40f47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->SigninComponent", factory2882a056d84a613debccf47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->HomeComponent", factory67229cdf0f755562b2b1f47b58f8f304c97af4d5)
-    registerProviderFactory("^->AppComponent->ApplyComponent", factory3cbfeafbe8b73941b232e3b0c44298fc1c149afb)
+    registerProviderFactory("^->AppComponent->StudyRoomDetailComponent", factorya36f40c25dcb280bae0ff47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->StudyRoomListComponent", factory7451c5364e65ee2d46bbf47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->AuthenticationEmailComponent", factory8798d0becd9d2870112af47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->ChangePasswordComponent", factoryab7c4d87dab53e0a51b9f47b58f8f304c97af4d5)

Projects/Features/ApplyFeature/Sources/Component/StudyRoomListCellView.swift

@@ -0,0 +1,41 @@
+import DesignSystem
+import DomainModule
+import Utility
+import SwiftUI
+
+struct StudyRoomListCellView: View {
+    var studyRoomEntity: StudyRoomEntity
+
+    var body: some View {
+        ZStack {
+            Color.System.surface
+                .cornerRadius(6)
+
+            VStack(alignment: .leading, spacing: 18) {
+                HStack(spacing: 14) {
+                    Text("\(studyRoomEntity.floor)층")
+                        .dmsFont(.body(.body3), color: .System.primary)
+
+                    Text(studyRoomEntity.name)
+                        .dmsFont(.body(.body3), color: .System.backgroundTitle)
+
+                    Spacer()
+
+                    Text("\(studyRoomEntity.inUseHeadcount)/\(studyRoomEntity.totalAvailableSeat)")
+                        .dmsFont(.body(.body3), color: .GrayScale.gray5)
+                }
+
+                Text("\(gradeToString(studyRoomEntity.availableGrade)) \(studyRoomEntity.availableSex.displayString())")
+                    .dmsFont(.body(.body3), color: .System.primary)
+            }
+            .padding(.vertical, 16)
+            .padding(.horizontal, 16)
+        }
+        .frame(height: 68)
+        .dmsShadow(style: .surface)
+    }
+
+    func gradeToString(_ grade: Int) -> String {
+        return grade == 0 ? "전학년" : String(grade) + "학년"
+    }
+}

Projects/Features/ApplyFeature/Sources/StudyRoomNoticeView.swift → Projects/Features/ApplyFeature/Sources/Component/StudyRoomNoticeView.swift

@@ -18,7 +18,7 @@ struct StudyRoomNoticeView: View {
             Spacer()
         }
         .background {
-            Color.GrayScale.gray1
+            Color.System.surface
         }
         .cornerRadius(100)
         .padding(.horizontal, 24)

Projects/Features/ApplyFeature/Sources/StudyRoomDetail/Component/Seat/DMSSeatButton.swift

@@ -0,0 +1,31 @@
+import SwiftUI
+import DataMappingModule
+
+public struct DMSSeatButton: View {
+    var text: String
+    var style: DMSSeatButtonStyle.Style
+    var color: Color
+    var isSelected: Bool
+    var action: () -> Void
+
+    public init(
+        text: String = "",
+        style: DMSSeatButtonStyle.Style = .empty,
+        color: Color = .blue,
+        isSelected: Bool = false,
+        action: @escaping () -> Void = {}
+    ) {
+        self.text = text
+        self.style = style
+        self.color = color
+        self.isSelected = isSelected
+        self.action = action
+    }
+
+    public var body: some View {
+        Button(action: action) {
+            Text(text)
+        }
+        .buttonStyle(DMSSeatButtonStyle(style: style, color: color, isSelected: isSelected))
+    }
+}

Projects/Features/ApplyFeature/Sources/StudyRoomDetail/Component/Seat/DMSSeatButtonStyle.swift

@@ -0,0 +1,110 @@
+import SwiftUI
+import DataMappingModule
+
+public struct DMSSeatButtonStyle: ButtonStyle {
+    public enum Style {
+        case available
+        case unavailable
+        case inUse
+        case empty
+    }
+    var style: Style
+    var color: Color
+    var isSelected: Bool
+
+    public func makeBody(configuration: Configuration) -> some View {
+        switch style {
+        case .available:
+            return AnyView(AvailableButton(configuration: configuration, color: color, isSelected: isSelected))
+        case .unavailable:
+            return AnyView(UnAvailableButton(configuration: configuration, color: color))
+        case .inUse:
+            return AnyView(InUseButton(configuration: configuration, color: color))
+        case .empty:
+            return AnyView(EmptyButton())
+        }
+    }
+}
+
+// MARK: - Available
+extension DMSSeatButtonStyle {
+    struct AvailableButton: View {
+        let configuration: ButtonStyle.Configuration
+        let color: Color
+        let isSelected: Bool
+
+        var body: some View {
+            ZStack {
+                if isSelected {
+                    Circle()
+                        .strokeBorder(color)
+                } else {
+                    Circle()
+                        .foregroundColor(color)
+                }
+
+                configuration.label
+                    .dmsFont(.etc(.overline), color: isSelected ? .GrayScale.gray7 : .GrayScale.gray1)
+            }
+            .frame(width: 40, height: 40)
+            .dmsShadow(style: .surface)
+        }
+    }
+}
+
+// MARK: - UnAvailable
+extension DMSSeatButtonStyle {
+    struct UnAvailableButton: View {
+        let configuration: ButtonStyle.Configuration
+        let color: Color
+
+        var body: some View {
+            ZStack {
+                Circle()
+                    .foregroundColor(.GrayScale.gray4)
+
+                Text("불가")
+                    .dmsFont(.etc(.overline), color: .GrayScale.gray1)
+            }
+            .frame(width: 40, height: 40)
+            .dmsShadow(style: .surface)
+
+        }
+    }
+}
+
+// MARK: - InUse
+extension DMSSeatButtonStyle {
+    struct InUseButton: View {
+        let configuration: ButtonStyle.Configuration
+        let color: Color
+
+        var body: some View {
+            ZStack {
+                Circle()
+                    .foregroundColor(color)
+                    .opacity(0.4)
+
+                configuration.label
+                    .dmsFont(.etc(.overline), color: .GrayScale.gray1)
+            }
+            .frame(width: 40, height: 40)
+            .dmsShadow(style: .surface)
+
+        }
+    }
+}
+
+// MARK: - Empty
+extension DMSSeatButtonStyle {
+    struct EmptyButton: View {
+        var body: some View {
+            ZStack {
+                Circle()
+                    .foregroundColor(.clear)
+            }
+            .frame(width: 40, height: 40)
+
+        }
+    }
+}