diff --git a/Modules/Presentation/Login/Project.swift b/Modules/Presentation/Login/Project.swift deleted file mode 100644 index b45c4b1..0000000 --- a/Modules/Presentation/Login/Project.swift +++ /dev/null @@ -1,23 +0,0 @@ -import ProjectDescription - -let project = Project( - name: "Login", - targets: [ - .target( - name: "Login", - destinations: .iOS, - product: .staticFramework, - bundleId: "com.hereit.presentation.login", - infoPlist: .default, - sources: ["Sources/**"], - resources: ["Resources/**"], - dependencies: [ - .external(name: "SnapKit"), - .project(target: "AuthDomain", path: "../../Domain/Auth"), - .project(target: "AuthData", path: "../../Data/Auth"), - .project(target: "UIComponents", path: "../../Shared/UIComponents"), - .project(target: "DesignSystem", path: "../../Shared/DesignSystem") - ] - ) - ] -) diff --git a/Modules/Presentation/Login/Sources/View/ViewController.swift b/Modules/Presentation/Login/Sources/View/ViewController.swift deleted file mode 100644 index 82b4001..0000000 --- a/Modules/Presentation/Login/Sources/View/ViewController.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// ViewController.swift -// Login -// -// Created by dgsw07 on 6/18/25. -// - - -import UIKit -import UIComponents - - -class ViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .black - - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(true) - showAlert() - } - - func showAlert() { - - } -} diff --git a/Modules/Presentation/Login/Sources/ViewModel/SignUpViewModel.swift b/Modules/Presentation/Login/Sources/ViewModel/SignUpViewModel.swift deleted file mode 100644 index 8b13789..0000000 --- a/Modules/Presentation/Login/Sources/ViewModel/SignUpViewModel.swift +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Modules/Shared/DesignSystem/Resources/Assets.xcassets/Primary.colorset/Contents.json b/Modules/Shared/DesignSystem/Resources/Assets.xcassets/Primary.colorset/Contents.json deleted file mode 100644 index 0d19726..0000000 --- a/Modules/Shared/DesignSystem/Resources/Assets.xcassets/Primary.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.549", - "green" : "0.306", - "red" : "0.922" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.549", - "green" : "0.306", - "red" : "0.922" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Modules/Shared/DesignSystem/Resources/Preview Content/Preview Assets.xcassets/Contents.json b/Modules/Shared/DesignSystem/Resources/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/Modules/Shared/DesignSystem/Resources/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Modules/Shared/UIComponents/Resources/Assets.xcassets/Contents.json b/Modules/Shared/UIComponents/Resources/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/Modules/Shared/UIComponents/Resources/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Modules/Shared/UIComponents/Resources/Preview Content/Preview Assets.xcassets/Contents.json b/Modules/Shared/UIComponents/Resources/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/Modules/Shared/UIComponents/Resources/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Modules/Shared/UIComponents/Sources/.swift b/Modules/Shared/UIComponents/Sources/.swift deleted file mode 100644 index 8b13789..0000000 --- a/Modules/Shared/UIComponents/Sources/.swift +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift index 970990f..3d6fd9e 100644 --- a/Projects/App/Project.swift +++ b/Projects/App/Project.swift @@ -25,8 +25,9 @@ let project = Project( ] ), sources: ["Sources/**"], + resources: ["Resources/**"], dependencies: [ - .project(target: "Login", path: "../../Modules/Presentation/Login") + .project(target: "Presentation", path: "../Presentation") ] ) ] diff --git a/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..2305880 --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,35 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Modules/Presentation/Login/Resources/Assets.xcassets/Contents.json b/Projects/App/Resources/Assets.xcassets/Contents.json similarity index 100% rename from Modules/Presentation/Login/Resources/Assets.xcassets/Contents.json rename to Projects/App/Resources/Assets.xcassets/Contents.json diff --git a/Projects/App/Sources/SceneDelegate.swift b/Projects/App/Sources/SceneDelegate.swift index a88fa44..67cdc5e 100644 --- a/Projects/App/Sources/SceneDelegate.swift +++ b/Projects/App/Sources/SceneDelegate.swift @@ -1,7 +1,6 @@ import UIKit -import Login -import DesignSystem - +import Shared +import Presentation class SceneDelegate: UIResponder, UIWindowSceneDelegate { @@ -9,7 +8,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { // MARK: - Tuist 디자인 시스템 폰트 등록 - - FontRegistrar.registerFont() + Pretendard.registerFont() guard let windowScene = (scene as? UIWindowScene) else { return } window = UIWindow(frame: windowScene.coordinateSpace.bounds) diff --git a/Modules/Domain/Auth/Project.swift b/Projects/Data/Project.swift similarity index 70% rename from Modules/Domain/Auth/Project.swift rename to Projects/Data/Project.swift index 4c17b93..a715004 100644 --- a/Modules/Domain/Auth/Project.swift +++ b/Projects/Data/Project.swift @@ -1,14 +1,13 @@ import ProjectDescription let project = Project( - name: "AuthDomain", + name: "Data", targets: [ .target( - name: "AuthDomain", + name: "Data", destinations: .iOS, product: .staticFramework, - - bundleId: "com.hereit.domain.auth", + bundleId: "com.hereit.data", infoPlist: .default, sources: ["Sources/**"], dependencies: [] diff --git a/Projects/Data/Sources/test.swift b/Projects/Data/Sources/test.swift new file mode 100644 index 0000000..e69de29 diff --git a/Modules/Data/Auth/Project.swift b/Projects/Domain/Project.swift similarity index 52% rename from Modules/Data/Auth/Project.swift rename to Projects/Domain/Project.swift index 863bb26..25e4e45 100644 --- a/Modules/Data/Auth/Project.swift +++ b/Projects/Domain/Project.swift @@ -1,18 +1,16 @@ import ProjectDescription let project = Project( - name: "AuthData", + name: "Domain", targets: [ .target( - name: "AuthData", + name: "Domain", destinations: .iOS, product: .staticFramework, - bundleId: "com.hereit.data.auth", + bundleId: "com.hereit.domain", infoPlist: .default, sources: ["Sources/**"], - dependencies: [ - .project(target: "AuthDomain", path: "../../Domain/Auth"), - ] + dependencies: [] ) ] ) diff --git a/Projects/Domain/Sources/test.swift b/Projects/Domain/Sources/test.swift new file mode 100644 index 0000000..e69de29 diff --git a/Modules/Shared/UIComponents/Project.swift b/Projects/Presentation/Project.swift similarity index 52% rename from Modules/Shared/UIComponents/Project.swift rename to Projects/Presentation/Project.swift index d0c1ce3..6ff339e 100644 --- a/Modules/Shared/UIComponents/Project.swift +++ b/Projects/Presentation/Project.swift @@ -1,19 +1,20 @@ import ProjectDescription let project = Project( - name: "UIComponents", + name: "Presentation", targets: [ .target( - name: "UIComponents", + name: "Presentation", destinations: .iOS, product: .staticFramework, - bundleId: "com.hereit.shared.uicomponents", + bundleId: "com.hereit.presentation", infoPlist: .default, sources: ["Sources/**"], - resources: ["Resources/**"], dependencies: [ .external(name: "SnapKit"), - .project(target: "DesignSystem", path: "../DesignSystem") + .project(target: "Domain", path: "../Domain"), + .project(target: "Data", path: "../Data"), + .project(target: "Shared", path: "../Shared") ] ) ] diff --git a/Modules/Presentation/Login/Resources/Preview Content/Preview Assets.xcassets/Contents.json b/Projects/Presentation/Resources/Assets.xcassets/Contents.json similarity index 100% rename from Modules/Presentation/Login/Resources/Preview Content/Preview Assets.xcassets/Contents.json rename to Projects/Presentation/Resources/Assets.xcassets/Contents.json diff --git a/Modules/Presentation/Login/Sources/Scene/LoginScene.swift b/Projects/Presentation/Sources/Auth/Login/LoginScene.swift similarity index 83% rename from Modules/Presentation/Login/Sources/Scene/LoginScene.swift rename to Projects/Presentation/Sources/Auth/Login/LoginScene.swift index 562e69e..9502bcd 100644 --- a/Modules/Presentation/Login/Sources/Scene/LoginScene.swift +++ b/Projects/Presentation/Sources/Auth/Login/LoginScene.swift @@ -2,7 +2,7 @@ import UIKit public enum LoginScene { public static func create() -> UIViewController { - let viewModel = AuthViewModel() + let viewModel = LoginViewModel() let viewController = LoginViewController(viewModel: viewModel) return viewController } diff --git a/Modules/Presentation/Login/Sources/View/LoginViewController.swift b/Projects/Presentation/Sources/Auth/Login/LoginViewController.swift similarity index 97% rename from Modules/Presentation/Login/Sources/View/LoginViewController.swift rename to Projects/Presentation/Sources/Auth/Login/LoginViewController.swift index d331bdf..1eb84fc 100644 --- a/Modules/Presentation/Login/Sources/View/LoginViewController.swift +++ b/Projects/Presentation/Sources/Auth/Login/LoginViewController.swift @@ -1,12 +1,11 @@ import UIKit -import UIComponents -import DesignSystem +import Shared final class LoginViewController: UIViewController { // MARK: - Properties - private let viewModel: AuthViewModel + private let viewModel: LoginViewModel private lazy var titleLabel: UILabel = { @@ -172,7 +171,7 @@ final class LoginViewController: UIViewController { // MARK: - Init - init(viewModel: AuthViewModel) { + init(viewModel: LoginViewModel) { self.viewModel = viewModel super.init(nibName: nil, bundle: nil) } @@ -225,6 +224,6 @@ final class LoginViewController: UIViewController { } #Preview { - FontRegistrar.registerFont() - return LoginViewController(viewModel: AuthViewModel()) + Pretendard.registerFont() + return LoginViewController(viewModel: LoginViewModel()) } diff --git a/Modules/Presentation/Login/Sources/ViewModel/AuthViewModel.swift b/Projects/Presentation/Sources/Auth/Login/LoginViewModel.swift similarity index 51% rename from Modules/Presentation/Login/Sources/ViewModel/AuthViewModel.swift rename to Projects/Presentation/Sources/Auth/Login/LoginViewModel.swift index b7f4ead..4bd1612 100644 --- a/Modules/Presentation/Login/Sources/ViewModel/AuthViewModel.swift +++ b/Projects/Presentation/Sources/Auth/Login/LoginViewModel.swift @@ -1,12 +1,10 @@ import Foundation -final class AuthViewModel { +final class LoginViewModel { var email : String = "" func login(email: String, password: String) { self.email = email print("Logging in with email: \(email), password: \(password)") } - func signup(fullName: String,email: String, password: String) { - print("Logging in with fullName: \(fullName) email: \(email), password: \(password)") - } + } diff --git a/Modules/Presentation/Login/Sources/Scene/SignUpScene.swift b/Projects/Presentation/Sources/Auth/Register/Register/RegisterScene.swift similarity index 100% rename from Modules/Presentation/Login/Sources/Scene/SignUpScene.swift rename to Projects/Presentation/Sources/Auth/Register/Register/RegisterScene.swift diff --git a/Modules/Presentation/Login/Sources/View/SignUpViewController.swift b/Projects/Presentation/Sources/Auth/Register/Register/RegisterViewController.swift similarity index 92% rename from Modules/Presentation/Login/Sources/View/SignUpViewController.swift rename to Projects/Presentation/Sources/Auth/Register/Register/RegisterViewController.swift index e45f005..ce599f9 100644 --- a/Modules/Presentation/Login/Sources/View/SignUpViewController.swift +++ b/Projects/Presentation/Sources/Auth/Register/Register/RegisterViewController.swift @@ -1,12 +1,11 @@ import UIKit -import UIComponents -import DesignSystem +import Shared -final class SignUpViewController: UIViewController { +final class RegisterViewController: UIViewController { // MARK: - Properties - private let viewModel: AuthViewModel + private let viewModel: RegisterViewModel private lazy var titleLabel: UILabel = { @@ -118,7 +117,7 @@ final class SignUpViewController: UIViewController { // MARK: - Init - init(viewModel: AuthViewModel) { + init(viewModel: RegisterViewModel) { self.viewModel = viewModel super.init(nibName: nil, bundle: nil) } @@ -158,7 +157,7 @@ final class SignUpViewController: UIViewController { let email = emailField.getTextField().text ?? "" let password = passwordField.getTextField().text ?? "" - viewModel.signup(fullName: fullName, email: email, password: password) + viewModel.register(fullName: fullName, email: email, password: password) } @objc private func didTapForgotPassword() { @@ -171,6 +170,6 @@ final class SignUpViewController: UIViewController { } #Preview { - FontRegistrar.registerFont() - return SignUpViewController(viewModel: AuthViewModel()) + Pretendard.registerFont() + return RegisterViewController(viewModel: RegisterViewModel()) } diff --git a/Projects/Presentation/Sources/Auth/Register/Register/RegisterViewModel.swift b/Projects/Presentation/Sources/Auth/Register/Register/RegisterViewModel.swift new file mode 100644 index 0000000..7db9180 --- /dev/null +++ b/Projects/Presentation/Sources/Auth/Register/Register/RegisterViewModel.swift @@ -0,0 +1,15 @@ +import Foundation + +final class RegisterViewModel { + var email : String = "" + var password : String = "" + var fullName : String = "" + + func register(fullName: String, email: String, password: String) { + self.email = email + self.password = email + self.fullName = email + print("Logging in with email: \(email), password: \(password)") + } + +} diff --git a/Modules/Presentation/Login/Sources/View/EnterOTPViewController.swift b/Projects/Presentation/Sources/Auth/Register/Verify/EnterOTPViewController.swift similarity index 95% rename from Modules/Presentation/Login/Sources/View/EnterOTPViewController.swift rename to Projects/Presentation/Sources/Auth/Register/Verify/EnterOTPViewController.swift index 33a21da..625e23a 100644 --- a/Modules/Presentation/Login/Sources/View/EnterOTPViewController.swift +++ b/Projects/Presentation/Sources/Auth/Register/Verify/EnterOTPViewController.swift @@ -1,13 +1,9 @@ - - - -import UIComponents -import DesignSystem import UIKit +import Shared class EnterOTPViewController: UIViewController { - private var viewModel: AuthViewModel + let email: String //MARK: title area- @@ -128,8 +124,7 @@ class EnterOTPViewController: UIViewController { return stack }() - init(viewModel: AuthViewModel, email: String) { - self.viewModel = viewModel + init(email: String) { self.email = email super.init(nibName: nil, bundle: nil) } @@ -177,8 +172,8 @@ class EnterOTPViewController: UIViewController { } #Preview { - FontRegistrar.registerFont() - return EnterOTPViewController(viewModel: AuthViewModel(), email: "example@email.com") + Pretendard.registerFont() + return EnterOTPViewController(email: "example@email.com") } // diff --git a/Modules/Shared/DesignSystem/Project.swift b/Projects/Shared/Project.swift similarity index 84% rename from Modules/Shared/DesignSystem/Project.swift rename to Projects/Shared/Project.swift index 08d30fe..0cb64af 100644 --- a/Modules/Shared/DesignSystem/Project.swift +++ b/Projects/Shared/Project.swift @@ -1,13 +1,13 @@ import ProjectDescription let project = Project( - name: "DesignSystem", + name: "Shared", targets: [ .target( - name: "DesignSystem", + name: "Shared", destinations: .iOS, product: .staticFramework, - bundleId: "com.hereit.shared.designsystem", + bundleId: "com.hereit.shared", infoPlist: ( .extendingDefault(with: [ @@ -29,9 +29,9 @@ let project = Project( "Resources/**", "Resources/Fonts/**" ], - dependencies: [] + dependencies: [ + .external(name: "SnapKit"), + ] ) ] ) - - diff --git a/Modules/Shared/DesignSystem/Resources/Assets.xcassets/Contents.json b/Projects/Shared/Resources/Assets.xcassets/Contents.json similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Assets.xcassets/Contents.json rename to Projects/Shared/Resources/Assets.xcassets/Contents.json diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Black.ttf b/Projects/Shared/Resources/Fonts/Pretendard-Black.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Black.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-Black.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Bold.ttf b/Projects/Shared/Resources/Fonts/Pretendard-Bold.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Bold.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-Bold.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-ExtraBold.ttf b/Projects/Shared/Resources/Fonts/Pretendard-ExtraBold.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-ExtraBold.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-ExtraBold.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-ExtraLight.ttf b/Projects/Shared/Resources/Fonts/Pretendard-ExtraLight.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-ExtraLight.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-ExtraLight.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Light.ttf b/Projects/Shared/Resources/Fonts/Pretendard-Light.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Light.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-Light.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Medium.ttf b/Projects/Shared/Resources/Fonts/Pretendard-Medium.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Medium.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-Medium.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Regular.ttf b/Projects/Shared/Resources/Fonts/Pretendard-Regular.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Regular.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-Regular.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-SemiBold.ttf b/Projects/Shared/Resources/Fonts/Pretendard-SemiBold.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-SemiBold.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-SemiBold.ttf diff --git a/Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Thin.ttf b/Projects/Shared/Resources/Fonts/Pretendard-Thin.ttf similarity index 100% rename from Modules/Shared/DesignSystem/Resources/Fonts/Pretendard-Thin.ttf rename to Projects/Shared/Resources/Fonts/Pretendard-Thin.ttf diff --git a/Modules/Shared/UIComponents/Sources/ButtonView.swift b/Projects/Shared/Sources/ButtonView.swift similarity index 97% rename from Modules/Shared/UIComponents/Sources/ButtonView.swift rename to Projects/Shared/Sources/ButtonView.swift index 20dbeca..48cd798 100644 --- a/Modules/Shared/UIComponents/Sources/ButtonView.swift +++ b/Projects/Shared/Sources/ButtonView.swift @@ -1,6 +1,5 @@ import Foundation import UIKit -import DesignSystem public class ButtonView: UIButton { // MARK: - Initializers - diff --git a/Modules/Shared/DesignSystem/Sources/Colors.swift b/Projects/Shared/Sources/Colors.swift similarity index 100% rename from Modules/Shared/DesignSystem/Sources/Colors.swift rename to Projects/Shared/Sources/Colors.swift diff --git a/Modules/Shared/UIComponents/Sources/CustomAlert/Action.swift b/Projects/Shared/Sources/CustomAlert/Action.swift similarity index 100% rename from Modules/Shared/UIComponents/Sources/CustomAlert/Action.swift rename to Projects/Shared/Sources/CustomAlert/Action.swift diff --git a/Modules/Shared/UIComponents/Sources/CustomAlert/AlertConcreteBuilder.swift b/Projects/Shared/Sources/CustomAlert/AlertConcreteBuilder.swift similarity index 100% rename from Modules/Shared/UIComponents/Sources/CustomAlert/AlertConcreteBuilder.swift rename to Projects/Shared/Sources/CustomAlert/AlertConcreteBuilder.swift diff --git a/Modules/Shared/UIComponents/Sources/CustomAlert/Builder.swift b/Projects/Shared/Sources/CustomAlert/Builder.swift similarity index 100% rename from Modules/Shared/UIComponents/Sources/CustomAlert/Builder.swift rename to Projects/Shared/Sources/CustomAlert/Builder.swift diff --git a/Modules/Shared/UIComponents/Sources/CustomAlert/CustomAlertController.swift b/Projects/Shared/Sources/CustomAlert/CustomAlertController.swift similarity index 99% rename from Modules/Shared/UIComponents/Sources/CustomAlert/CustomAlertController.swift rename to Projects/Shared/Sources/CustomAlert/CustomAlertController.swift index ff1da14..154d2c7 100644 --- a/Modules/Shared/UIComponents/Sources/CustomAlert/CustomAlertController.swift +++ b/Projects/Shared/Sources/CustomAlert/CustomAlertController.swift @@ -6,7 +6,6 @@ // import UIKit -import DesignSystem class CustomAlertController: UIViewController { var alertTitle: String? diff --git a/Modules/Shared/DesignSystem/Sources/Font/Fonts.swift b/Projects/Shared/Sources/Font/Fonts.swift similarity index 100% rename from Modules/Shared/DesignSystem/Sources/Font/Fonts.swift rename to Projects/Shared/Sources/Font/Fonts.swift diff --git a/Modules/Shared/DesignSystem/Sources/Font/FontRegister.swift b/Projects/Shared/Sources/Font/Pretendard.swift similarity index 96% rename from Modules/Shared/DesignSystem/Sources/Font/FontRegister.swift rename to Projects/Shared/Sources/Font/Pretendard.swift index 279644f..bd4119d 100644 --- a/Modules/Shared/DesignSystem/Sources/Font/FontRegister.swift +++ b/Projects/Shared/Sources/Font/Pretendard.swift @@ -8,7 +8,7 @@ import UIKit import CoreText -public enum FontRegistrar { +public enum Pretendard { public static func registerFont() { guard let fontURLs = Bundle.module.urls(forResourcesWithExtension: "ttf", subdirectory: nil) else { print("❌ Font files not found in module bundle") diff --git a/Modules/Shared/UIComponents/Sources/InputFieldView.swift b/Projects/Shared/Sources/InputFieldView.swift similarity index 99% rename from Modules/Shared/UIComponents/Sources/InputFieldView.swift rename to Projects/Shared/Sources/InputFieldView.swift index 1848b9b..9817332 100644 --- a/Modules/Shared/UIComponents/Sources/InputFieldView.swift +++ b/Projects/Shared/Sources/InputFieldView.swift @@ -1,6 +1,5 @@ import UIKit import SnapKit -import DesignSystem public class InputTextField: UITextField { diff --git a/Workspace.swift b/Workspace.swift index 1f85047..6c672a8 100644 --- a/Workspace.swift +++ b/Workspace.swift @@ -1,9 +1,8 @@ import ProjectDescription let workspace = Workspace( - name: "hereit", + name: "Hereit", projects: [ "Projects/App", - "Modules/**" ] )