From dc71d3c9637d82af554346893223082f474b74e9 Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Mon, 27 May 2024 15:10:56 +0900 Subject: [PATCH 1/7] =?UTF-8?q?Add:=20=EC=83=81=ED=92=88=20=EC=B7=A8?= =?UTF-8?q?=ED=96=A5=20=ED=95=84=ED=84=B0=EC=97=90=20=ED=95=B4=EB=8B=B9?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/Filter/FilterType.swift | 1 + .../ProductFilterSectionLayout.swift | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift b/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift index ed955b2a..b6952986 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift @@ -12,6 +12,7 @@ enum FilterType: Decodable { case recommend // 상품 추천 case category // 카테고리 case event // 행사 + // TODO: 상품 취향 필터 추가 예정 case unknown init(from decoder: Decoder) throws { diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift index 7eff080a..7c641a47 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift @@ -13,6 +13,7 @@ final class ProductFilterSectionLayout { static let sortCellHeight: CGFloat = 40 static let eventCellHeight: CGFloat = 40 static let categoryCellHeight: CGFloat = 108 + static let userTasteCellHeight: CGFloat = 108 } private func createSortSection() -> NSCollectionLayoutSection { @@ -100,6 +101,30 @@ final class ProductFilterSectionLayout { let section = NSCollectionLayoutSection(group: group) return section } + + private func createUserTasteSection() -> NSCollectionLayoutSection { + let itemSize = NSCollectionLayoutSize( + widthDimension: .fractionalWidth(0.33), + heightDimension: .fractionalHeight(1) + ) + let item = NSCollectionLayoutItem(layoutSize: itemSize) + + let groupSize = NSCollectionLayoutSize( + widthDimension: .fractionalWidth(1), + heightDimension: .estimated(Size.userTasteCellHeight) + ) + let group = NSCollectionLayoutGroup.horizontal( + layoutSize: groupSize, + subitem: item, + count: 3 + ) + group.interItemSpacing = .fixed(.spacing24) + + let section = NSCollectionLayoutSection(group: group) + section.interGroupSpacing = .spacing20 + + return section + } } extension ProductFilterSectionLayout { @@ -111,6 +136,7 @@ extension ProductFilterSectionLayout { return createEventSection() case .category, .recommend: return createCategorySection() + // TODO: 상품 취향 필터 추가 예정 case .unknown: return nil } From 62425805b125c22a73ce2ebdd2a5f5dead36b92f Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Mon, 27 May 2024 15:53:22 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Add:=20=EC=83=81=ED=92=88=20=EC=B7=A8?= =?UTF-8?q?=ED=96=A5=20=ED=83=9C=EA=B7=B8=EB=A5=BC=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?UserTasteTagView=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pyonsnal-Color.xcodeproj/project.pbxproj | 12 ++++ .../UserTasteTagView/UserTasteTagView.swift | 68 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 Pyonsnal-Color/Pyonsnal-Color/ProductDetail/Subview/UserTasteTagView/UserTasteTagView.swift diff --git a/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj b/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj index 2700944e..20a09d98 100644 --- a/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj +++ b/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj @@ -59,6 +59,7 @@ B2674D0E2A42DFF9004193DE /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = F069DBEA2A30BA8C0001D3DD /* Pretendard-SemiBold.otf */; }; B2674D0F2A42DFFC004193DE /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = F069DBE92A30BA8C0001D3DD /* Pretendard-Regular.otf */; }; B2674D102A42DFFE004193DE /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F069DBE82A30BA8C0001D3DD /* Pretendard-Medium.otf */; }; + B26EEA572C0462AB0013D082 /* UserTasteTagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26EEA562C0462AB0013D082 /* UserTasteTagView.swift */; }; B27349DE2A5AA26300B97E59 /* ProductListDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B27349DD2A5AA26300B97E59 /* ProductListDelegate.swift */; }; B27349E02A5AC7F900B97E59 /* EventBannerEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = B27349DF2A5AC7F900B97E59 /* EventBannerEntity.swift */; }; B28204F32A345EB100F9242F /* RootComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28204F22A345EB100F9242F /* RootComponent.swift */; }; @@ -392,6 +393,7 @@ B2538B912A34551D00B7C3F0 /* LoggedInBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedInBuilder.swift; sourceTree = ""; }; B2538B922A34551D00B7C3F0 /* LoggedInInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedInInteractor.swift; sourceTree = ""; }; B2674D0C2A42DBCA004193DE /* ProductHomeViewHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductHomeViewHolder.swift; sourceTree = ""; }; + B26EEA562C0462AB0013D082 /* UserTasteTagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserTasteTagView.swift; sourceTree = ""; }; B27349DD2A5AA26300B97E59 /* ProductListDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductListDelegate.swift; sourceTree = ""; }; B27349DF2A5AC7F900B97E59 /* EventBannerEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBannerEntity.swift; sourceTree = ""; }; B28204F22A345EB100F9242F /* RootComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootComponent.swift; sourceTree = ""; }; @@ -888,6 +890,14 @@ path = ProfileHome; sourceTree = ""; }; + B26EEA552C04629C0013D082 /* UserTasteTagView */ = { + isa = PBXGroup; + children = ( + B26EEA562C0462AB0013D082 /* UserTasteTagView.swift */, + ); + path = UserTasteTagView; + sourceTree = ""; + }; B28A59112A6E98C000431F39 /* ReusableView */ = { isa = PBXGroup; children = ( @@ -1384,6 +1394,7 @@ BAE984392AACFB2A00ED22CB /* Subview */ = { isa = PBXGroup; children = ( + B26EEA552C04629C0013D082 /* UserTasteTagView */, BAD6AEFB2AEC52440062B16F /* ReviewEvaluationLabelView */, BAD6AEF82AEC51970062B16F /* ReviewFeedbackButton */, BAED359B2AC5D428002BC69D /* ReviewTagListView */, @@ -2171,6 +2182,7 @@ BAED359D2AC5D432002BC69D /* ReviewTagListView.swift in Sources */, BA83225C2AB7299F00D2E1EB /* ProductDetailSectionItem.swift in Sources */, B24F1D382A44171800AA03DC /* ProductHomePageViewController.swift in Sources */, + B26EEA572C0462AB0013D082 /* UserTasteTagView.swift in Sources */, F0C582C12A55E83400DAD387 /* TermsOfUseRouter.swift in Sources */, F097EF2C2A57181B00A7FB9C /* TermsOfUseUrl.swift in Sources */, F00352212A62B9F000A66FF9 /* AuthType.swift in Sources */, diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductDetail/Subview/UserTasteTagView/UserTasteTagView.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductDetail/Subview/UserTasteTagView/UserTasteTagView.swift new file mode 100644 index 00000000..233b6c3c --- /dev/null +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductDetail/Subview/UserTasteTagView/UserTasteTagView.swift @@ -0,0 +1,68 @@ +// +// UserTasteTagView.swift +// Pyonsnal-Color +// +// Created by 김인호 on 5/27/24. +// + +import UIKit +import SnapKit + +final class UserTasteTagView: UIView { + + // MARK: Declaration + struct Payload { + // TODO: 추가 예정 + } + + // MARK: UI Component + private let contentView: UIView = { + let view = UIView() + view.backgroundColor = .red100 + view.makeRounded(with: 1) + return view + }() + + private let userTasteTagLabel: UILabel = { + let label = UILabel() + label.textColor = .red500 + label.font = .body3r + return label + }() + + // MARK: Interface + var payload: Payload? { + didSet { updateView() } + } + + // MARK: Initializer + init() { + super.init(frame: .zero) + + configureView() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: Private Methods + private func configureView() { + addSubview(contentView) + + contentView.addSubview(userTasteTagLabel) + + contentView.snp.makeConstraints { + $0.edges.equalToSuperview() + } + userTasteTagLabel.snp.makeConstraints { + $0.leading.equalToSuperview().offset(.spacing8) + $0.trailing.equalToSuperview().inset(.spacing8) + $0.height.equalTo(userTasteTagLabel.font.customLineHeight) + $0.centerY.equalToSuperview() + } + } + + private func updateView() { + } +} From bb5957a58bb15f474dc18d35d2b05e6cdf9cac8a Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Tue, 28 May 2024 16:47:59 +0900 Subject: [PATCH 3/7] =?UTF-8?q?Refactor:=20RecommendFilterCell=EC=97=90=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductFilter/Cell/RecommendFilterCell.swift | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/Cell/RecommendFilterCell.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/Cell/RecommendFilterCell.swift index a4a58546..91eb3397 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/Cell/RecommendFilterCell.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/Cell/RecommendFilterCell.swift @@ -10,15 +10,6 @@ import SnapKit final class RecommendFilterCell: UICollectionViewCell { - enum Image { - static let checkMark = "checkmark" - } - - enum Size { - static let selectedBorderWidth: CGFloat = 2 - static let unselectedBorderWidth: CGFloat = 1 - } - private let viewHolder = ViewHolder() override var isSelected: Bool { From 66ba9867b724010ccf1de1004519dfd84186c75f Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Tue, 4 Jun 2024 14:46:26 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Etc:=20=ED=83=80=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=EC=97=90=EC=84=9C=20=EC=A4=91=EB=B3=B5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EB=90=9C=20UserTasteTagView=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pyonsnal-Color.xcodeproj/project.pbxproj | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj b/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj index 20a09d98..2700944e 100644 --- a/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj +++ b/Pyonsnal-Color/Pyonsnal-Color.xcodeproj/project.pbxproj @@ -59,7 +59,6 @@ B2674D0E2A42DFF9004193DE /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = F069DBEA2A30BA8C0001D3DD /* Pretendard-SemiBold.otf */; }; B2674D0F2A42DFFC004193DE /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = F069DBE92A30BA8C0001D3DD /* Pretendard-Regular.otf */; }; B2674D102A42DFFE004193DE /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F069DBE82A30BA8C0001D3DD /* Pretendard-Medium.otf */; }; - B26EEA572C0462AB0013D082 /* UserTasteTagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26EEA562C0462AB0013D082 /* UserTasteTagView.swift */; }; B27349DE2A5AA26300B97E59 /* ProductListDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B27349DD2A5AA26300B97E59 /* ProductListDelegate.swift */; }; B27349E02A5AC7F900B97E59 /* EventBannerEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = B27349DF2A5AC7F900B97E59 /* EventBannerEntity.swift */; }; B28204F32A345EB100F9242F /* RootComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28204F22A345EB100F9242F /* RootComponent.swift */; }; @@ -393,7 +392,6 @@ B2538B912A34551D00B7C3F0 /* LoggedInBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedInBuilder.swift; sourceTree = ""; }; B2538B922A34551D00B7C3F0 /* LoggedInInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggedInInteractor.swift; sourceTree = ""; }; B2674D0C2A42DBCA004193DE /* ProductHomeViewHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductHomeViewHolder.swift; sourceTree = ""; }; - B26EEA562C0462AB0013D082 /* UserTasteTagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserTasteTagView.swift; sourceTree = ""; }; B27349DD2A5AA26300B97E59 /* ProductListDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductListDelegate.swift; sourceTree = ""; }; B27349DF2A5AC7F900B97E59 /* EventBannerEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBannerEntity.swift; sourceTree = ""; }; B28204F22A345EB100F9242F /* RootComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootComponent.swift; sourceTree = ""; }; @@ -890,14 +888,6 @@ path = ProfileHome; sourceTree = ""; }; - B26EEA552C04629C0013D082 /* UserTasteTagView */ = { - isa = PBXGroup; - children = ( - B26EEA562C0462AB0013D082 /* UserTasteTagView.swift */, - ); - path = UserTasteTagView; - sourceTree = ""; - }; B28A59112A6E98C000431F39 /* ReusableView */ = { isa = PBXGroup; children = ( @@ -1394,7 +1384,6 @@ BAE984392AACFB2A00ED22CB /* Subview */ = { isa = PBXGroup; children = ( - B26EEA552C04629C0013D082 /* UserTasteTagView */, BAD6AEFB2AEC52440062B16F /* ReviewEvaluationLabelView */, BAD6AEF82AEC51970062B16F /* ReviewFeedbackButton */, BAED359B2AC5D428002BC69D /* ReviewTagListView */, @@ -2182,7 +2171,6 @@ BAED359D2AC5D432002BC69D /* ReviewTagListView.swift in Sources */, BA83225C2AB7299F00D2E1EB /* ProductDetailSectionItem.swift in Sources */, B24F1D382A44171800AA03DC /* ProductHomePageViewController.swift in Sources */, - B26EEA572C0462AB0013D082 /* UserTasteTagView.swift in Sources */, F0C582C12A55E83400DAD387 /* TermsOfUseRouter.swift in Sources */, F097EF2C2A57181B00A7FB9C /* TermsOfUseUrl.swift in Sources */, F00352212A62B9F000A66FF9 /* AuthType.swift in Sources */, From 9f613fac8480d130f1f557defc76f54fb8186729 Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Tue, 4 Jun 2024 15:32:58 +0900 Subject: [PATCH 5/7] =?UTF-8?q?Add:=20FilterType=EC=97=90=20productTastes?= =?UTF-8?q?=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?= =?UTF-8?q?=20ProductHome=EC=97=90=20=EB=8D=94=EB=AF=B8=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9E=84=EC=8B=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/Filter/FilterType.swift | 5 ++++- .../ProductFilterSectionLayout.swift | 8 +++++--- .../ProductHome/ProductHomeViewController.swift | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift b/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift index b6952986..c15ecdb2 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/Entity/Filter/FilterType.swift @@ -12,7 +12,7 @@ enum FilterType: Decodable { case recommend // 상품 추천 case category // 카테고리 case event // 행사 - // TODO: 상품 취향 필터 추가 예정 + case productTastes // 상품 취향 case unknown init(from decoder: Decoder) throws { @@ -23,6 +23,7 @@ enum FilterType: Decodable { case "recommend": self = .recommend case "category": self = .category case "event": self = .event + case "productTastes": self = .productTastes default: self = .unknown } } @@ -37,6 +38,8 @@ enum FilterType: Decodable { return "카테고리" case .event: return "행사" + case .productTastes: + return "상품 취향" case .unknown: return "" } diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift index 7c641a47..5512b989 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterSectionLayout.swift @@ -13,7 +13,7 @@ final class ProductFilterSectionLayout { static let sortCellHeight: CGFloat = 40 static let eventCellHeight: CGFloat = 40 static let categoryCellHeight: CGFloat = 108 - static let userTasteCellHeight: CGFloat = 108 + static let productTastesCellHeight: CGFloat = 108 } private func createSortSection() -> NSCollectionLayoutSection { @@ -102,7 +102,7 @@ final class ProductFilterSectionLayout { return section } - private func createUserTasteSection() -> NSCollectionLayoutSection { + private func createProductTastesSection() -> NSCollectionLayoutSection { let itemSize = NSCollectionLayoutSize( widthDimension: .fractionalWidth(0.33), heightDimension: .fractionalHeight(1) @@ -111,7 +111,7 @@ final class ProductFilterSectionLayout { let groupSize = NSCollectionLayoutSize( widthDimension: .fractionalWidth(1), - heightDimension: .estimated(Size.userTasteCellHeight) + heightDimension: .estimated(Size.productTastesCellHeight) ) let group = NSCollectionLayoutGroup.horizontal( layoutSize: groupSize, @@ -136,6 +136,8 @@ extension ProductFilterSectionLayout { return createEventSection() case .category, .recommend: return createCategorySection() + case .productTastes: + return createProductTastesSection() // TODO: 상품 취향 필터 추가 예정 case .unknown: return nil diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift index 56586fe8..8aaa32b7 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift @@ -149,6 +149,22 @@ final class ProductHomeViewController: return FilterItem.filter(filterItem: filterItem) } snapshot.appendItems(filterItems) + + // TODO: 더미데이터 삭제 + let dummyProductTasteItems = [ + FilterItemEntity(name: "카페인러버", code: 0, image: nil), + FilterItemEntity(name: "헬창", code: 1, image: nil), + FilterItemEntity(name: "캐릭터컬렉터", code: 2, image: nil) + ] + let dummyProductTaste = [FilterEntity( + filterType: .productTastes, + defaultText: "상품 취향", + filterItem: dummyProductTasteItems + )].map { filter in + let filterItem = FilterCellItem(filter: filter) + return FilterItem.filter(filterItem: filterItem) + } + snapshot.appendItems(dummyProductTaste) } filterDataSource?.apply(snapshot, animatingDifferences: true) From f95b3b2964680586aaaeeff463d8e4870b9a0b35 Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Tue, 25 Jun 2024 15:59:34 +0900 Subject: [PATCH 6/7] =?UTF-8?q?Add:=20ProductFilterVC=EC=97=90=20ProductTa?= =?UTF-8?q?stes=20=EC=BC=80=EC=9D=B4=EC=8A=A4=EC=97=90=20=ED=95=B4?= =?UTF-8?q?=EB=8B=B9=ED=95=98=EB=8A=94=20=EC=85=80=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductFilter/ProductFilterViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterViewController.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterViewController.swift index 57fcba98..1cc888e5 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterViewController.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductFilter/ProductFilterViewController.swift @@ -146,7 +146,7 @@ final class ProductFilterViewController: self?.setSelectedItemToCollectionView(at: index) } return cell - case .category, .recommend: + case .category, .recommend, .productTastes: let cell: RecommendFilterCell = collectionView.dequeueReusableCell(for: index) cell.configureCell(filterItem: item) From 01c18ae1a19b933837a8b949d43c121305f16674 Mon Sep 17 00:00:00 2001 From: lnhk98 Date: Tue, 25 Jun 2024 16:00:20 +0900 Subject: [PATCH 7/7] =?UTF-8?q?Etc:=20=EC=83=81=ED=92=88=20=EC=B7=A8?= =?UTF-8?q?=ED=96=A5=20=EB=8D=94=EB=AF=B8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductHome/ProductHomeViewController.swift | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift b/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift index 8aaa32b7..56586fe8 100644 --- a/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift +++ b/Pyonsnal-Color/Pyonsnal-Color/ProductHome/ProductHomeViewController.swift @@ -149,22 +149,6 @@ final class ProductHomeViewController: return FilterItem.filter(filterItem: filterItem) } snapshot.appendItems(filterItems) - - // TODO: 더미데이터 삭제 - let dummyProductTasteItems = [ - FilterItemEntity(name: "카페인러버", code: 0, image: nil), - FilterItemEntity(name: "헬창", code: 1, image: nil), - FilterItemEntity(name: "캐릭터컬렉터", code: 2, image: nil) - ] - let dummyProductTaste = [FilterEntity( - filterType: .productTastes, - defaultText: "상품 취향", - filterItem: dummyProductTasteItems - )].map { filter in - let filterItem = FilterCellItem(filter: filter) - return FilterItem.filter(filterItem: filterItem) - } - snapshot.appendItems(dummyProductTaste) } filterDataSource?.apply(snapshot, animatingDifferences: true)