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

[Setting] #113 - xcconfigs로 개발 환경 분기 #139

Merged
merged 33 commits into from
Apr 6, 2023
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e37ca5a
[Chore] #134 - DSKit의 Component 일부의 이름 앞에 ST(Soptamp)를 붙임
lsj8706 Mar 31, 2023
4e9ca53
[Chore] #134 - Soptamp 관련 Component 파일 위치를 DSKit에서 StampFeature로 이동
lsj8706 Mar 31, 2023
0d5f8b8
[Add] #134 - MainFeature를 위한 파일들 생성
lsj8706 Apr 1, 2023
b31e4a3
[Feat] #134 - MainVC에 의존성 주입
lsj8706 Apr 1, 2023
4488359
[Feat] #134 - 메인뷰의 NavigationBar UI 구현
lsj8706 Apr 1, 2023
98a500b
[Feat] #134 - CollectionView 기초 세팅
lsj8706 Apr 1, 2023
d428ac5
[Feat] #144 - UserHistoryHeaderView UI 구현
lsj8706 Apr 1, 2023
d346520
[Feat] #134 - UserHistory Section Inset 설정
lsj8706 Apr 1, 2023
7b8279a
[Feat] #134 - UserHistoryCVC 구현
lsj8706 Apr 1, 2023
639a764
[Feat] #134 - BriefNoticeCVC UI 구현
lsj8706 Apr 1, 2023
fc5d124
[Feat] #134 - createMainServiceSection 함수 구현
lsj8706 Apr 1, 2023
a7be1d3
[Feat] #134 - BriefNoticeCVC에서 비회원 UI 처리
lsj8706 Apr 1, 2023
cd5218b
[Feat] #134 - ServiceType 열거형 추가
lsj8706 Apr 1, 2023
40038e5
[Feat] #134 - MainServiceCVC 구현
lsj8706 Apr 1, 2023
955f5f4
[Feat] #134 - otherServiceSection 구현
lsj8706 Apr 1, 2023
89ab240
[Feat] #134 - 메인뷰의 Cell이 보여줄 정보를 viewModel에 위치시킴
lsj8706 Apr 1, 2023
bafda56
[Feat] #134 - AppServiceHeaderView 구현
lsj8706 Apr 2, 2023
2d59340
[Fix] #134 - UserHistoryCVC에서 Cell 재사용 시 뷰가 중복 생성되는 문제 해결
lsj8706 Apr 2, 2023
e621b04
[Feat] #134 - AppServiceCVC 구현
lsj8706 Apr 2, 2023
637cd04
[Chore] #134 - StringLiterals 수정
lsj8706 Apr 2, 2023
fe5226a
[Feat] #134 - Service 위치에 따른 UI 분기 처리
lsj8706 Apr 2, 2023
9b2da26
[Feat] #134 - viewModel에 appServiceList 추가
lsj8706 Apr 2, 2023
5bddc64
[Chore] #134 - UI 수정
lsj8706 Apr 2, 2023
9a19528
[Feat] #134 - Array+ 생성
lsj8706 Apr 3, 2023
ec5a122
[Fix] #134 - Label의 폰트 수정
lsj8706 Apr 3, 2023
7704cef
[Fix] #113 - 폴더명 변경
L-j-h-c Apr 5, 2023
867e24c
[Feat] #113 - xcconfig 분기
L-j-h-c Apr 5, 2023
cffcde5
[Chore] #124 - CollectionView에 사용되는 inset 수치를 Metric 열거형으로 생성
lsj8706 Apr 5, 2023
db70ce4
[Feat] #134 - UserHistoryHeaderView에서 attributedText를 주는 방식 변경
lsj8706 Apr 5, 2023
d1dad44
Merge pull request #138 from lsj8706/feat/#134-메인뷰UI
lsj8706 Apr 5, 2023
aa3952c
[Fix] Merge용 커밋
L-j-h-c Apr 5, 2023
38a3d58
Merge branch 'feature/#113' into feature/#113-merge
L-j-h-c Apr 5, 2023
e03a9f1
[Add] #113 - 누락된 asset 추가
L-j-h-c Apr 6, 2023
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
Prev Previous commit
Next Next commit
[Feat] #134 - BriefNoticeCVC에서 비회원 UI 처리
  • Loading branch information
lsj8706 committed Apr 1, 2023
commit a7be1d36e9e9ef8da95a333229a9c43cc493b09b
Original file line number Diff line number Diff line change
@@ -146,6 +146,7 @@ public struct I18N {
public static let visitor = "비회원"
public static let active = "기 활동 중"
public static let inactive = "기 수료"
public static let visitorGuide = "SOPT를 더 알고 싶다면, 둘러보세요"
}
}

Original file line number Diff line number Diff line change
@@ -15,6 +15,15 @@ final class BriefNoticeCVC: UICollectionViewCell {

// MARK: - UI Components

private let guideForVisitorLabel: UILabel = {
let label = UILabel()
label.text = I18N.Main.visitorGuide
label.font = UIFont.Main.headline1
label.textColor = DSKitAsset.Colors.white100.color
label.textAlignment = .left
return label
}()

private let containerView: UIView = {
let view = UIView()
view.backgroundColor = DSKitAsset.Colors.black60.color
@@ -48,7 +57,6 @@ final class BriefNoticeCVC: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
self.setUI()
self.setLayout()
}

required init?(coder: NSCoder) {
@@ -90,11 +98,30 @@ extension BriefNoticeCVC {
make.width.equalTo(moreNoticeButton.snp.height)
}
}

private func setLayoutForVisitor() {
self.subviews.forEach {
$0.removeFromSuperview()
}

self.addSubviews(guideForVisitorLabel)

guideForVisitorLabel.snp.makeConstraints { make in
make.edges.equalToSuperview()
make.height.equalTo(25)
}
}
}

// MARK: - Methods

extension BriefNoticeCVC {
func initCell(text: String) {
func initCell(userType: UserType, text: String) {
guard userType != .visitor else {
setLayoutForVisitor()
return
}
self.setLayout()
self.noticeLabel.text = text
}
}
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@ extension MainVC: UICollectionViewDataSource {
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: BriefNoticeCVC.className,
for: indexPath) as? BriefNoticeCVC
else { return UICollectionViewCell() }
cell.initCell(text: "SOPT 세미나 공지")
cell.initCell(userType: userType, text: "SOPT 세미나 공지")
return cell
}
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: MainServiceCVC.className, for: indexPath) as? MainServiceCVC else { return UICollectionViewCell() }