[Feat] #40 - 검색뷰 UI 구현

GEON-PPANG-iOS.xcodeproj/project.pbxproj

@@ -44,6 +44,8 @@
 		097682E72A5CF0080008F4FB /* BakeryFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097682E62A5CF0080008F4FB /* BakeryFilterView.swift */; };
 		097682E92A5D0B6B0008F4FB /* BakeryListTopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097682E82A5D0B6B0008F4FB /* BakeryListTopView.swift */; };
 		097682EB2A5D12BD0008F4FB /* BakeryListCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097682EA2A5D12BD0008F4FB /* BakeryListCollectionViewCell.swift */; };
+		098716B42A6061F500538D05 /* SearchResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098716B32A6061F500538D05 /* SearchResponseDTO.swift */; };
+		098716B62A60F52200538D05 /* BakeryTypeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098716B52A60F52200538D05 /* BakeryTypeProtocol.swift */; };
 		0987288D2A5BA1F000A29402 /* BookmarkButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0987288C2A5BA1F000A29402 /* BookmarkButton.swift */; };
 		098F32EA2A4200FE0092D09A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 098F32E92A4200FE0092D09A /* Assets.xcassets */; };
 		098F32ED2A4200FE0092D09A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 098F32EB2A4200FE0092D09A /* LaunchScreen.storyboard */; };
@@ -55,7 +57,6 @@
 		09B13F562A59410C00C0C723 /* CALayer+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B13F552A59410C00C0C723 /* CALayer+.swift */; };
 		09B13F582A59433500C0C723 /* TabBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B13F572A59433500C0C723 /* TabBarItem.swift */; };
 		09B13F5A2A5946B700C0C723 /* TabBar+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B13F592A5946B700C0C723 /* TabBar+.swift */; };
-		09B71BFC2A59CF3E00076AC2 /* Protocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B71BFB2A59CF3E00076AC2 /* Protocol.swift */; };
 		09B71C002A59D50900076AC2 /* HomeTopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B71BFF2A59D50900076AC2 /* HomeTopView.swift */; };
 		09B71C022A59D99200076AC2 /* SearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B71C012A59D99200076AC2 /* SearchTextField.swift */; };
 		09C6264E2A5B29F8002C8110 /* SearchEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09C6264D2A5B29F8002C8110 /* SearchEnum.swift */; };
@@ -66,6 +67,9 @@
 		09CA3EFC2A569E4A0063897A /* URLConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CA3EFB2A569E4A0063897A /* URLConstant.swift */; };
 		09CA3F062A569EB30063897A /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CA3F052A569EB30063897A /* API.swift */; };
 		09CA3F082A569EBA0063897A /* Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CA3F072A569EBA0063897A /* Service.swift */; };
+		09FD47C82A5DC991002020BD /* SearchNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09FD47C72A5DC991002020BD /* SearchNavigationView.swift */; };
+		09FD47CA2A5DD38D002020BD /* SearchResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09FD47C92A5DD38D002020BD /* SearchResultView.swift */; };
+		09FD47D22A5DF892002020BD /* EmptyCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09FD47D12A5DF892002020BD /* EmptyCollectionViewCell.swift */; };
 		3E16E4F52A57CF3800B813D0 /* WriteReviewDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4F42A57CF3800B813D0 /* WriteReviewDTO.swift */; };
 		3E16E4FA2A57D1F400B813D0 /* RecommendationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4F92A57D1F400B813D0 /* RecommendationModel.swift */; };
 		3E16E4FC2A57D24900B813D0 /* LikeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E16E4FB2A57D24900B813D0 /* LikeModel.swift */; };
@@ -121,6 +125,8 @@
 		097682E62A5CF0080008F4FB /* BakeryFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BakeryFilterView.swift; sourceTree = "<group>"; };
 		097682E82A5D0B6B0008F4FB /* BakeryListTopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BakeryListTopView.swift; sourceTree = "<group>"; };
 		097682EA2A5D12BD0008F4FB /* BakeryListCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BakeryListCollectionViewCell.swift; sourceTree = "<group>"; };
+		098716B32A6061F500538D05 /* SearchResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResponseDTO.swift; sourceTree = "<group>"; };
+		098716B52A60F52200538D05 /* BakeryTypeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BakeryTypeProtocol.swift; sourceTree = "<group>"; };
 		0987288C2A5BA1F000A29402 /* BookmarkButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkButton.swift; sourceTree = "<group>"; };
 		098F32DD2A4200FD0092D09A /* GEON-PPANG-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GEON-PPANG-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		098F32E02A4200FD0092D09A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -136,7 +142,6 @@
 		09B13F552A59410C00C0C723 /* CALayer+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+.swift"; sourceTree = "<group>"; };
 		09B13F572A59433500C0C723 /* TabBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarItem.swift; sourceTree = "<group>"; };
 		09B13F592A5946B700C0C723 /* TabBar+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TabBar+.swift"; sourceTree = "<group>"; };
-		09B71BFB2A59CF3E00076AC2 /* Protocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Protocol.swift; sourceTree = "<group>"; };
 		09B71BFF2A59D50900076AC2 /* HomeTopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTopView.swift; sourceTree = "<group>"; };
 		09B71C012A59D99200076AC2 /* SearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTextField.swift; sourceTree = "<group>"; };
 		09C6264D2A5B29F8002C8110 /* SearchEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchEnum.swift; sourceTree = "<group>"; };
@@ -147,6 +152,9 @@
 		09CA3EFB2A569E4A0063897A /* URLConstant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLConstant.swift; sourceTree = "<group>"; };
 		09CA3F052A569EB30063897A /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
 		09CA3F072A569EBA0063897A /* Service.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Service.swift; sourceTree = "<group>"; };
+		09FD47C72A5DC991002020BD /* SearchNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchNavigationView.swift; sourceTree = "<group>"; };
+		09FD47C92A5DD38D002020BD /* SearchResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultView.swift; sourceTree = "<group>"; };
+		09FD47D12A5DF892002020BD /* EmptyCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyCollectionViewCell.swift; sourceTree = "<group>"; };
 		3E16E4F42A57CF3800B813D0 /* WriteReviewDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteReviewDTO.swift; sourceTree = "<group>"; };
 		3E16E4F92A57D1F400B813D0 /* RecommendationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendationModel.swift; sourceTree = "<group>"; };
 		3E16E4FB2A57D24900B813D0 /* LikeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LikeModel.swift; sourceTree = "<group>"; };
@@ -262,6 +270,8 @@
 		093214032A5AE3C000875EF6 /* Search */ = {
 			isa = PBXGroup;
 			children = (
+				098716B22A603A8500538D05 /* Model */,
+				09FD47C62A5DC97E002020BD /* Views */,
 				093214052A5AE3D600875EF6 /* ViewControllers */,
 			);
 			path = Search;
@@ -271,6 +281,7 @@
 			isa = PBXGroup;
 			children = (
 				093214072A5AE40900875EF6 /* SearchViewController.swift */,
+				09FD47D12A5DF892002020BD /* EmptyCollectionViewCell.swift */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -429,6 +440,14 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		098716B22A603A8500538D05 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				098716B32A6061F500538D05 /* SearchResponseDTO.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		098F32D42A4200FD0092D09A = {
 			isa = PBXGroup;
 			children = (
@@ -534,11 +553,20 @@
 		09CA3EF62A56738A0063897A /* Protocol */ = {
 			isa = PBXGroup;
 			children = (
-				09B71BFB2A59CF3E00076AC2 /* Protocol.swift */,
+				098716B52A60F52200538D05 /* BakeryTypeProtocol.swift */,
 			);
 			path = Protocol;
 			sourceTree = "<group>";
 		};
+		09FD47C62A5DC97E002020BD /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				09FD47C72A5DC991002020BD /* SearchNavigationView.swift */,
+				09FD47C92A5DD38D002020BD /* SearchResultView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		3E16E4F22A57CE2B00B813D0 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -813,6 +841,7 @@
 				090556292A51DBC000752067 /* UIView+.swift in Sources */,
 				090668FC2A4FF3C600F413FA /* AppDelegate.swift in Sources */,
 				3E79B1B02A571B4B00D36A26 /* LineView.swift in Sources */,
+				09FD47C82A5DC991002020BD /* SearchNavigationView.swift in Sources */,
 				090668FD2A4FF3C600F413FA /* SceneDelegate.swift in Sources */,
 				097682DC2A5C83910008F4FB /* CGFloat+.swift in Sources */,
 				0924632F2A5BA0F200B6F65D /* HomeBakeryCollectionViewCell.swift in Sources */,
@@ -847,9 +876,9 @@
 				3EA2E1EB2A542151003516A3 /* SizeLiteral.swift in Sources */,
 				0987288D2A5BA1F000A29402 /* BookmarkButton.swift in Sources */,
 				090556202A51DB2C00752067 /* UIImage+.swift in Sources */,
-				09B71BFC2A59CF3E00076AC2 /* Protocol.swift in Sources */,
 				0905562D2A51DBE700752067 /* UILabel+.swift in Sources */,
 				090556252A51DB9600752067 /* UICollectionView+.swift in Sources */,
+				098716B62A60F52200538D05 /* BakeryTypeProtocol.swift in Sources */,
 				09B13F582A59433500C0C723 /* TabBarItem.swift in Sources */,
 				09B13F502A593CB800C0C723 /* BakeryListViewController.swift in Sources */,
 				093214022A5AE27800875EF6 /* Utils.swift in Sources */,
@@ -871,10 +900,13 @@
 				3E79B1B52A571E7100D36A26 /* OptionsCollectionViewCell.swift in Sources */,
 				090556312A51DDD800752067 /* UITableView+.swift in Sources */,
 				097682E52A5C99340008F4FB /* BakeryFilterItems.swift in Sources */,
+				098716B42A6061F500538D05 /* SearchResponseDTO.swift in Sources */,
+				09FD47D22A5DF892002020BD /* EmptyCollectionViewCell.swift in Sources */,
 				090556272A51DBB100752067 /* NSObject+.swift in Sources */,
 				3E79B1A02A5546E700D36A26 /* DescriptionCollectionViewCell.swift in Sources */,
 				3E16E5002A57FFD900B813D0 /* OptionsCollectionViewHeader.swift in Sources */,
 				3E16E4F52A57CF3800B813D0 /* WriteReviewDTO.swift in Sources */,
+				09FD47CA2A5DD38D002020BD /* SearchResultView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

GEON-PPANG-iOS/Global/Literals/Strings.swift

@@ -47,5 +47,6 @@ struct I18N {
         static let nutfree = "넛프리"
         static let vegan = "비건빵"
         static let noSugar = "저당, 무설탕"
+        static let defaultFilter = "기본순"
     }
 }

GEON-PPANG-iOS/Global/Protocol/BakeryTypeProtocol.swift

@@ -0,0 +1,46 @@
+//
+//  BakeryTypeProtocol.swift
+//  GEON-PPANG-iOS
+//
+//  Created by JEONGEUN KIM on 2023/07/14.
+//
+
+import Foundation
+
+protocol BakeryTypeProtocol {
+    var isGlutenFree: Bool { get }
+    var isNutFree: Bool { get }
+    var isVegan: Bool { get }
+    var isSugarFree: Bool { get }
+}
+
+protocol BakeryListProtocol {
+    var bakeryName: String { get }
+    var bookmarkCount: Int { get }
+    var isBooked: Bool { get }
+
+    var isHACCP: Bool { get }
+    var isVegan: Bool { get }
+    var isNonGMO: Bool { get }
+
+    var firstNearStation: String { get }
+    var secondNearStation: String? { get }
+
+    var breadType: BreadType { get }
+}
+
+struct BakeryListProtocols: BakeryListProtocol {
+    var bakeryName: String
+    var bookmarkCount: Int
+    var isBooked: Bool
+
+    var isHACCP: Bool
+    var isVegan: Bool
+    var isNonGMO: Bool
+
+    var firstNearStation: String 
+    var secondNearStation: String? = ""
+
+    var breadType: BreadType
+
+}

GEON-PPANG-iOS/Presentation/BakeryList/ViewControllers/BakeryListCollectionViewCell.swift

@@ -109,12 +109,12 @@ final class BakeryListCollectionViewCell: UICollectionViewCell {
         }
     }
 
-    func updateUI(data: BakeryListResponseDTO, index: Int) {
+    func updateUI<T: BakeryListProtocol>(data: T, index: Int) {
         self.index = index
         bakeryTitle.text = data.bakeryName
         bookMarkButton.getCount(data.bookmarkCount)
         bookMarkButton.updateData = { [weak self] status in
-            guard let self = self  else { return }
+            guard let self = self else { return }
             self.updateData?(status, self.index)
         }
         bookMarkButton.isSelected = data.isBooked
@@ -123,38 +123,38 @@ final class BakeryListCollectionViewCell: UICollectionViewCell {
             regionStackView.removeSecondRegion()
         }
         regionStackView.getRegionName(data.firstNearStation, data.secondNearStation ?? "")
-        
-        if self.ingredientList[index].breadType.isGlutenFree {
-            self.breadTypeTag.append(I18N.BakeryList.glutenfree)
+
+        if data.breadType.isGlutenFree {
+            breadTypeTag.append(I18N.BakeryList.glutenfree)
         }
-        
-        if self.ingredientList[index].breadType.isNutFree {
-            self.breadTypeTag.append(I18N.BakeryList.nutfree)
+
+        if data.breadType.isNutFree {
+            breadTypeTag.append(I18N.BakeryList.nutfree)
         }
-        
-        if self.ingredientList[index].breadType.isVegan {
-            self.breadTypeTag.append(I18N.BakeryList.vegan)
+
+        if data.breadType.isVegan {
+            breadTypeTag.append(I18N.BakeryList.vegan)
         }
-        
-        if self.ingredientList[index].breadType.isSugarFree {
-            self.breadTypeTag.append(I18N.BakeryList.noSugar)
+
+        if data.breadType.isSugarFree {
+            breadTypeTag.append(I18N.BakeryList.noSugar)
         }
-        
+
         collectionView.snp.remakeConstraints {
-            $0.height.equalTo(getHeight(self.breadTypeTag))
+            $0.height.equalTo(getHeight(breadTypeTag))
             $0.top.equalTo(bakeryTitle.snp.bottom).offset(10)
             $0.leading.equalTo(bakeryImage.snp.trailing).offset(14)
             $0.trailing.equalToSuperview().offset(-70)
         }
     }
-    
+
     func getViewType(_ type: BakeryViewType) {
         bakeryViewType = type
     }
-    
+
     func defaultViewButton() {
         addSubview(bookMarkButton)
-        
+
         bookMarkButton.do {
             $0.configuration?.imagePlacement = NSDirectionalRectEdge.top
             $0.configuration?.imagePadding = 4
@@ -163,35 +163,35 @@ final class BakeryListCollectionViewCell: UICollectionViewCell {
                 print("default")
             }, for: .touchUpInside)
         }
-        
+
         bookMarkButton.snp.makeConstraints {
             $0.centerY.equalToSuperview()
             $0.trailing.equalToSuperview().offset(-24)
             $0.size.equalTo(34)
         }
     }
-    
+
     func getHeight(_ list: [String]) -> CGFloat {
         var width: CGFloat = 0
         list.forEach {
             width += $0.size(withAttributes: [NSAttributedString.Key.font: UIFont.pretendardMedium(13)]).width + 4
         }
         width -= 4
-        
+
         return width < (UIScreen.main.bounds.width - 206) ? 25 : 60
     }
-    
+
     func reviewViewButton() {
         addSubview(arrowButton)
-        
+
         regionStackView.getBackgroundColor(.gbbGray700!)
         arrowButton.do {
             $0.setImage(.rightArrowIcon, for: .normal)
             $0.addAction(UIAction { _ in
                 print("review")
             }, for: .touchUpInside)
         }
-        
+
         arrowButton.snp.makeConstraints {
             $0.centerY.equalToSuperview()
             $0.trailing.equalToSuperview().offset(-12)

GEON-PPANG-iOS/Presentation/BakeryList/ViewControllers/BakeryListViewController.swift

@@ -75,7 +75,7 @@ final class BakeryListViewController: BaseViewController {
         var config = UICollectionLayoutListConfiguration(appearance: .plain)
         config.backgroundColor = .clear
         config.showsSeparators = true
-
+        
         let layout = UICollectionViewCompositionalLayout.list(using: config)
         return layout
     }
@@ -84,7 +84,20 @@ final class BakeryListViewController: BaseViewController {
         dataSource = DataSource(collectionView: bakeryListCollectionView, cellProvider: { collectionView, indexPath, item in
             let cell: BakeryListCollectionViewCell = collectionView.dequeueReusableCell(for: indexPath)
             cell.getViewType(.defaultType)
-            cell.updateUI(data: item, index: indexPath.item)
+            if let bakeryListItem = item as? BakeryListResponseDTO {
+                let bakeryListProtocols = BakeryListProtocols(
+                    bakeryName: bakeryListItem.bakeryName,
+                    bookmarkCount: bakeryListItem.bookmarkCount,
+                    isBooked: bakeryListItem.isBooked,
+                    isHACCP: bakeryListItem.isHACCP,
+                    isVegan: bakeryListItem.isVegan,
+                    isNonGMO: bakeryListItem.isNonGMO,
+                    firstNearStation: bakeryListItem.firstNearStation,
+                    secondNearStation: bakeryListItem.secondNearStation ?? "",
+                    breadType: bakeryListItem.breadType
+                )
+                cell.updateUI(data: bakeryListProtocols, index: indexPath.item)
+            }
             return cell
         })
     }

GEON-PPANG-iOS/Presentation/BakeryList/ViewControllers/Model/BakeryListResponseDTO.swift

@@ -6,6 +6,7 @@
 //
 
 // MARK: - BakeryListResponseDTO
+
 struct BakeryListResponseDTO: Hashable {
     let bakeryID: Int
     let bakeryName: String
@@ -22,7 +23,7 @@ struct BakeryListResponseDTO: Hashable {
 
 // MARK: - BreadType
 
-struct BreadType: Hashable {
+struct BreadType: Hashable, BakeryTypeProtocol {
     let breadTypeID: Int
     let breadTypeName: String
     let isGlutenFree: Bool

GEON-PPANG-iOS/Presentation/BakeryList/Views/BakeryFilterView.swift

@@ -61,7 +61,8 @@ final class BakeryFilterView: UIView {
             $0.configuration?.background.strokeColor = .gbbGray200
             $0.configuration?.baseForegroundColor = .black
             $0.configuration?.image = .swapIcon
-            $0.configuration?.attributedTitle = AttributedString("기본순", attributes: AttributeContainer([.font: UIFont.pretendardBold(13)]))
+            $0.configuration?.attributedTitle = AttributedString(I18N.BakeryList.defaultFilter,
+                                                                 attributes: AttributeContainer([.font: UIFont.pretendardBold(13)]))
             $0.configuration?.cornerStyle = .capsule
             $0.configuration?.imagePadding = 5
             $0.configuration?.contentInsets = .zero

GEON-PPANG-iOS/Presentation/BakeryList/Views/BakeryListTopView.swift

@@ -19,7 +19,6 @@ final class BakeryListTopView: UIView {
     private let bakeryIcon = UIImageView()
     private let searchButton = UIButton()
 
-
     // MARK: - Life Cycle
 
     override init(frame: CGRect) {

GEON-PPANG-iOS/Presentation/Home/ViewControllers/HomeBottomCollectionViewCell.swift

@@ -42,7 +42,7 @@ final class HomeBottomCollectionViewCell: UICollectionViewCell {
             $0.textAlignment = .left
             $0.numberOfLines = 0
             $0.basic(text: I18N.Home.bottomSectionTitle,
-                     font: .pretendardMedium(11),
+                     font: .captionM2!,
                      color: .gbbGray300!)
 
         }