🐛 [#218] 충돌 해결

Team-Ampersand · Feb 12, 2024 · cab2b60 · cab2b60
2 parents 28eb667 + 5acf3aa
commit cab2b60
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 28 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @baekteun @kimsh153 @minaje0917 @MelBIP @junseopark0331 @uuuunseo
+* @baekteun @kimsh153 @minaje0917 @junseopark0331 @uuuunseo
diff --git a/Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+SPM.swift b/Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+SPM.swift
@@ -5,7 +5,6 @@ public extension TargetDependency {
 }
 
 public extension TargetDependency.SPM {
-    static let GAuthSignin = TargetDependency.external(name: "GAuthSignin")
     static let Lottie = TargetDependency.external(name: "Lottie")
     static let Nuke = TargetDependency.external(name: "Nuke")
     static let Anim = TargetDependency.external(name: "Anim")

diff --git a/Projects/Domain/AuthDomain/Project.swift b/Projects/Domain/AuthDomain/Project.swift
@@ -10,8 +10,7 @@ let project = Project.module(
         ]),
         .implements(module: .domain(.AuthDomain), dependencies: [
             .domain(target: .AuthDomain, type: .interface),
-            .domain(target: .BaseDomain),
-            .SPM.GAuthSignin
+            .domain(target: .BaseDomain)
         ]),
         .testing(module: .domain(.AuthDomain), dependencies: [
             .domain(target: .AuthDomain, type: .interface)

diff --git a/Projects/Feature/SigninFeature/Project.swift b/Projects/Feature/SigninFeature/Project.swift
@@ -13,8 +13,7 @@ let project = Project.module(
             .feature(target: .SigninFeature, type: .interface),
             .feature(target: .SignupFeature, type: .interface),
             .feature(target: .RenewalPasswordFeature, type: .interface),
-            .domain(target: .AuthDomain, type: .interface),
-            .SPM.GAuthSignin
+            .domain(target: .AuthDomain, type: .interface)
         ]),
         .tests(module: .feature(.SigninFeature), dependencies: [
             .feature(target: .SigninFeature)

diff --git a/Projects/Feature/SigninFeature/Sources/Scene/SigninViewController.swift b/Projects/Feature/SigninFeature/Sources/Scene/SigninViewController.swift
@@ -2,7 +2,6 @@ import BaseFeature
 import CombineUtility
 import Configure
 import DesignSystem
-import GAuthSignin
 import GlobalThirdPartyLibrary
 import Localization
 import MSGLayout
@@ -18,55 +17,107 @@ final class SigninViewController: BaseStoredViewController<SigninStore> {
                 .withTintColor(.dotori(.primary(.p10)))
                 .resize(width: 182, height: 41)
         )
-    private let dotoriSubTitle = DotoriLabel(
-        "광주소프트웨어마이스터고\n기숙사 관리 시스템, DOTORI",
-        textColor: .neutral(.n20),
-        font: .subtitle2
+    private let emailTextField = DotoriIconTextField(
+        placeholder: L10n.Signin.emailPlaceholder,
+        icon: .Dotori.person
+    )
+    private let passwordTextField = DotoriIconTextField(
+        placeholder: L10n.Signin.passwordPlaceholder,
+        icon: .Dotori.lock
     )
-    .set(\.numberOfLines, 0)
-    .set(\.textAlignment, .center)
-    private let signinButton = GAuthButton(
-        auth: .signin,
-        color: .colored,
-        rounded: .default
+    .set(\.isSecureTextEntry, true)
+    private let renewalPasswordButton = DotoriTextButton(
+        L10n.Signin.findPasswordButtonTitle,
+        textColor: .neutral(.n20),
+        font: .body2
     )
+    private let signinButton = DotoriButton(text: L10n.Signin.loginButtonTitle)
+        .set(\.contentEdgeInsets, .vertical(16))
+    private let signupButton = DotoriTextButton(
+        L10n.Signin.signupButtonTitle,
+        textColor: .neutral(.n20),
+        font: .body2
+    ).then {
+        let signupString = NSMutableAttributedString(string: $0.titleLabel?.text ?? "")
+        signupString.setColorForText(
+            textToFind: L10n.Signin.signupTitle,
+            withColor: .dotori(.primary(.p10))
+        )
+        $0.setAttributedTitle(signupString, for: .normal)
+    }
 
     override func addView() {
         view.addSubviews {
             dotoriLogoImageView
-            dotoriSubTitle
+            emailTextField
+            passwordTextField
+            renewalPasswordButton
             signinButton
+            signupButton
         }
     }
 
     override func setLayout() {
         MSGLayout.buildLayout {
             dotoriLogoImageView.layout
                 .centerX(.toSuperview())
-                .top(.to(view.safeAreaLayoutGuide).top, .equal(200))
+                .top(.to(view.safeAreaLayoutGuide).top, .equal(20))
                 .height(41)
 
-            dotoriSubTitle.layout
+            emailTextField.layout
                 .centerX(.toSuperview())
-                .top(.to(dotoriLogoImageView).bottom, .equal(20))
+                .horizontal(.toSuperview(), .equal(20))
+                .top(.to(dotoriLogoImageView).bottom, .equal(30))
+
+            passwordTextField.layout
+                .centerX(.toSuperview())
+                .horizontal(.toSuperview(), .equal(20))
+                .top(.to(emailTextField).bottom, .equal(8))
+
+            renewalPasswordButton.layout
+                .trailing(.to(passwordTextField).trailing)
+                .top(.to(passwordTextField).bottom, .equal(8))
 
             signinButton.layout
                 .centerX(.toSuperview())
                 .horizontal(.toSuperview(), .equal(20))
-                .bottom(.to(view.safeAreaLayoutGuide), .equal(-32))
-                .height(50)
+                .top(.to(renewalPasswordButton).bottom, .equal(32))
+
+            signupButton.layout
+                .centerX(.toSuperview())
+                .top(.to(signinButton).bottom, .equal(16))
         }
     }
 
     override func configureViewController() {
-        self.view.backgroundColor = .dotori(.background(.card))
+        view.backgroundColor = .dotori(.background(.card))
     }
 
     override func configureNavigation() {
-        self.navigationItem.title = L10n.Signin.loginNavigationTitle
+        navigationItem.title = L10n.Signin.loginNavigationTitle
     }
 
     override func bindAction() {
+        emailTextField.textPublisher
+            .map(Store.Action.updateEmail)
+            .sink(receiveValue: store.send(_:))
+            .store(in: &subscription)
+
+        passwordTextField.textPublisher
+            .map(Store.Action.updatePassword)
+            .sink(receiveValue: store.send(_:))
+            .store(in: &subscription)
+
+        signupButton.tapPublisher
+            .map { Store.Action.signupButtonDidTap }
+            .sink(receiveValue: store.send(_:))
+            .store(in: &subscription)
+
+        renewalPasswordButton.tapPublisher
+            .map { Store.Action.renewalPasswordButtonDidTap }
+            .sink(receiveValue: store.send(_:))
+            .store(in: &subscription)
+
         signinButton.tapPublisher
             .map { Store.Action.signinButtonDidTap }
             .sink(receiveValue: store.send(_:))

diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift
@@ -5,7 +5,6 @@ let dependencies = Dependencies(
     carthage: nil,
     swiftPackageManager: SwiftPackageManagerDependencies(
         [
-            .remote(url: "https://github.com/GSM-MSG/GAuthSignin-Swift", requirement: .exact("0.0.3")),
             .remote(url: "https://github.com/airbnb/lottie-ios.git", requirement: .exact("4.2.0")),
             .remote(url: "https://github.com/kean/Nuke.git", requirement: .exact("12.1.4")),
             .remote(url: "https://github.com/GSM-MSG/Anim.git", requirement: .exact("1.1.0")),
@@ -23,8 +22,7 @@ let dependencies = Dependencies(
         ],
         productTypes: [
             "Moordinator": .framework,
-            "CombineMiniature": .framework,
-            "GAuthSignin": .framework
+            "CombineMiniature": .framework
         ],
         baseSettings: .settings(
             configurations: [