Merge pull request #360 from School-of-Company/359-add-not-applicable…

…-lecture-semester

🔀 :: [#359] 강의 학기 변경사항 적용

App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -103,7 +103,7 @@
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "비빅.png",
+      "filename" : "BitgouelIcon.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

App/Sources/Feature/InputLectureFeature/Sources/InputLectureViewModel.swift

@@ -16,7 +16,7 @@ final class InputLectureViewModel: BaseViewModel {
         endDate: Date(),
         lectureDates: [],
         lectureType: "상호학점인정교육과정",
-        credit: 1,
+        credit: 0,
         maxRegisteredUser: 0
     )
 

App/Sources/Feature/LectureDetailSettingFeature/Sources/Component/BottomSheet/SemesterBottomSheet.swift

@@ -10,15 +10,19 @@ struct SemesterBottomSheet: View {
         ScrollView {
             LazyVStack {
                 ForEach(semesterList, id: \.self) { semester in
-                    semesterListRow(
-                        semester: semester.display(),
-                        isSelected: Binding(
-                            get: { semester.rawValue == selectedSemester.rawValue },
-                            set: { _ in semesterDidSelect(semester) }
+                    if semester == .notApplicable {
+                        EmptyView()
+                    } else {
+                        semesterListRow(
+                            semester: semester.display(),
+                            isSelected: Binding(
+                                get: { semester.rawValue == selectedSemester.rawValue },
+                                set: { _ in semesterDidSelect(semester) }
+                            )
                         )
-                    )
-                    .onTapGesture {
-                        semesterDidSelect(semester)
+                        .onTapGesture {
+                            semesterDidSelect(semester)
+                        }
                     }
                 }
             }

App/Sources/Feature/LectureDetailSettingFeature/Sources/Component/PickerTextField.swift

@@ -3,15 +3,18 @@ import SwiftUI
 struct PickerTextField: View {
     var placeholder: String
     var text: String
+    var backgroundColor: Color
     var action: () -> Void
 
     init(
         _ placeholder: String,
         text: String,
+        backgroundColor: Color = .clear,
         action: @escaping () -> Void
     ) {
         self.placeholder = placeholder
         self.text = text
+        self.backgroundColor = backgroundColor
         self.action = action
     }
 
@@ -40,6 +43,7 @@ struct PickerTextField: View {
                 .padding(.vertical, 16)
             }
         }
+        .background(backgroundColor)
         .buttonWrapper(action)
     }
 }

App/Sources/Feature/LectureDetailSettingFeature/Sources/Component/TypeSelectedButton.swift

@@ -21,7 +21,7 @@ struct TypeSelectedButton: View {
                 font: .text1
             )
             .foregroundColor(isSelected ? Color.bitgouel(.greyscale(.g10)) : Color.bitgouel(.greyscale(.g4)))
-            .padding(.horizontal, 16)
+            .padding(.horizontal, 24)
             .padding(.vertical, 8)
             .overlay {
                 RoundedRectangle(cornerRadius: 99)

App/Sources/Feature/LectureDetailSettingFeature/Sources/Component/View/CreditView.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 
 struct CreditView: View {
-    let creditValue: [Int] = [1, 2]
     @Binding var selectedCredit: Int
     let onSelectedCrdit: (Int) -> Void
 
@@ -12,16 +11,16 @@ struct CreditView: View {
                 font: .text1
             )
 
-            HStack(spacing: 16) {
-                ForEach(creditValue, id: \.self) { credit in
-                    TypeSelectedButton(
-                        text: "\(credit)점",
-                        isSelected: Binding(
-                            get: { credit == selectedCredit },
-                            set: { _ in onSelectedCrdit(credit) }
-                        )
-                    )
-                }
+            TextField(
+                "학점 입력",
+                value: $selectedCredit,
+                formatter: NumberFormatter()
+            )
+            .padding(.horizontal, 20)
+            .padding(.vertical, 16)
+            .overlay {
+                RoundedRectangle(cornerRadius: 8)
+                    .strokeBorder(Color.bitgouel(.greyscale(.g7)))
             }
         }
     }

App/Sources/Feature/LectureDetailSettingFeature/Sources/Component/View/SemesterView.swift

@@ -15,14 +15,18 @@ struct SemesterView: View {
 
             PickerTextField(
                 "학기 선택",
-                text: selectedSemester.display()
-            ) {
-                if isShowingSemesterBottomSheet {
-                    onSelectSemester(false)
-                } else {
-                    onSelectSemester(true)
+                text: selectedSemester.display(),
+                backgroundColor: selectedSemester == .notApplicable ? Color.bitgouel(.greyscale(.g8)) : .clear,
+                action: {
+                    guard selectedSemester != .notApplicable else { return }
+
+                    if isShowingSemesterBottomSheet {
+                        onSelectSemester(false)
+                    } else {
+                        onSelectSemester(true)
+                    }
                 }
-            }
+            )
         }
     }
 }

App/Sources/Feature/LectureDetailSettingFeature/Sources/LectureDetailSettingView.swift

@@ -34,23 +34,19 @@ struct LectureDetailSettingView: View {
 
             ScrollView(showsIndicators: false) {
                 VStack(alignment: .leading, spacing: 28) {
-                    SelectEssentialView(isEssential: $viewModel.isEssential) { isEssential in
-                        viewModel.updateIsEssential(isEssential: isEssential)
-                    }
-
-                    SemesterView(
-                        selectedSemester: viewModel.selectedSemester
-                    ) { isShowing in
-                        viewModel.updateIsShowingSemesterBottomSheet(isShowing: isShowing)
-                    }
-
                     LectureTypeView(
                         selectedLectureType: viewModel.selectedLectureType,
                         selectedLectureTypeString: viewModel.lectureTypeString
                     ) { isShowing in
                         viewModel.updateIsShowingLectureTypeBottomSheet(isShowing: isShowing)
                     } onChangeSelectedLectureType: { lectureType in
-                        viewModel.updateLectureTypeString(lectureType: lectureType)
+                        viewModel.updateLectureType(lectureType: lectureType)
+                    }
+
+                    SemesterView(
+                        selectedSemester: viewModel.selectedSemester
+                    ) { isShowing in
+                        viewModel.updateIsShowingSemesterBottomSheet(isShowing: isShowing)
                     }
 
                     DivisionView(
@@ -109,13 +105,17 @@ struct LectureDetailSettingView: View {
                         viewModel.deleteLectureDate(at: index)
                     }
 
-                    CreditView(selectedCredit: $viewModel.selectedCredit) { credit in
-                        viewModel.updateCredit(credit: credit)
+                    if viewModel.selectedLectureType == .mutualCreditRecognitionProgram {
+                        creditView()
                     }
 
                     MaxRegisteredUserView(maxRegisteredUser: $viewModel.selectedMaxRegisteredUser) { maxRegisterUser in
                         viewModel.updateMaxRegisterUser(maxRegisterUser: maxRegisterUser)
                     }
+
+                    SelectEssentialView(isEssential: $viewModel.isEssential) { isEssential in
+                        viewModel.updateIsEssential(isEssential: isEssential)
+                    }
                 }
                 .padding(.bottom, 24)
             }
@@ -174,8 +174,7 @@ struct LectureDetailSettingView: View {
             LectureTypeBottomSheet(
                 selectedLectureType: viewModel.selectedLectureType
             ) { lectureType in
-                viewModel.updateSelectedLectureType(lectureType: lectureType)
-                viewModel.updateLectureTypeString(lectureType: lectureType.rawValue)
+                viewModel.updateLectureType(lectureType: lectureType.rawValue)
             }
         }
         .bitgouelBottomSheet(isShowing: $viewModel.isShowingDivisionBottomSheet) {
@@ -222,4 +221,11 @@ struct LectureDetailSettingView: View {
             hideKeyboard()
         }
     }
+
+    @ViewBuilder
+    func creditView() -> some View {
+        CreditView(selectedCredit: $viewModel.selectedCredit) { credit in
+            viewModel.updateCredit(credit: credit)
+        }
+    }
 }

App/Sources/Feature/LectureDetailSettingFeature/Sources/LectureDetailSettingViewModel.swift

@@ -17,7 +17,7 @@ final class LectureDetailSettingViewModel: BaseViewModel {
     @Published var selectedDivision: String = ""
 
     // MARK: credit
-    @Published var selectedCredit: Int = 1
+    @Published var selectedCredit: Int = 0
 
     // MARK: Line
     @Published var isShowingLineBottomSheet: Bool = false
@@ -94,29 +94,29 @@ final class LectureDetailSettingViewModel: BaseViewModel {
         selectedLectureType = lectureType
     }
 
-    func updateLectureTypeString(lectureType: String) {
+    func updateLectureType(lectureType: String) {
         lectureTypeString = lectureType
-    }
 
-    func updateLectureType(lectureType: String) {
         switch lectureType {
         case "상호학점인정교육과정":
+            if selectedSemester == .notApplicable { updateSemester(semester: .firstYearFallSemester) }
             updateSelectedLectureType(lectureType: .mutualCreditRecognitionProgram)
 
         case "대학탐방프로그램":
             updateSelectedLectureType(lectureType: .universityExplorationProgram)
+            updateSemester(semester: .notApplicable)
 
         case "유관기관프로그램":
+            if selectedSemester == .notApplicable { updateSemester(semester: .firstYearFallSemester) }
             updateSelectedLectureType(lectureType: .governmentProgram)
 
         case "기업산학연계직업체험프로그램":
+            if selectedSemester == .notApplicable { updateSemester(semester: .firstYearFallSemester) }
             updateSelectedLectureType(lectureType: .companyIndustryLinkingJobExperienceProgram)
 
         default:
             updateSelectedLectureType(lectureType: .etc)
         }
-
-        updateLectureTypeString(lectureType: lectureType)
     }
 
     func updateIsShowingLectureTypeBottomSheet(isShowing: Bool) {

Plugin/ConfigurationPlugin/ProjectDescriptionHelpers/Path+XCConfig.swift

@@ -4,6 +4,7 @@ public extension ProjectDescription.Path {
     static func relativeToXCConfig(type: ProjectDeployTarget, name: String) -> Self {
         return .relativeToRoot("XCConfig/\(name)/\(type.rawValue).xcconfig")
     }
+
     static var shared: Self {
         return .relativeToRoot("XCConfig/Shared.xcconfig")
     }

Service/Project.swift

@@ -1,18 +1,18 @@
+import EnvironmentPlugin
 import ProjectDescription
 import ProjectDescriptionHelpers
-import EnvironmentPlugin
 
 let configurations: [Configuration] = generateEnvironment == .ci ?
-[
-  .debug(name: .dev),
-  .debug(name: .stage),
-  .release(name: .prod)
-] :
-[
-  .debug(name: .dev, xcconfig: .relativeToXCConfig(type: .dev, name: "Service")),
-  .debug(name: .stage, xcconfig: .relativeToXCConfig(type: .stage, name: "Service")),
-  .release(name: .prod, xcconfig: .relativeToXCConfig(type: .prod, name: "Service"))
-]
+    [
+        .debug(name: .dev),
+        .debug(name: .stage),
+        .release(name: .prod)
+    ] :
+    [
+        .debug(name: .dev, xcconfig: .relativeToXCConfig(type: .dev, name: "Service")),
+        .debug(name: .stage, xcconfig: .relativeToXCConfig(type: .stage, name: "Service")),
+        .release(name: .prod, xcconfig: .relativeToXCConfig(type: .prod, name: "Service"))
+    ]
 
 let project = Project.dynamicFramwork(
     name: "Service",

Service/Sources/Base/Enum/SemesterType.swift

@@ -5,6 +5,7 @@ public enum SemesterType: String, CaseIterable, Decodable, Encodable {
     case secondYearSpringSemester = "SECOND_YEAR_SPRING_SEMESTER"
     case secondYearFallSemester = "SECOND_YEAR_FALL_SEMESTER"
     case thirdYearSpringSemester = "THIRD_YEAR_SPRING_SEMESTER"
+    case notApplicable = "NOT_APPLICABLE"
 }
 
 public extension SemesterType {
@@ -14,6 +15,7 @@ public extension SemesterType {
         case .secondYearSpringSemester: return "2학년 1학기"
         case .secondYearFallSemester: return "2학년 2학기"
         case .thirdYearSpringSemester: return "3학년 1학기"
+        case .notApplicable: return "해당사항 없음"
         }
     }
 }

ThirdPartyLib/Project.swift

@@ -1,7 +1,7 @@
-import ProjectDescription
-import ProjectDescriptionHelpers
 import DependencyPlugin
 import EnvironmentPlugin
+import ProjectDescription
+import ProjectDescriptionHelpers
 
 let project = Project.dynamicFramwork(
     name: "ThirdPartyLib",

Tuist/Dependencies.swift

@@ -1,5 +1,5 @@
-import ProjectDescription
 import ConfigurationPlugin
+import ProjectDescription
 
 let dependencies = Dependencies(
     carthage: nil,

Tuist/ProjectDescriptionHelpers/DynamicFramwork.swift

@@ -1,6 +1,6 @@
+import EnvironmentPlugin
 import Foundation
 import ProjectDescription
-import EnvironmentPlugin
 
 let isCI = (ProcessInfo.processInfo.environment["TUIST_CI"] ?? "0") == "1" ? true : false
 

Tuist/ProjectDescriptionHelpers/Executable.swift

@@ -1,5 +1,5 @@
-import ProjectDescription
 import EnvironmentPlugin
+import ProjectDescription
 
 public extension Project {
     static func executable(
@@ -18,7 +18,7 @@ public extension Project {
         if configurations.isEmpty {
             configurations = .default
         }
-    
+
         var settings: Settings = .settings(
             base: env.baseSetting,
             configurations: configurations,
@@ -55,7 +55,6 @@ public extension Project {
             )
         ]
 
-
         return Project(
             name: name,
             organizationName: env.organizationName,