diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/Contents.json b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/Contents.json new file mode 100644 index 0000000..86ff98f --- /dev/null +++ b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "card_blue_contentDetail.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "card_blue_contentDetail@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "card_blue_contentDetail@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail.png new file mode 100644 index 0000000..407380e Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail@2x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail@2x.png new file mode 100644 index 0000000..94b5c7c Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail@2x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail@3x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail@3x.png new file mode 100644 index 0000000..14f1a64 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_blue_contentDetail.imageset/card_blue_contentDetail@3x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/Contents.json b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/Contents.json new file mode 100644 index 0000000..7278c51 --- /dev/null +++ b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "card_green_contentDetail.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "card_green_contentDetail@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "card_green_contentDetail@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail.png new file mode 100644 index 0000000..a07d9aa Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail@2x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail@2x.png new file mode 100644 index 0000000..89848d5 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail@2x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail@3x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail@3x.png new file mode 100644 index 0000000..f3fe3a8 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_green_contentDetail.imageset/card_green_contentDetail@3x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/Contents.json b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/Contents.json new file mode 100644 index 0000000..8f34773 --- /dev/null +++ b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "card_orange_contentDetail.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "card_orange_contentDetail@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "card_orange_contentDetail@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail.png new file mode 100644 index 0000000..d33f496 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail@2x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail@2x.png new file mode 100644 index 0000000..24a93f8 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail@2x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail@3x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail@3x.png new file mode 100644 index 0000000..94d1123 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_orange_contentDetail.imageset/card_orange_contentDetail@3x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/Contents.json b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/Contents.json new file mode 100644 index 0000000..79395d6 --- /dev/null +++ b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "card_pink_contentDetail.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "card_pink_contentDetail@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "card_pink_contentDetail@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail.png new file mode 100644 index 0000000..5d042c8 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail@2x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail@2x.png new file mode 100644 index 0000000..ccb37ba Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail@2x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail@3x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail@3x.png new file mode 100644 index 0000000..d13f6bf Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_pink_contentDetail.imageset/card_pink_contentDetail@3x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/Contents.json b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/Contents.json new file mode 100644 index 0000000..8a1d707 --- /dev/null +++ b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "card_purple_contentDetail.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "card_purple_contentDetail@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "card_purple_contentDetail@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail.png new file mode 100644 index 0000000..46f2125 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail@2x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail@2x.png new file mode 100644 index 0000000..40edb64 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail@2x.png differ diff --git a/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail@3x.png b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail@3x.png new file mode 100644 index 0000000..8dd4d44 Binary files /dev/null and b/Keyneez/Keyneez/Application/Assets.xcassets/Icons/card_purple_contentDetail.imageset/card_purple_contentDetail@3x.png differ diff --git a/Keyneez/Keyneez/Global/Auth/UserSession.swift b/Keyneez/Keyneez/Global/Auth/UserSession.swift index 87641b6..79d9c39 100644 --- a/Keyneez/Keyneez/Global/Auth/UserSession.swift +++ b/Keyneez/Keyneez/Global/Auth/UserSession.swift @@ -21,6 +21,6 @@ final class UserSession { private init() { } var profile: Profile? - var accessToken: String? = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2tleSI6Mjc3LCJpYXQiOjE2NzM2MzU3ODIsImV4cCI6MTY3MzY0Mjk4Mn0.XlA3A1w72I3OIF3h_nBxk4WtDjl_-gDV97xzw_fllCQ" + var accessToken: String? = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2tleSI6Mjk5LCJpYXQiOjE2NzM2Mzk3MDIsImV4cCI6MTY3MzY0NjkwMn0.aL2yxuMvSaCuTEiDZPnexm2c3tpRUZrxZeXU5_5djH4" } diff --git a/Keyneez/Keyneez/Tab/Home/Controllers/ContentDetailViewController.swift b/Keyneez/Keyneez/Tab/Home/Controllers/ContentDetailViewController.swift index c03634d..948d25a 100644 --- a/Keyneez/Keyneez/Tab/Home/Controllers/ContentDetailViewController.swift +++ b/Keyneez/Keyneez/Tab/Home/Controllers/ContentDetailViewController.swift @@ -218,6 +218,7 @@ extension ContentDetailViewController { setLikeButton(isLiked: model.liked) guard let url = model.contentImg else { return } contentImageView.setImage(url: url) + categoryView.setCategory(with: model.category[0]) } } diff --git a/Keyneez/Keyneez/Tab/Home/Controllers/HomeContentViewController.swift b/Keyneez/Keyneez/Tab/Home/Controllers/HomeContentViewController.swift index dbefd48..c1da71c 100644 --- a/Keyneez/Keyneez/Tab/Home/Controllers/HomeContentViewController.swift +++ b/Keyneez/Keyneez/Tab/Home/Controllers/HomeContentViewController.swift @@ -124,6 +124,9 @@ extension HomeContentViewController: UICollectionViewDataSource { withReuseIdentifier: HomeContentCollectionViewCell.identifier, for: indexPath) as? HomeContentCollectionViewCell else { return UICollectionViewCell() } homeContentCell.bindHomeData(model: contentList[indexPath.item]) + // 여기서 setCategory + homeContentCell.setHomeCategoryCard(category: contentList[indexPath.item].category[0]) + homeContentCell.setHomeCategoryView(category: contentList[indexPath.item].category[0]) return homeContentCell } } diff --git a/Keyneez/Keyneez/Tab/Home/Views/HomeContentCollectionViewCell.swift b/Keyneez/Keyneez/Tab/Home/Views/HomeContentCollectionViewCell.swift index d6bed4f..739bc63 100644 --- a/Keyneez/Keyneez/Tab/Home/Views/HomeContentCollectionViewCell.swift +++ b/Keyneez/Keyneez/Tab/Home/Views/HomeContentCollectionViewCell.swift @@ -47,7 +47,7 @@ final class HomeContentCollectionViewCell: UICollectionViewCell { $0.font = UIFont.font(.pretendardSemiBold, ofSize: 12) $0.textColor = UIColor.gray900 } - private let categoryView = CategoryView() + private var homeContentCategoryView = CategoryView() private lazy var likeButton = UIButton().then { $0.setImage(UIImage(named: "ic_favorite_home_line"), for: .normal) $0.setImage(UIImage(named: "ic_favorite_home_filled"), for: .selected) @@ -82,7 +82,7 @@ extension HomeContentCollectionViewCell { contentImageView, dateView, likeButton, - categoryView, + homeContentCategoryView, contentTitle, contentIntroduction, cardImageView @@ -113,14 +113,14 @@ extension HomeContentCollectionViewCell { $0.trailing.equalToSuperview().inset(24) $0.width.height.equalTo(32) } - categoryView.snp.makeConstraints { + homeContentCategoryView.snp.makeConstraints { $0.top.equalTo(contentImageView.snp.bottom).offset(27) $0.leading.equalTo(dateView) $0.width.equalTo(49) $0.height.equalTo(33) } contentTitle.snp.makeConstraints { - $0.top.equalTo(categoryView.snp.bottom).offset(12) + $0.top.equalTo(homeContentCategoryView.snp.bottom).offset(12) $0.leading.trailing.equalToSuperview().inset(21) } contentIntroduction.snp.makeConstraints { @@ -144,8 +144,8 @@ extension HomeContentCollectionViewCell { contentIntroduction.text = model.introduction likeButton.isSelected = model.liked contentImageView.setImage(url: model.contentImg) - setCategoryCard(category: model.category[0]) - categoryView.setCategory(with: model.category[0]) +// setCategoryCard(category: model.category[0]) // 여기야 +// homeContentCategoryView.setCategory(with: model.category[0]) } private func setTitle(fullTitle: String) -> String { guard let title = fullTitle as? String else {return ""} @@ -163,7 +163,7 @@ extension HomeContentCollectionViewCell { if model.startAt!.isEmpty || model.endAt!.isEmpty { dateView.isHidden = true; return "" } return getDate(fullDate: model.startAt!) + " ~ " + getDate(fullDate: model.endAt!) } - private func setCategoryCard(category: String) { + func setHomeCategoryCard(category: String) { switch(category) { case "진로" : cardImageView.image = UIImage(named: "card_green_home") @@ -180,6 +180,10 @@ extension HomeContentCollectionViewCell { } } + func setHomeCategoryView(category: String) { + homeContentCategoryView.setCategory(with: category) + } + @objc private func touchUpLikeButton() { likeButton.isSelected = !likeButton.isSelected diff --git a/Keyneez/Keyneez/Tab/KeyneezTabbarController.swift b/Keyneez/Keyneez/Tab/KeyneezTabbarController.swift index 7c9997c..213c06e 100644 --- a/Keyneez/Keyneez/Tab/KeyneezTabbarController.swift +++ b/Keyneez/Keyneez/Tab/KeyneezTabbarController.swift @@ -66,6 +66,8 @@ extension KeyneezTabbarController { var navigations = tabInfos.map { makeViewController(viewController: $0.viewController!, title: $0.title, imageName: $0.imageName) } + navigations[3].tabBarItem.isEnabled = false + navigations[4].tabBarItem.isEnabled = false // navigations.insert(homeViewNavigationController, at: 0) self.viewControllers = navigations }