🚑 Fix: #24 - progressPager TextLabel추가 및 constraints 수정

Central-MakeUs · Nov 6, 2023 · a58864d · a58864d
1 parent 5094a65
commit a58864d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 37 deletions.
diff --git a/CMC/Sources/Presenter/Auth/SignUp/ScrollPages/MainSignUp/MainSignUpView.swift b/CMC/Sources/Presenter/Auth/SignUp/ScrollPages/MainSignUp/MainSignUpView.swift
@@ -30,15 +30,7 @@ final class MainSignUpView: BaseView {
 		let view = UIView()
 		return view
 	}()
-
-	private lazy var titleLabel: UILabel = {
-		let label = UILabel()
-		label.text = "가입 정보를 입력해주세요"
-		label.font = DesignSystemFontFamily.Pretendard.bold.font(size: 26)
-		label.textColor = DesignSystemAsset.gray50.color
-		return label
-	}()
-
+
 	private lazy var emailTextField: CMCTextField = {
 		let textField = CMCTextField(
 			placeHolder: "이메일을 입력해주세요",
@@ -121,7 +113,6 @@ final class MainSignUpView: BaseView {
 		self.addSubview(scrollView)
 		scrollView.addSubview(mainContentView)
 
-		mainContentView.addSubview(titleLabel)
 		mainContentView.addSubview(emailTextField)
 		mainContentView.addSubview(passwordTextField)
 		mainContentView.addSubview(confirmPasswordTextField)
@@ -142,13 +133,8 @@ final class MainSignUpView: BaseView {
 			make.height.greaterThanOrEqualTo(scrollView.frameLayoutGuide.snp.height).offset(1)
 		}
 
-		titleLabel.snp.makeConstraints{ make in
-			make.top.equalToSuperview().offset(30)
-			make.leading.equalToSuperview().offset(24)
-		}
-
 		emailTextField.snp.makeConstraints{ make in
-			make.top.equalTo(titleLabel.snp.bottom).offset(30)
+			make.top.equalToSuperview()
 			make.leading.equalToSuperview().offset(24)
 			make.trailing.equalToSuperview().offset(-24)
 			make.height.equalTo(74)

diff --git a/...Sources/Presenter/Auth/SignUp/ScrollPages/TermsAndConditions/TermsAndConditionsView.swift b/...Sources/Presenter/Auth/SignUp/ScrollPages/TermsAndConditions/TermsAndConditionsView.swift
@@ -19,14 +19,6 @@ import UIKit
 final class TermsAndConditionsView: BaseView {
 	// MARK: - UI
 
-	private lazy var titleLabel: UILabel = {
-		let label = UILabel()
-		label.text = "약관동의"
-		label.font = DesignSystemFontFamily.Pretendard.bold.font(size: 26)
-		label.textColor = DesignSystemAsset.gray50.color
-		return label
-	}()
-
 	private lazy var buttonStackViews: [UIStackView] = {
 		var stackViews: [UIStackView] = []
 		buttons.enumerated().forEach { index, button in
@@ -130,7 +122,6 @@ final class TermsAndConditionsView: BaseView {
 	// MARK: - Methods
 
 	override func setAddSubView() {
-		self.addSubview(titleLabel)
 		self.addSubview(buttonStackViews[0])
 		self.addSubview(separeteBar)
 		self.addSubview(rowStackViews[0])
@@ -140,11 +131,6 @@ final class TermsAndConditionsView: BaseView {
 	}
 
 	override func setConstraint() {
-		titleLabel.snp.makeConstraints{ make in
-			make.top.equalToSuperview().offset(30)
-			make.leading.equalToSuperview().offset(24)
-		}
-
 		buttons.forEach { button in
 			button.snp.makeConstraints { make in
 				make.width.height.equalTo(44)
@@ -158,7 +144,7 @@ final class TermsAndConditionsView: BaseView {
 		}
 
 		buttonStackViews[0].snp.makeConstraints{ make in
-			make.top.equalTo(titleLabel.snp.bottom).offset(30)
+			make.top.equalToSuperview()
 			make.leading.equalToSuperview().offset(14)
 		}
 

diff --git a/CMC/Sources/Presenter/Auth/SignUp/SignUpViewController.swift b/CMC/Sources/Presenter/Auth/SignUp/SignUpViewController.swift
@@ -51,11 +51,18 @@ class SignUpViewController: BaseViewController {
 	}()
 
 	private lazy var cmcPager: CMCProgressPager = {
-		let progressPager = CMCProgressPager(pages: [
+		let progressPager = CMCProgressPager(
+			pages: [
 			termsAndConditionsView,
 			mainSignUpView,
 			completeSignUpView
-		])
+		],
+			titles: [
+				"약관동의",
+				"가입 정보를 입력해주세요",
+				"CMC 정보를 입력해주세요"
+			]
+		)
 		return progressPager
 	}()
 

diff --git a/DesignSystem/Sources/CMCProgressPager.swift b/DesignSystem/Sources/CMCProgressPager.swift
@@ -26,6 +26,14 @@ public final class CMCProgressPager: UIView {
 		return progressView
 	}()
 
+	private lazy var titleLabel: UILabel = {
+		let label = UILabel()
+		label.text = "default"
+		label.font = DesignSystemFontFamily.Pretendard.bold.font(size: 26)
+		label.textColor = DesignSystemAsset.gray50.color
+		return label
+	}()
+
 	private lazy var pagerScrollView: UIScrollView = {
 		let scrollView = UIScrollView()
 		scrollView.isPagingEnabled = true
@@ -40,14 +48,17 @@ public final class CMCProgressPager: UIView {
 	private let disposeBag = DisposeBag()
 	private let currentPage = BehaviorRelay(value: 1)
 
-	private var pages: [UIView] = []
+	private var pages: [UIView]
+	private let titles: [String]
 	private var pagesCount: Int
 
 	// MARK: - Initializers
 	public init(
-		pages: [UIView]
+		pages: [UIView],
+		titles: [String]
 	) {
 		self.pages = pages
+		self.titles = titles
 		self.pagesCount = pages.count
 
 		super.init(frame: .zero)
@@ -68,7 +79,7 @@ public final class CMCProgressPager: UIView {
 		for (index, page) in pages.enumerated() {
 			pagerScrollView.addSubview(page)
 			page.snp.makeConstraints { make in
-				make.top.equalTo(progressView.snp.bottom)
+				make.top.equalTo(titleLabel.snp.bottom).offset(24)
 				make.bottom.equalTo(self.snp.bottom)
 				make.width.equalTo(self.frame.size.width)
 				make.leading.equalToSuperview().offset(CGFloat(index) * self.frame.size.width)
@@ -82,6 +93,7 @@ public final class CMCProgressPager: UIView {
 
 	private func setAddSubView() {
 		self.addSubview(progressView)
+		self.addSubview(titleLabel)
 		self.addSubview(pagerScrollView)
 	}
 
@@ -93,8 +105,13 @@ public final class CMCProgressPager: UIView {
 			progressView.leading.trailing.equalTo(self)
 		}
 
+		self.titleLabel.snp.makeConstraints { titleLabel in
+			titleLabel.top.equalTo(progressView.snp.bottom).offset(30)
+			titleLabel.leading.equalToSuperview().offset(24)
+		}
+
 		self.pagerScrollView.snp.makeConstraints { scrollView in
-			scrollView.top.equalTo(progressView.snp.bottom)
+			scrollView.top.equalTo(titleLabel.snp.bottom).offset(24)
 			scrollView.leading.trailing.bottom.equalTo(self)
 		}
 	}
@@ -116,6 +133,13 @@ public final class CMCProgressPager: UIView {
 			})
 			.disposed(by: disposeBag)
 
+		currentPage.asObservable()
+			.withUnretained(self)
+			.subscribe(onNext: { owner, page in
+				owner.titleLabel.text = owner.titles[page - 1]
+			})
+			.disposed(by: disposeBag)
+
 	}
 
 	public func nextPage() {