Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ final class ActivityHistoryViewController: BaseViewController<ActivityHistoryVie

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationController?.setNavigationBarHidden(true, animated: animated)
viewModel.action(input: .invalidateCacheAndRefetch)
}

Expand All @@ -77,6 +78,9 @@ final class ActivityHistoryViewController: BaseViewController<ActivityHistoryVie
badgeSectionBackgroundImageView.image = BitnagilGraphic.badgeBackgroundGraphic
badgeSectionBackgroundImageView.isUserInteractionEnabled = false

// TODO: 추후 청년공고 API 해결 후 삭제
youthOpportunityView.isHidden = true

youthOpportunityView.backgroundColor = BitnagilColor.orange25

youthOpportunityStackView.axis = .horizontal
Expand Down Expand Up @@ -117,7 +121,7 @@ final class ActivityHistoryViewController: BaseViewController<ActivityHistoryVie
emotionCalendarSectionView.addSubview($0)
}

[badgeSectionBackgroundImageView, youthOpportunityView, emotionCalendarSectionView].forEach {
[badgeSectionBackgroundImageView, /*youthOpportunityView,*/ emotionCalendarSectionView].forEach {
contentView.addSubview($0)
}

Expand All @@ -131,11 +135,13 @@ final class ActivityHistoryViewController: BaseViewController<ActivityHistoryVie
make.centerY.equalToSuperview().offset(Layout.navigationBarHeight / 2)
}

/*
youthOpportunityView.addSubview(youthOpportunityStackView)
let spacerView = UIView()
[youthOpportunityIcon, youthOpportunityLabel, spacerView, youthOpportunityButton].forEach {
youthOpportunityStackView.addArrangedSubview($0)
}
*/

scrollView.snp.makeConstraints { make in
make.edges.equalToSuperview()
Expand All @@ -146,6 +152,8 @@ final class ActivityHistoryViewController: BaseViewController<ActivityHistoryVie
make.width.equalTo(scrollView.frameLayoutGuide)
}

// TODO: - 추후 청년공고 API 해결 후 주석처리 제거
/*
youthOpportunityView.snp.makeConstraints { make in
make.top.equalTo(badgeSectionBackgroundImageView.snp.bottom)
make.horizontalEdges.equalToSuperview()
Expand All @@ -160,9 +168,11 @@ final class ActivityHistoryViewController: BaseViewController<ActivityHistoryVie
youthOpportunityIcon.snp.makeConstraints { make in
make.size.equalTo(Layout.youthOpportunityIconSize)
}
*/

emotionCalendarSectionView.snp.makeConstraints { make in
make.top.equalTo(youthOpportunityView.snp.bottom)
// make.top.equalTo(youthOpportunityView.snp.bottom)
make.top.equalTo(badgeSectionBackgroundImageView.snp.bottom)
make.horizontalEdges.equalTo(safeArea)
make.bottom.equalToSuperview()
}
Expand Down
4 changes: 2 additions & 2 deletions Projects/Presentation/Sources/Common/View/TabBarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ final public class TabBarView: UITabBarController {

activityHistoryView.tabBarItem = UITabBarItem(
title: "활동 일지",
image: BitnagilIcon.reportFillIcon,
selectedImage: BitnagilIcon.reportFillIcon)
image: BitnagilIcon.reportFillIcon?.withRenderingMode(.alwaysOriginal),
selectedImage: BitnagilIcon.reportFillIcon?.withRenderingMode(.alwaysOriginal))

mypageView.tabBarItem = UITabBarItem(
title: "마이페이지",
Expand Down
Loading