Merge pull request #276 from EAT-SSU/fix/#65

[#65] 홈 UI 변경

Author: Hrepay

EATSSU/App/Sources/Data/Firebase/NoticeViewController.swift

@@ -7,10 +7,10 @@
 
 import UIKit
 
-import EATSSUDesign
-
 import SnapKit
 
+import EATSSUDesign
+
 /// FirebaseRemoteConfig 관련 ViewController
 class NoticeViewController: BaseViewController {
     // MARK: - Properties

EATSSU/App/Sources/Presentation/Auth/View/LoginView.swift

@@ -7,35 +7,42 @@
 
 import UIKit
 
-import EATSSUDesign
-
 import SnapKit
-import Then
 
 import EATSSUDesign
 
 final class LoginView: BaseUIView {
     // MARK: - UI Components
 
-    private let logoImage = UIImageView().then {
-        $0.image = EATSSUDesignAsset.Images.authLogo.image
-    }
+    private let logoImage: UIImageView = {
+        let imageView = UIImageView()
+        imageView.image = EATSSUDesignAsset.Images.authLogo.image
+        return imageView
+    }()
 
-    private let logoSubTitle = UIImageView().then { imageView in
+    private let logoSubTitle: UIImageView = {
+        let imageView = UIImageView()
         imageView.image = EATSSUDesignAsset.Images.authSubTitle.image
-    }
+        return imageView
+    }()
 
-    let appleLoginButton = UIButton().then { button in
+    let appleLoginButton: UIButton = {
+        let button = UIButton()
         button.setImage(EATSSUDesignAsset.Images.appleLoginButton.image, for: .normal)
-    }
+        return button
+    }()
 
-    let kakaoLoginButton = UIButton().then { button in
+    let kakaoLoginButton: UIButton = {
+        let button = UIButton()
         button.setImage(EATSSUDesignAsset.Images.kakaoLoginButton.image, for: .normal)
-    }
+        return button
+    }()
 
-    let lookingWithNoSignInButton = UIButton().then { button in
+    let lookingWithNoSignInButton: UIButton = {
+        let button = UIButton()
         button.setImage(EATSSUDesignAsset.Images.lookAroundButton.image, for: .normal)
-    }
+        return button
+    }()
 
     override func configureUI() {
         addSubviews(
@@ -48,29 +55,29 @@ final class LoginView: BaseUIView {
     }
 
     override func setLayout() {
-        logoImage.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalToSuperview().inset(223)
+        logoImage.snp.makeConstraints {
+            $0.centerX.equalToSuperview()
+            $0.top.equalToSuperview().inset(223)
         }
 
-        logoSubTitle.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalTo(logoImage.snp.bottom)
+        logoSubTitle.snp.makeConstraints {
+            $0.centerX.equalToSuperview()
+            $0.top.equalTo(logoImage.snp.bottom)
         }
 
-        appleLoginButton.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalTo(self.safeAreaLayoutGuide).inset(151)
+        appleLoginButton.snp.makeConstraints {
+            $0.centerX.equalToSuperview()
+            $0.bottom.equalTo(self.safeAreaLayoutGuide).inset(151)
         }
 
-        kakaoLoginButton.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalTo(self.safeAreaLayoutGuide).inset(90)
+        kakaoLoginButton.snp.makeConstraints {
+            $0.centerX.equalToSuperview()
+            $0.bottom.equalTo(self.safeAreaLayoutGuide).inset(90)
         }
 
-        lookingWithNoSignInButton.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalTo(self.safeAreaLayoutGuide).inset(30)
+        lookingWithNoSignInButton.snp.makeConstraints {
+            $0.centerX.equalToSuperview()
+            $0.bottom.equalTo(self.safeAreaLayoutGuide).inset(30)
         }
     }
 }

EATSSU/App/Sources/Presentation/Auth/View/SetNickNameView.swift

@@ -7,10 +7,9 @@
 
 import UIKit
 
-import EATSSUDesign
-
 import SnapKit
-import Then
+
+import EATSSUDesign
 
 final class SetNickNameView: BaseUIView {
     // MARK: - Properties
@@ -19,52 +18,48 @@ final class SetNickNameView: BaseUIView {
 
     // MARK: - UI Components
 
-    /// "EAT-SSU에서 사용할 닉네임을 설정해 주세요" 레이블
-    private let nickNameLabel = UILabel().then {
-        $0.text = "EAT-SSU에서 사용할\n닉네임을 설정해 주세요"
-        $0.numberOfLines = 2
-        $0.font = EATSSUDesignFontFamily.Pretendard.bold.font(size: 18)
-    }
-
-    /// 닉네임 입력 텍스트필드
-    public let inputNickNameTextField = ESTextField(placeholder: TextLiteral.inputNickName).then { _ in
-        /*
-         해야 할 일
-         - 현재 ESTextField로서는 크게 문제가 없는데, 혹시 모르는 추가 설정이 놓친 게 없나 검토 필요
-         */
-    }
-
-    /// "중복확인" 버튼
-    public var nicknameDoubleCheckButton = ESButton(size: .small, title: "중복 확인").then { esButton in
-        /*
-         해야 할 일
-         - 초기 버튼의 세팅값을 false로 주는 항목은 ESButton 초기화 값으로 할당하고 싶다.
-         - 하지만 계산된 프로퍼티로 설계되어 있어서 어떻게 해야 할 지 모르겠다.
-         */
-        esButton.isEnabled = false
-    }
-
-    /// 닉네임 중복확인 결과 메시지 레이블
-    public var nicknameValidationMessageLabel = UILabel().then {
-        $0.text = TextLiteral.hintInputNickName
-        $0.textColor = EATSSUDesignAsset.Color.GrayScale.gray400.color
-        $0.font = EATSSUDesignFontFamily.Pretendard.regular.font(size: 12)
-    }
-
-    private lazy var setNickNameStackView: UIStackView = .init(
-        arrangedSubviews: [
+    private let nickNameLabel: UILabel = {
+        let label = UILabel()
+        label.text = "EAT-SSU에서 사용할\n닉네임을 설정해 주세요"
+        label.numberOfLines = 2
+        label.font = EATSSUDesignFontFamily.Pretendard.bold.font(size: 18)
+        return label
+    }()
+
+    public let inputNickNameTextField: ESTextField = {
+        let textField = ESTextField(placeholder: TextLiteral.inputNickName)
+        return textField
+    }()
+
+    public var nicknameDoubleCheckButton: ESButton = {
+        let button = ESButton(size: .small, title: "중복 확인")
+        button.isEnabled = false
+        return button
+    }()
+
+    public var nicknameValidationMessageLabel: UILabel = {
+        let label = UILabel()
+        label.text = TextLiteral.hintInputNickName
+        label.textColor = EATSSUDesignAsset.Color.GrayScale.gray400.color
+        label.font = EATSSUDesignFontFamily.Pretendard.regular.font(size: 12)
+        return label
+    }()
+
+    private lazy var setNickNameStackView: UIStackView = {
+        let stackView = UIStackView(arrangedSubviews: [
             inputNickNameTextField,
-            nicknameValidationMessageLabel,
-        ]
-    ).then {
-        $0.axis = .vertical
-        $0.spacing = 8.0
-    }
-
-    /// "완료하기" 버튼
-    public var completeSettingNickNameButton = ESButton(size: .big, title: "완료하기").then { esButton in
-        esButton.isEnabled = false
-    }
+            nicknameValidationMessageLabel
+        ])
+        stackView.axis = .vertical
+        stackView.spacing = 8.0
+        return stackView
+    }()
+
+    public var completeSettingNickNameButton: ESButton = {
+        let button = ESButton(size: .big, title: "완료하기")
+        button.isEnabled = false
+        return button
+    }()
 
     // MARK: - Initializer
 
@@ -105,7 +100,7 @@ final class SetNickNameView: BaseUIView {
         }
         completeSettingNickNameButton.snp.makeConstraints {
             $0.horizontalEdges.equalToSuperview().inset(16)
-            $0.bottom.equalTo(self.safeAreaLayoutGuide).inset(26)
+            $0.bottom.equalTo(safeAreaLayoutGuide).inset(26)
             $0.height.equalTo(50)
         }
     }

EATSSU/App/Sources/Presentation/Auth/ViewController/LoginViewController.swift

@@ -13,7 +13,6 @@ import KakaoSDKUser
 import Moya
 import RealmSwift
 import SnapKit
-import Then
 
 final class LoginViewController: BaseViewController {
     // MARK: - Properties

EATSSU/App/Sources/Presentation/Home/View/HomeCalendarView.swift

@@ -7,11 +7,10 @@
 
 import UIKit
 
-import EATSSUDesign
-
 import FSCalendar
 import SnapKit
-import Then
+
+import EATSSUDesign
 
 protocol CalendarSeletionDelegate: AnyObject {
     func didSelectCalendar(date: Date)

EATSSU/App/Sources/Presentation/Home/View/HomeRestaurantView.swift

@@ -9,17 +9,21 @@ import UIKit
 
 import Moya
 import SnapKit
-import Then
+
+import EATSSUDesign
 
 final class HomeRestaurantView: BaseUIView {
     // MARK: - UI Components
 
     let refreshControl = UIRefreshControl()
 
-    lazy var restaurantTableView = UITableView(frame: .zero, style: .insetGrouped).then {
-        $0.separatorStyle = .none
-        $0.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
-    }
+    lazy var restaurantTableView: UITableView = {
+        let tableView = UITableView(frame: .zero, style: .insetGrouped)
+        tableView.separatorStyle = .none
+        tableView.contentInset = .zero
+        tableView.backgroundColor = EATSSUDesignAsset.Color.GrayScale.gray100.color
+        return tableView
+    }()
 
     // MARK: - init
 
@@ -37,8 +41,7 @@ final class HomeRestaurantView: BaseUIView {
 
     override func setLayout() {
         restaurantTableView.snp.makeConstraints {
-            $0.top.equalToSuperview().offset(45)
-            $0.leading.bottom.trailing.equalToSuperview()
+            $0.edges.equalToSuperview()
         }
     }