diff --git a/Projects/App/Sources/Application/NeedleGenerated.swift b/Projects/App/Sources/Application/NeedleGenerated.swift index c08dff82..d8aef160 100644 --- a/Projects/App/Sources/Application/NeedleGenerated.swift +++ b/Projects/App/Sources/Application/NeedleGenerated.swift @@ -1,5 +1,3 @@ - - import AuthDomain import AuthDomainInterface import BaseDomain @@ -56,7 +54,7 @@ import UserDomain import UserDomainInterface // swiftlint:disable unused_declaration -private let needleDependenciesHash : String? = nil +private let needleDependenciesHash: String? = nil // MARK: - Traversal Helpers @@ -125,7 +123,6 @@ private func factory0f6f456ebf157d02dfb3f47b58f8f304c97af4d5(_ component: Needle } private class InputWorkInfoDependency74441f61366e4e5af9a2Provider: InputWorkInfoDependency { - init() { } @@ -161,7 +158,6 @@ private func factoryc9274e46e78e70f29c54f47b58f8f304c97af4d5(_ component: Needle } private class InputSchoolLifeInfoDependency30edf0903f9bdb7a60fbProvider: InputSchoolLifeInfoDependency { - init() { } @@ -229,7 +225,6 @@ private func factory2882a056d84a613debccf47b58f8f304c97af4d5(_ component: Needle } private class InputMilitaryInfoDependency0cd58f3f7088aec361b6Provider: InputMilitaryInfoDependency { - init() { } @@ -240,7 +235,6 @@ private func factory6e35522c47cca1190471e3b0c44298fc1c149afb(_ component: Needle } private class InputLanguageInfoDependencye83ef16d0fe38d31cb64Provider: InputLanguageInfoDependency { - init() { } @@ -304,7 +298,6 @@ private func factory0b9613d8c923fa9ae897f47b58f8f304c97af4d5(_ component: Needle } private class InputCertificateInfoDependencyd369771b4dc3e8540791Provider: InputCertificateInfoDependency { - init() { } @@ -347,7 +340,6 @@ private func factoryb3d74d9bff60efbc0282f47b58f8f304c97af4d5(_ component: Needle } private class InputPrizeInfoDependencyff32e2191f3500ff4774Provider: InputPrizeInfoDependency { - init() { } @@ -444,7 +436,6 @@ extension JwtStoreComponent: Registration { extension AppComponent: Registration { public func registerItems() { - } } extension KeychainComponent: Registration { @@ -590,7 +581,6 @@ extension UserDomainComponent: Registration { } } - #endif private func factoryEmptyDependencyProvider(_ component: NeedleFoundation.Scope) -> AnyObject { diff --git a/Projects/Core/DesignSystem/Sources/SelectionControls/PressedSelectionControlStyle.swift b/Projects/Core/DesignSystem/Sources/SelectionControls/PressedSelectionControlStyle.swift index 3099b41d..4dcb6135 100644 --- a/Projects/Core/DesignSystem/Sources/SelectionControls/PressedSelectionControlStyle.swift +++ b/Projects/Core/DesignSystem/Sources/SelectionControls/PressedSelectionControlStyle.swift @@ -3,10 +3,6 @@ import SwiftUI internal struct PressedSelectionButtonStyle: ButtonStyle { var isSelected: Bool - init(isSelected: Bool) { - self.isSelected = isSelected - } - @ViewBuilder func makeBody(configuration: Configuration) -> some View { Circle() diff --git a/Projects/Domain/BaseDomain/Sources/RefreshEndpoint/RefreshEndpoint.swift b/Projects/Domain/BaseDomain/Sources/RefreshEndpoint/RefreshEndpoint.swift index e301d88d..2c32d978 100644 --- a/Projects/Domain/BaseDomain/Sources/RefreshEndpoint/RefreshEndpoint.swift +++ b/Projects/Domain/BaseDomain/Sources/RefreshEndpoint/RefreshEndpoint.swift @@ -22,7 +22,7 @@ extension RefreshEndpoint { return .none } - var headers: [String : String]? { + var headers: [String: String]? { switch self { case let .refresh(refreshToken): return [ diff --git a/Projects/Domain/StudentDomain/Interface/Enums/SortType.swift b/Projects/Domain/StudentDomain/Interface/Enums/SortType.swift index 8b04064d..da552cf2 100644 --- a/Projects/Domain/StudentDomain/Interface/Enums/SortType.swift +++ b/Projects/Domain/StudentDomain/Interface/Enums/SortType.swift @@ -16,4 +16,3 @@ public extension SortType { } } } - diff --git a/Projects/Domain/UserDomain/Interface/Error/UserDomainError.swift b/Projects/Domain/UserDomain/Interface/Error/UserDomainError.swift index 0c6d6735..7df04c85 100644 --- a/Projects/Domain/UserDomain/Interface/Error/UserDomainError.swift +++ b/Projects/Domain/UserDomain/Interface/Error/UserDomainError.swift @@ -1,5 +1,5 @@ import Foundation public enum UserDomainError: Error { - + } diff --git a/Projects/Feature/InputLanguageInfoFeature/Sources/Model/LanguageInputModel.swift b/Projects/Feature/InputLanguageInfoFeature/Sources/Model/LanguageInputModel.swift index c6eefa74..66176d52 100644 --- a/Projects/Feature/InputLanguageInfoFeature/Sources/Model/LanguageInputModel.swift +++ b/Projects/Feature/InputLanguageInfoFeature/Sources/Model/LanguageInputModel.swift @@ -3,9 +3,4 @@ import Foundation struct LanguageInputModel: Equatable { let languageName: String let languageScore: String - - init(languageName: String, languageScore: String) { - self.languageName = languageName - self.languageScore = languageScore - } } diff --git a/Projects/Feature/MyPageFeature/Sources/Model/MyPageLanguageModel.swift b/Projects/Feature/MyPageFeature/Sources/Model/MyPageLanguageModel.swift index 44b9b048..d88c4124 100644 --- a/Projects/Feature/MyPageFeature/Sources/Model/MyPageLanguageModel.swift +++ b/Projects/Feature/MyPageFeature/Sources/Model/MyPageLanguageModel.swift @@ -3,11 +3,6 @@ import StudentDomainInterface struct LanguageModel: Equatable { var name: String var score: String - - init(name: String, score: String) { - self.name = name - self.score = score - } } protocol MyPageLanguageInfoStateProtocol { diff --git a/Projects/Feature/MyPageFeature/Sources/Scene/MyPageView.swift b/Projects/Feature/MyPageFeature/Sources/Scene/MyPageView.swift index dbc80892..0224f7c1 100644 --- a/Projects/Feature/MyPageFeature/Sources/Scene/MyPageView.swift +++ b/Projects/Feature/MyPageFeature/Sources/Scene/MyPageView.swift @@ -4,6 +4,7 @@ import DesignSystem struct MyPageView: View { @Environment(\.dismiss) var dismiss + @Environment(\.safeAreaInsets) var safeAreaInsets @StateObject var container: MVIContainer var intent: any MyPageIntentProtocol { container.intent } var state: any MyPageStateProtocol { container.model } @@ -93,12 +94,25 @@ struct MyPageView: View { } } } + + CTAButton(text: "저장") { + #warning("저장 로직 추가") + } + .padding(.horizontal, 20) + .padding(.bottom, safeAreaInsets.bottom + 16) + .background { + Color.sms(.system(.white)) + } + .ignoresSafeArea() } } - .smsBottomSheet(isShowing: Binding( - get: { state.isPresentedExistActionSheet }, - set: { _ in intent.existActionSheetDismissed() } - )) { + .edgesIgnoringSafeArea([.bottom]) + .smsBottomSheet( + isShowing: Binding( + get: { state.isPresentedExistActionSheet }, + set: { _ in intent.existActionSheetDismissed() } + ) + ) { VStack(alignment: .leading, spacing: 32) { Button { intent.logoutDialogIsRequired() diff --git a/Projects/Feature/StudentDetailFeature/Sources/Scene/View/StudentDetailTitleWrapper.swift b/Projects/Feature/StudentDetailFeature/Sources/Scene/View/StudentDetailTitleWrapper.swift index fa5ea63c..a312ed05 100644 --- a/Projects/Feature/StudentDetailFeature/Sources/Scene/View/StudentDetailTitleWrapper.swift +++ b/Projects/Feature/StudentDetailFeature/Sources/Scene/View/StudentDetailTitleWrapper.swift @@ -4,10 +4,6 @@ import SwiftUI struct StudentDetailTitleWrapper: ViewModifier { let title: String - init(title: String) { - self.title = title - } - func body(content: Content) -> some View { VStack(alignment: .leading, spacing: 8) { Text(title) diff --git a/Scripts/CodeSigning.swift b/Scripts/CodeSigning.swift index 39bc29b8..3cf6c01f 100644 --- a/Scripts/CodeSigning.swift +++ b/Scripts/CodeSigning.swift @@ -1,7 +1,7 @@ #!/usr/bin/swift import Foundation -func handleSIGINT(_ signal: Int32) -> Void { +func handleSIGINT(_ signal: Int32) { exit(0) } @@ -32,5 +32,3 @@ public extension SettingsDictionary { writeContentInFile(path: "Tuist/ProjectDescriptionHelpers/CodeSign.swift", content: codeSignContent) print("✅ Code Sign extension generated successfully!") - - diff --git a/Scripts/GenerateFeature/Project.swift b/Scripts/GenerateFeature/Project.swift index 3cabc43e..46e7287a 100644 --- a/Scripts/GenerateFeature/Project.swift +++ b/Scripts/GenerateFeature/Project.swift @@ -1,9 +1,9 @@ -//import ProjectDescription -//import ProjectDescriptionHelpers +// import ProjectDescription +// import ProjectDescriptionHelpers // -//let project = Project.staticFramework( +// let project = Project.staticFramework( // name: "Feature", // dependencies: [ // .Project.Features.Feature // ] -//) +// ) diff --git a/Scripts/GenerateModule.swift b/Scripts/GenerateModule.swift index 21df0b24..f9272010 100644 --- a/Scripts/GenerateModule.swift +++ b/Scripts/GenerateModule.swift @@ -1,7 +1,7 @@ #!/usr/bin/swift import Foundation -func handleSIGINT(_ signal: Int32) -> Void { +func handleSIGINT(_ signal: Int32) { exit(0) } @@ -124,7 +124,7 @@ let project = Project.makeModule( """ writeContentInFile( - path: currentPath + "Projects/\(layer.rawValue)/\(moduleName)/Project.swift", + path: currentPath + "Projects/\(layer.rawValue)/\(moduleName)/Project.swift", content: projectSwift ) } @@ -135,14 +135,14 @@ func makeProjectDirectory() { func makeProjectScaffold(targetString: String) { _ = try? bash.run( - commandName: "tuist", + commandName: "tuist", arguments: ["scaffold", "Module", "--name", "\(moduleName)", "--layer", "\(layer.rawValue)", "--target", "\(targetString)"] ) } func makeScaffold(target: MicroTargetType) { _ = try? bash.run( - commandName: "tuist", + commandName: "tuist", arguments: ["scaffold", "\(target.rawValue)", "--name", "\(moduleName)", "--layer", "\(layer.rawValue)"] ) } @@ -162,7 +162,7 @@ func updateFileContent( guard let readHandle = try? FileHandle(forReadingFrom: fileURL) else { fatalError("❌ Failed to find \(filePath)") } - guard let readData = try? readHandle.readToEnd() else { + guard let readData = try? readHandle.readToEnd() else { fatalError("❌ Failed to find \(filePath)") } try? readHandle.close() @@ -178,14 +178,13 @@ func updateFileContent( try? writeHandle.close() } - // MARK: - Starting point print("Enter layer name\n(Feature | Domain | Core | Shared)", terminator: " : ") let layerInput = readLine() -guard - let layerInput, - !layerInput.isEmpty , +guard + let layerInput, + !layerInput.isEmpty, let layerUnwrapping = LayerType(rawValue: layerInput) else { print("Layer is empty or invalid") @@ -230,7 +229,6 @@ print("interface: \(hasInterface), testing: \(hasTesting), unitTests: \(hasUnitT print("------------------------------------------------------------------------------------------------------------------------") print("✅ Module is created successfully!") - // MARK: - Bash protocol CommandExecuting { func run(commandName: String, arguments: [String]) throws -> String @@ -246,7 +244,7 @@ struct Bash: CommandExecuting { } private func resolve(_ command: String) throws -> String { - guard var bashCommand = try? run("/bin/bash" , with: ["-l", "-c", "which \(command)"]) else { + guard var bashCommand = try? run("/bin/bash", with: ["-l", "-c", "which \(command)"]) else { throw BashError.commandNotFound(name: command) } bashCommand = bashCommand.trimmingCharacters(in: NSCharacterSet.whitespacesAndNewlines) @@ -265,4 +263,3 @@ struct Bash: CommandExecuting { return output } } - diff --git a/Scripts/InitEnvironment.swift b/Scripts/InitEnvironment.swift index 132cf78e..6e2f3a26 100644 --- a/Scripts/InitEnvironment.swift +++ b/Scripts/InitEnvironment.swift @@ -1,7 +1,7 @@ #!/usr/bin/swift import Foundation -func handleSIGINT(_ signal: Int32) -> Void { +func handleSIGINT(_ signal: Int32) { exit(0) } diff --git a/Scripts/NewDependency.swift b/Scripts/NewDependency.swift index dcdf6ea6..561eccbb 100644 --- a/Scripts/NewDependency.swift +++ b/Scripts/NewDependency.swift @@ -1,7 +1,7 @@ #!/usr/bin/swift import Foundation -func handleSIGINT(_ signal: Int32) -> Void { +func handleSIGINT(_ signal: Int32) { exit(0) } @@ -18,7 +18,7 @@ signal(SIGINT, handleSIGINT) guard let readHandle = try? FileHandle(forReadingFrom: fileURL) else { fatalError("❌ Failed to find \(filePath)") } - guard let readData = try? readHandle.readToEnd() else { + guard let readData = try? readHandle.readToEnd() else { fatalError("❌ Failed to find \(filePath)") } try? readHandle.close() @@ -74,4 +74,3 @@ signal(SIGINT, handleSIGINT) } registerDependency(name: dependencyName, package: packageName, url: dependencyURL, version: dependencyVersion) - diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift index 34877fbe..90e41989 100644 --- a/Tuist/Dependencies.swift +++ b/Tuist/Dependencies.swift @@ -12,8 +12,8 @@ let dependencies = Dependencies( .remote(url: "https://github.com/GSM-MSG/GAuthSignin-Swift", requirement: .exact("0.0.3")), .remote(url: "https://github.com/Quick/Nimble.git", requirement: .exact("11.2.2")), .remote(url: "https://github.com/Quick/Quick.git", requirement: .exact("6.1.0")), - .remote(url: "https://github.com/GSM-MSG/Emdpoint.git", requirement: .exact("3.2.11")), - + .remote(url: "https://github.com/GSM-MSG/Emdpoint.git", requirement: .exact("3.2.11")) + ], baseSettings: .settings( configurations: [ diff --git a/Tuist/ProjectDescriptionHelpers/Project+Template.swift b/Tuist/ProjectDescriptionHelpers/Project+Template.swift index a8befb61..bf9c99f6 100644 --- a/Tuist/ProjectDescriptionHelpers/Project+Template.swift +++ b/Tuist/ProjectDescriptionHelpers/Project+Template.swift @@ -178,7 +178,7 @@ public extension Project { infoPlist: .extendingDefault(with: [ "UIMainStoryboardFile": "", "UILaunchStoryboardName": "LaunchScreen", - "ENABLE_TESTS": .boolean(true), + "ENABLE_TESTS": .boolean(true) ]), sources: .demoSources, resources: ["Demo/Resources/**"], diff --git a/Tuist/Templates/Tests/Tests.swift b/Tuist/Templates/Tests/Tests.swift index 09d79c9e..b5d64a60 100644 --- a/Tuist/Templates/Tests/Tests.swift +++ b/Tuist/Templates/Tests/Tests.swift @@ -13,6 +13,6 @@ private let template = Template( .file( path: "Projects/\(layerAttribute)/\(nameAttribute)/Tests/\(nameAttribute)Test.swift", templatePath: "Tests.stencil" - ), + ) ] ) diff --git a/Tuist/Templates/UITests/UITests.swift b/Tuist/Templates/UITests/UITests.swift index 716ef246..503d283e 100644 --- a/Tuist/Templates/UITests/UITests.swift +++ b/Tuist/Templates/UITests/UITests.swift @@ -13,6 +13,6 @@ private let template = Template( .file( path: "Projects/\(layerAttribute)/\(nameAttribute)/UITests/\(nameAttribute)UITests.swift", templatePath: "UITests.stencil" - ), + ) ] )