Skip to content

Commit e57ddab

Browse files
committed
[#37] 사용자 선호 도 회원가입 연결
1 parent d73e2bf commit e57ddab

15 files changed

+308
-181
lines changed

Diff for: Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,6 @@ SPEC CHECKSUMS:
197197
Tabman: 49f9181a2bfe5c29d002864dac2de8e0b7ea9180
198198
Then: 844265ae87834bbe1147d91d5d41a404da2ec27d
199199

200-
PODFILE CHECKSUM: fd1fcce35ef7ac9fdf8e3aa75e41bd8a9195591c
200+
PODFILE CHECKSUM: d8c66785cd88bf8de24d3a8ac03eb31faf1934a2
201201

202202
COCOAPODS: 1.15.2

Diff for: Pods/Manifest.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: YeonBa.xcodeproj/project.pbxproj

+287-13
Large diffs are not rendered by default.

Diff for: YeonBa.xcworkspace/xcshareddata/swiftpm/Package.resolved

-123
This file was deleted.
Binary file not shown.

Diff for: YeonBa/CollectVC/.DS_Store

2 KB
Binary file not shown.

Diff for: YeonBa/SignupVC/InterestsViewController.swift renamed to YeonBa/SignupVC/UserInfoVC/InterestsViewController.swift

+19-43
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ class InterestsViewController: UIViewController {
66

77
var selectedInterestsButton: UIButton?
88

9-
let scrollView = UIScrollView().then {
10-
$0.backgroundColor = .white
11-
}
12-
13-
let contentView = UIView()
14-
159
let numberLabel = UILabel().then {
1610
$0.text = "5/5"
1711
$0.textColor = .red
@@ -36,6 +30,7 @@ class InterestsViewController: UIViewController {
3630

3731
let nextButton = ActualGradientButton().then {
3832
$0.setTitle("다음", for: .normal)
33+
$0.isEnabled = true
3934
$0.backgroundColor = .red
4035
$0.layer.cornerRadius = 25
4136
$0.addTarget(self, action: #selector(nextButtonTapped), for: .touchUpInside)
@@ -53,26 +48,14 @@ class InterestsViewController: UIViewController {
5348
private func setupLayout() {
5449
view.backgroundColor = .white
5550
navigationItem.title = "나의 정보"
56-
setupScrollView()
57-
58-
view.addSubview(scrollView)
59-
scrollView.addSubview(contentView)
60-
contentView.addSubview(numberLabel)
61-
contentView.addSubview(titleLabel)
62-
contentView.addSubview(descriptionLabel)
63-
contentView.addSubview(nextButton)
64-
65-
scrollView.snp.makeConstraints { make in
66-
make.edges.equalTo(view.safeAreaLayoutGuide)
67-
}
68-
69-
contentView.snp.makeConstraints { make in
70-
make.edges.equalTo(scrollView)
71-
make.width.equalTo(scrollView)
72-
}
51+
52+
view.addSubview(numberLabel)
53+
view.addSubview(titleLabel)
54+
view.addSubview(descriptionLabel)
55+
view.addSubview(nextButton)
7356

7457
numberLabel.snp.makeConstraints { make in
75-
make.top.leading.trailing.equalToSuperview().inset(20)
58+
make.top.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(20)
7659
}
7760

7861
titleLabel.snp.makeConstraints { make in
@@ -93,11 +76,6 @@ class InterestsViewController: UIViewController {
9376
}
9477
}
9578

96-
private func setupScrollView() {
97-
// 스크롤 뷰와 컨텐츠 뷰 설정을 추가합니다.
98-
}
99-
100-
10179
private func setupButtons() {
10280
interests.enumerated().forEach { (index, interest) in
10381
let button = UIButton().then {
@@ -111,7 +89,7 @@ class InterestsViewController: UIViewController {
11189
$0.addTarget(self, action: #selector(interestButtonTapped(_:)), for: .touchUpInside)
11290
}
11391
buttons.append(button)
114-
contentView.addSubview(button)
92+
view.addSubview(button)
11593

11694
button.snp.makeConstraints { make in
11795
if index == 0 {
@@ -123,11 +101,6 @@ class InterestsViewController: UIViewController {
123101
make.height.equalTo(50)
124102
}
125103
}
126-
127-
// contentView의 bottom을 마지막 버튼의 bottom에 연결하여 스크롤뷰의 컨텐츠 사이즈를 결정합니다.
128-
contentView.snp.makeConstraints { make in
129-
make.bottom.equalTo(buttons.last!.snp.bottom).offset(20)
130-
}
131104
}
132105

133106
@objc func interestButtonTapped(_ sender: UIButton) {
@@ -151,15 +124,18 @@ class InterestsViewController: UIViewController {
151124
}
152125
}
153126

154-
@objc private func nextButtonTapped() {
155-
if selectedInterestsButton != nil {
156-
// 선택된 관심사를 처리하는 로직을 여기에 추가합니다.
157-
// 예를 들어 다음 화면으로 넘어가거나 선택된 관심사 정보를 저장합니다.
158-
} else {
159-
// 관심사가 선택되지 않았을 경우 사용자에게 알립니다.
160-
showAlertForInterestsSelection()
127+
@objc func nextButtonTapped() {
128+
// 선택된 버튼이 있는지 확인
129+
guard selectedInterestsButton != nil else {
130+
// 경고 메시지 표시 또는 사용자에게 선택하라고 알림
131+
showAlertForInterestsSelection()
132+
return
133+
}
134+
print("next favorite")
135+
136+
let favoriteVC = MyFavoriteListViweController()
137+
navigationController?.pushViewController(favoriteVC, animated: true)
161138
}
162-
}
163139

164140
private func showAlertForInterestsSelection() {
165141
let alert = UIAlertController(title: "관심사 선택", message: "계속하려면 관심사를 선택해주세요.", preferredStyle: .alert)

0 commit comments

Comments
 (0)