✨ [FEAT] 회원가입 UI + API 수정 (+ 로그인 UI) #462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dev-jungbin
added
📡 Network
hwangJi-dev
approved these changes
Sep 14, 2022
jane1choi
requested changes
Sep 14, 2022
jane1choi
approved these changes
Sep 20, 2022
Comment on lines
+124
to
127
| func setMajorNameLabel(data: String) { | ||
| majorNameLabel.text = data | ||
| } | ||
| } |
Comment on lines
+81
to
+96
| @IBAction func tapFirstMajorSelectBtn(_ sender: Any) { | ||
| showMajorSelectModal(enterType: .firstMajor) | ||
| } | ||
|
|
||
| @IBAction func tapFirstMajorStartBtn(_ sender: Any) { | ||
| showMajorSelectModal(enterType: .firstMajorStart) | ||
| } | ||
|
|
||
| @IBAction func tapSecondMajorSelectBtn(_ sender: Any) { | ||
| showMajorSelectModal(enterType: .secondMajor) | ||
| } | ||
|
|
||
| @IBAction func tapSecondMajorStartBtn(_ sender: Any) { | ||
| showMajorSelectModal(enterType: .secondMajorStart) | ||
| } | ||
|
|
Comment on lines
+107
to
+110
| case .firstMajor, .secondMajor: | ||
| slideVC.vcType = .search | ||
| case .firstMajorStart, .secondMajorStart: | ||
| slideVC.vcType = .basic |
Comment on lines
+44
to
+53
| private var startList: [String] = [] | ||
| private var majorList: [MajorInfoModel] = [] | ||
| private var filteredList: [MajorInfoModel] = [] | ||
| private var dataSourceForMajor: UITableViewDiffableDataSource<Section, MajorInfoModel>? | ||
| private var snapshotForMajor: NSDiffableDataSourceSnapshot<Section, MajorInfoModel>? | ||
| private var dataSourceForStart: UITableViewDiffableDataSource<Section, String>? | ||
| private var snapshotForStart: NSDiffableDataSourceSnapshot<Section, String>? | ||
| var selectMajorDelegate: SendUpdateModalDelegate? | ||
| var vcType: ModalType = .basic | ||
| var cellType: MajorCellType = .basic |
Comment on lines
+93
to
+107
| private func setMajorTableViewDataSource() { | ||
| switch enterType { | ||
| case .firstMajor, .secondMajor: | ||
| self.dataSourceForMajor = UITableViewDiffableDataSource<Section, MajorInfoModel>(tableView: self.majorTV) { (tableView, indexPath, data) -> UITableViewCell? in | ||
| guard let cell = tableView.dequeueReusableCell(withIdentifier: MajorTVC.className, for: indexPath) as? MajorTVC else { preconditionFailure() } | ||
| cell.cellType = self.cellType | ||
| cell.setData(majorName: data) | ||
| return cell | ||
| } | ||
| case .firstMajorStart, .secondMajorStart: | ||
| self.dataSourceForStart = UITableViewDiffableDataSource<Section, String>(tableView: self.majorTV) { (tableView, indexPath, data) -> UITableViewCell? in | ||
| guard let cell = tableView.dequeueReusableCell(withIdentifier: MajorTVC.className, for: indexPath) as? MajorTVC else { preconditionFailure() } | ||
| cell.cellType = self.cellType | ||
| cell.setMajorNameLabel(data: data) | ||
| return cell |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🍎 관련 이슈
closed #459
🍎 변경 사항 및 이유
SignUpMajorInfoVC) 함수 일부를 Rx로 리팩토링 + UI 최적화(for iPhone SE..)HalfModalVC를 상속받아 회원가입 시에만 사용하는SignUpModalVC생성🍎 PR Point
을 진행하면서 HalfModalVC에 있던 프로퍼티들 중에 private을 없앤 게 좀 있는데 은주언니 뭔가 문제될 거 있으면 말해조요!!
📸 ScreenShot
RPReplay_Final1663073965-1.mov