Merge branch 'develop' of https://github.com/Health-Food-Me/Health-Fo…

…od-Me-iOS into feature/Health-Food-Me#295
L-j-h-c · Sep 29, 2022 · 39b5b81 · 39b5b81
2 parents dc6cefd + 443fe4b
commit 39b5b81
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift
@@ -553,7 +553,7 @@ extension MainDetailVC {
                         self.restaurantName = data.restaurant.name
                         self.mainInfoTVC.isInitialReload = self.mainInfoInitialReload
                         self.mainInfoTVC.setData(data: data)
-                        self.menuTabVC.setData(data: data.menu)
+                        self.menuTabVC.setData(data: data.menu, restaurantMenuBoard: data.restaurant.menuBoard)
                         self.reviewTabVC.restaurantName = data.restaurant.name
                         self.restaurantName = data.restaurant.name
                         self.scrapButtonInstance.isSelected = data.restaurant.isScrap

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Cells/AllImageCVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Cells/AllImageCVC.swift
@@ -13,7 +13,9 @@ class AllImageCVC: UICollectionViewCell, UICollectionViewRegisterable {
     // MARK: - Properties
 
     static var isFromNib = false
-    let imgURLList = ["123", "123", "123", "123"] // 테스트용
+    var imgURLList = [String]() {didSet {
+        menuImageCV.reloadData()
+    }}
 
     // MARK: - UI Components
     lazy var menuImageCV: UICollectionView = {
@@ -60,18 +62,22 @@ extension AllImageCVC {
             make.edges.equalToSuperview()
         }
     }
+
+    func setData(menuBoardList: [String]) {
+        self.imgURLList = menuBoardList
+    }
 }
 
 extension AllImageCVC: UICollectionViewDataSource {
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 4 //임시로 넣어둔 값 (서버 붙일때 수정 예정)
+        return imgURLList.count
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         guard let allImageCell = menuImageCV.dequeueReusableCell(withReuseIdentifier: ImageCVC.className, for: indexPath) as? ImageCVC
         else { return UICollectionViewCell() }
-//        allImageCell.setData(menuData: MenuTabVC().menuData[indexPath.row])
+        allImageCell.setData(menuBoard: imgURLList[indexPath.row])
         return allImageCell
     }
 }

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Cells/ImageCVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Cells/ImageCVC.swift
@@ -63,4 +63,8 @@ extension ImageCVC {
         photoImageView.layer.cornerRadius = 8
         photoImageView.layer.masksToBounds = true
     }
+
+    func setData(menuBoard: String) {
+        photoImageView.setImage(with: menuBoard)
+    }
 }
diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/VC/MenuTabVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/VC/MenuTabVC.swift
@@ -40,6 +40,14 @@ final class MenuTabVC: UIViewController {
 			}
 		}
 	}
+	var menuBoard: [String] = [] {
+		didSet {
+			DispatchQueue.main.async {
+				self.menuCV.reloadData()
+			}
+		}
+	}
+
 	let panGesture = UIPanGestureRecognizer()
 	weak var delegate: ScrollDeliveryDelegate?
 	var swipeDismissDelegate: SwipeDismissDelegate?
@@ -121,7 +129,7 @@ extension MenuTabVC {
 		menuCV.isScrollEnabled = false
 	}
 
-	func setData(data: [Menu]) {
+	func setData(data: [Menu], restaurantMenuBoard: [String]) {
 		var models: [MenuDataModel] = []
 		data.forEach {
 			models.append($0.toDomain())
@@ -140,8 +148,10 @@ extension MenuTabVC {
 		pickModel += notPickModel
 
 		self.menuData = pickModel
+		self.menuBoard = restaurantMenuBoard
 	}
 
+
 	private func addObserver() {
 		addObserverAction(.menuPhotoClicked) { noti in
 			if let slideData = noti.object as? ImageSlideDataModel {
@@ -225,7 +235,8 @@ extension MenuTabVC: UICollectionViewDelegate {
 extension MenuTabVC: UICollectionViewDataSource {
 
 	func numberOfSections(in collectionView: UICollectionView) -> Int {
-		return 2
+		let count: Int = self.menuBoard.count == 0 ? 1 : 2
+		return count
 	}
 
 	func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
@@ -254,6 +265,9 @@ extension MenuTabVC: UICollectionViewDataSource {
 		case .menuImage:
 			guard let imageCell = menuCV.dequeueReusableCell(withReuseIdentifier: AllImageCVC.className, for: indexPath) as? AllImageCVC
 			else { return UICollectionViewCell() }
+			DispatchQueue.main.async {
+				imageCell.setData(menuBoardList: self.menuBoard)
+			}
 			return imageCell
 		}
 	}

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/ViewModel/MenuDataModel.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/ViewModel/MenuDataModel.swift
@@ -19,7 +19,3 @@ struct MenuDataModel: Codable {
     let fat: Int?
     let per: String?
 }
-
-extension MenuDataModel {
-
-}