Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] #15 - GoalRewardInfoVC UI 구현 #17

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
A3BC2F2B2962C3D500198261 /* GoalRewardInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */; };
A3BC2F2D2962C3F200198261 /* ActivityRecordInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */; };
A3BC2F2F2962C40A00198261 /* UploadedCourseInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2E2962C40A00198261 /* UploadedCourseInfoVC.swift */; };
A3BC2F322962E0DB00198261 /* GoalRewardInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */; };
A3BC2F34296303A600198261 /* GoalRewardInfoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F33296303A600198261 /* GoalRewardInfoCVC.swift */; };
CE17F02D2961BBA100E1DED0 /* ColorLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE17F02C2961BBA100E1DED0 /* ColorLiterals.swift */; };
CE17F0332961BEF800E1DED0 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = CE17F02F2961BEF800E1DED0 /* Pretendard-Medium.otf */; };
CE17F0342961BEF800E1DED0 /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CE17F0302961BEF800E1DED0 /* Pretendard-Bold.otf */; };
Expand Down Expand Up @@ -87,6 +89,8 @@
A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoVC.swift; sourceTree = "<group>"; };
A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoVC.swift; sourceTree = "<group>"; };
A3BC2F2E2962C40A00198261 /* UploadedCourseInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseInfoVC.swift; sourceTree = "<group>"; };
A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoModel.swift; sourceTree = "<group>"; };
A3BC2F33296303A600198261 /* GoalRewardInfoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoCVC.swift; sourceTree = "<group>"; };
CE17F02C2961BBA100E1DED0 /* ColorLiterals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorLiterals.swift; sourceTree = "<group>"; };
CE17F02F2961BEF800E1DED0 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
CE17F0302961BEF800E1DED0 /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -202,13 +206,23 @@
A3BC2F292962C39F00198261 /* InfoVC */ = {
isa = PBXGroup;
children = (
A3BC2F302962E08400198261 /* GoalRewardInfoCollectionView */,
A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */,
A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */,
A3BC2F2E2962C40A00198261 /* UploadedCourseInfoVC.swift */,
);
path = InfoVC;
sourceTree = "<group>";
};
A3BC2F302962E08400198261 /* GoalRewardInfoCollectionView */ = {
isa = PBXGroup;
children = (
A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */,
A3BC2F33296303A600198261 /* GoalRewardInfoCVC.swift */,
);
path = GoalRewardInfoCollectionView;
sourceTree = "<group>";
};
CE17F02E2961BEAE00E1DED0 /* Fonts */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -831,13 +845,15 @@
CE665612295D92E400C64E12 /* UserDefaultWrapper.swift in Sources */,
CE665610295D92C200C64E12 /* setTextLineHeight.swift in Sources */,
CE6655E2295D87EB00C64E12 /* UIImage+.swift in Sources */,
A3BC2F322962E0DB00198261 /* GoalRewardInfoModel.swift in Sources */,
CEC2A68C2962AE1B00160BF7 /* RNStartMarker.swift in Sources */,
CE5875A4296015D2005D967E /* Encodable+.swift in Sources */,
CEEC6B4B2961D89700D00E1E /* CustomNavigationBar.swift in Sources */,
CE17F02D2961BBA100E1DED0 /* ColorLiterals.swift in Sources */,
CEC2A68E2962AF2C00160BF7 /* RNMarker.swift in Sources */,
CE6655D2295D862A00C64E12 /* Publisher+Driver.swift in Sources */,
CE6655E6295D887F00C64E12 /* UIStackView+.swift in Sources */,
A3BC2F34296303A600198261 /* GoalRewardInfoCVC.swift in Sources */,
CEB8416E2962C45300BF8080 /* LocationSearchResultTVC.swift in Sources */,
CE6655CA295D84DD00C64E12 /* UserDefaultKeyList.swift in Sources */,
CE6655F2295D894D00C64E12 /* UIView+.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
//
// GoalRewardInfoCVC.swift
// Runnect-iOS
//
// Created by 몽이 누나 on 2023/01/02.
//

import UIKit
import SnapKit
import Then

// MARK: - GoalRewardInfoCVC

class GoalRewardInfoCVC: UICollectionViewCell {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final~!


// MARK: - Identifier

static let identifier = "GoalRewardInfoCVC"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이거 이번에 추가한 utils중에 className을 사용하면 필요없어요!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


// MARK: - UI Components

private let containerView = UIView()
private let stampImageView = UIImageView()
private let stampStandardLabel = UILabel().then {
$0.textColor = .g1
$0.font = .b7
}

// MARK: - Life Cycles

override init(frame: CGRect) {
super.init(frame: frame)
setLayout()
}

required init(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

extension GoalRewardInfoCVC {

// MARK: - Layout Helpers

private func setLayout() {
contentView.addSubviews(stampImageView, stampStandardLabel)

contentView.snp.makeConstraints { make in
make.top.equalToSuperview()
make.centerX.equalToSuperview()
make.leading.equalToSuperview()
make.height.equalTo(112)
}

stampImageView.snp.makeConstraints { make in
make.top.leading.trailing.equalToSuperview()
make.width.equalTo(90)
}

stampStandardLabel.snp.makeConstraints { make in
make.top.equalTo(stampImageView.snp.bottom).offset(8)
make.centerX.equalToSuperview()
}
}

// MARK: - General Helpers

func dataBind(model: GoalRewardInfoModel) {
stampImageView.image = model.stampImg
stampStandardLabel.text = model.stampStandard
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// GoalRewardInfoModel.swift
// Runnect-iOS
//
// Created by 몽이 누나 on 2023/01/02.
//

import UIKit

struct GoalRewardInfoModel {
let stampImg: UIImage
let stampStandard: String
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,187 @@
//

import UIKit
import SnapKit
import Then

final class GoalRewardInfoVC: UIViewController {


// MARK: - UI Components

private lazy var navibar = CustomNavigationBar(self, type: .titleWithLeftButton).setTitle("목표 보상")
private let stampTopView = UIView()
private let stampBottomView = UIView()

private let stampImage = UIImageView().then {
$0.image = ImageLiterals.imgStamp
}

private let stampExcourageLabel = UILabel().then {
$0.text = "다양한 코스를 달리며 러닝 스탬프를 모아봐요"
$0.textColor = .g2
$0.font = .b4
}

private lazy var stampCollectionView: UICollectionView = {
let layout = UICollectionViewFlowLayout()
layout.scrollDirection = .vertical

let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
collectionView.translatesAutoresizingMaskIntoConstraints = false
collectionView.isScrollEnabled = true
collectionView.showsVerticalScrollIndicator = false
collectionView.delegate = self
collectionView.dataSource = self

return collectionView
}()

// MARK: - Variables

var stampList: [GoalRewardInfoModel] = [
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC1, stampStandard: "그리기 스타터"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC2, stampStandard: "그리기 중수"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC3, stampStandard: "그리기 마스터"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS1, stampStandard: "스크랩 베이비"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS2, stampStandard: "스크랩 어린이"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS3, stampStandard: "스크랩 어른이"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampP1, stampStandard: "새싹 업로더"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampP2, stampStandard: "중수 업로더"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampP3, stampStandard: "인플루언서"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR1, stampStandard: "달리기 유망주"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR2, stampStandard: "아마추어 선수"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR2, stampStandard: "마라톤 선수")
]

// MARK: - Constants

final let stampInset: UIEdgeInsets = UIEdgeInsets(top: 32, left: 34, bottom: 10, right: 34)
final let stampLineSpacing: CGFloat = 20
final let stampItemSpacing: CGFloat = 26
final let stampCellHeight: CGFloat = 112
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이부분은 위에 UI Components 보다 위쪽에 위치하도록 하면 좋아요~!


// MARK: - View Life Cycle

override func viewDidLoad() {
super.viewDidLoad()
setNavigationBar()
setUI()
// Do any additional setup after loading the view.
setLayout()
register()
}

}

// MARK: - Methods
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

사용하지 않은 주석들은 지워줍시다~!


// MARK: - @objc Function

// MARK: - UI & Layout

extension GoalRewardInfoVC {

// MARK: - Layout Helpers

private func setNavigationBar() {
view.addSubview(navibar)

navibar.snp.makeConstraints { make in
make.top.leading.trailing.equalTo(view.safeAreaLayoutGuide)
make.height.equalTo(48)
}
}

private func setUI() {
view.backgroundColor = .w1
stampBottomView.backgroundColor = .m3
stampCollectionView.backgroundColor = .m3
}

private func setLayout() {
view.addSubviews(stampTopView, stampBottomView)

stampTopView.snp.makeConstraints { make in
make.top.equalTo(navibar.snp.bottom)
make.leading.trailing.equalTo(view.safeAreaLayoutGuide)
make.height.equalTo(235)
}

stampTopView.addSubviews(stampImage, stampExcourageLabel)

stampImage.snp.makeConstraints { make in
make.top.equalToSuperview()
make.centerX.equalToSuperview()
make.width.equalTo(181)
make.height.equalTo(167)
}

stampExcourageLabel.snp.makeConstraints { make in
make.top.equalTo(stampImage.snp.bottom).offset(16)
make.centerX.equalToSuperview()
}

stampBottomView.snp.makeConstraints { make in
make.top.equalTo(stampTopView.snp.bottom)
make.leading.trailing.equalTo(view.safeAreaLayoutGuide)
make.height.equalTo(view.safeAreaLayoutGuide).inset(80)
}

stampBottomView.addSubview(stampCollectionView)

stampCollectionView.snp.makeConstraints { make in
make.top.leading.trailing.equalToSuperview()
make.height.equalTo(calculateCellHeight())
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

지금 보면 콜렉션 뷰를 stampBottomView로 감싸주고 있는데 그럴 필요 없어요!
모든 뷰를 감쌀 필요는 없습니다~!
저였으면 바로

stampCollectionView.snp.makContraints { make in 
    make.top.equalTo(stampTopView.snp.bottom)
    make.leading.trailing.equalTo(view. safeAreaLayoutGuide)
    make.bottom.equalToSuperView()
}

콜렉션뷰에 레이아웃을 잡았을 거 같아요!! 그리고 콜렉션 뷰에서 calculateCellHeight()로 높이를 직접 구해서 넣어줄 필요 없어요!
오토 레이아웃만 제가 제시한 코드대로 잘 잡아주면 알아서 높이가 잘 잡힐거에요~!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

헐!

}

// MARK: - General Helpers

private func register() {
stampCollectionView.register(GoalRewardInfoCVC.self,
forCellWithReuseIdentifier: GoalRewardInfoCVC.identifier)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
forCellWithReuseIdentifier: GoalRewardInfoCVC.identifier)
forCellWithReuseIdentifier: GoalRewardInfoCVC.className)

으로 사용하면 identifier를 만들어줄 필요가 없어요

}

func calculateCellHeight() -> CGFloat {
let count = CGFloat(stampList.count)
let heightCount = count / 3 + count.truncatingRemainder(dividingBy: 3)
return heightCount * stampCellHeight + (heightCount - 1) * stampLineSpacing + stampInset.top + stampInset.bottom
}

}

// MARK: - UICollectionViewDelegateFlowLayout

extension GoalRewardInfoVC: UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
let screenWidth = UIScreen.main.bounds.width
let tripleCellWidth = screenWidth - stampInset.left - stampInset.right - stampItemSpacing * 2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return CGSize(width: tripleCellWidth / 3, height: 112)
}

func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
return stampLineSpacing
}

func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
return stampLineSpacing
}

func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
return stampInset
}
}

// MARK: - UICollectionViewDataSource

extension GoalRewardInfoVC: UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return stampList.count
}

func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
guard let stampCell = collectionView.dequeueReusableCell(withReuseIdentifier: GoalRewardInfoCVC.identifier, for: indexPath) as? GoalRewardInfoCVC else { return UICollectionViewCell()}
stampCell.dataBind(model: stampList[indexPath.item])
return stampCell
}

}