[Team05 - iOS] 네번째 PR

iOS/Airbnb/Airbnb.xcodeproj/xcuserdata/kh_lee.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>Airbnb.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 </dict>

iOS/Airbnb/Airbnb.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

iOS/Airbnb/Airbnb.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "SnapKit",
+        "repositoryURL": "https://github.com/SnapKit/SnapKit",
+        "state": {
+          "branch": "develop",
+          "revision": "07c5d1f6044701d97e94dc11157259e8811977be",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}

iOS/Airbnb/Airbnb/Resource/Assets.xcassets/cityBox.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "cityBox.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Airbnb/Airbnb/View/DataSource/HomeViewDataSource.swift

@@ -0,0 +1,115 @@
+//
+//  SearchViewDataSource.swift
+//  Airbnb
+//
+//  Created by Jason on 2022/05/27.
+//
+
+import UIKit
+
+final class HomeViewDataSource: NSObject, UICollectionViewDataSource {
+
+    var homeData: [MyHomeSection] = [
+        .advertising([MyHomeSection.advertisingItem.init(image: UIImage(named: "mainImage") ?? UIImage())] ),
+        .destination([MyHomeSection.destinationItem].init(repeating: MyHomeSection.destinationItem.init(image: UIImage(named: "seoul") ?? UIImage(),
+                                                                                                        title: "서울", distance: "차로 30분 거리"), count: 20)),
+        .livingSpot([MyHomeSection.livingSpotItem].init(repeating: MyHomeSection.livingSpotItem.init(image: UIImage(named: "blackHouse") ?? UIImage(), title: "자연생활을 만끽할 수 있는 숙소"), count: 5))
+    ]
+
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return homeData.count
+    }
+
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        switch homeData[section] {
+        case let .advertising(items):
+            return items.count
+        case let .destination(items):
+            return items.count
+        case let .livingSpot(items):
+            return items.count
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        switch homeData[indexPath.section] {
+        case let .advertising(items):
+            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: AdvertisingCell.identifier,
+                                                                for: indexPath) as? AdvertisingCell else {
+                return UICollectionViewCell()
+            }
+            cell.configure(image: items[indexPath.item].image)
+
+            return cell
+        case let .destination(items):
+            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: NearbyDestinationCell.identifier,
+                                                                for: indexPath) as? NearbyDestinationCell else {
+                return UICollectionViewCell()
+            }
+            let item = items[indexPath.item]
+            cell.configure(image: item.image, title: item.title, distance: item.distance)
+
+            return cell
+        case let .livingSpot(items):
+            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: LivingSpotCell.identifier,
+                                                                for: indexPath) as? LivingSpotCell else {
+                return UICollectionViewCell()
+            }
+            let item = items[indexPath.item]
+            cell.configure(image: item.image, title: item.title)
+
+            return cell
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+        switch kind {
+        case UICollectionView.elementKindSectionHeader:
+            guard let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: CollectionHeaderView.identifier, for: indexPath) as? CollectionHeaderView else {
+                return UICollectionReusableView()
+            }
+
+            let sectionType = SectionList.allCases[indexPath.section]
+            switch sectionType {
+            case .otherwise:
+                headerView.setHeaderText(text: "")
+            case .destination:
+                headerView.setHeaderText(text: "가까운 여행지 둘러보기")
+                headerView.setHeaderFontSize(size: 22)
+            case .livingSpot:
+                headerView.setHeaderText(text: "어디에서나,\n여행은 살아보는거야!")
+                headerView.setHeaderFontSize(size: 22)
+            }
+
+            return headerView
+        default:
+            return UICollectionReusableView()
+        }
+    }
+
+    enum MyHomeSection {
+        case advertising([advertisingItem])
+        case destination([destinationItem])
+        case livingSpot([livingSpotItem])
+
+        struct advertisingItem {
+            let image: UIImage
+        }
+
+        struct destinationItem {
+            let image: UIImage
+            let title: String
+            let distance: String
+        }
+
+        struct livingSpotItem {
+            let image: UIImage
+            let title: String
+        }
+    }
+    enum SectionList: Int, CaseIterable {
+        case otherwise = 0
+        case destination
+        case livingSpot
+    }
+}

iOS/Airbnb/Airbnb/View/DataSource/LocationViewDataSource.swift

@@ -0,0 +1,28 @@
+//
+//  LocationViewDataSource.swift
+//  Airbnb
+//
+//  Created by Jason on 2022/06/10.
+//
+
+import UIKit
+import MapKit
+
+final class LocationViewDataSource: NSObject, UITableViewDataSource {
+
+    private var completerResults: [MKLocalSearchCompletion]?
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return completerResults?.count ?? 0
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: LocationViewCell.identifier, for: indexPath) as? LocationViewCell else { return UITableViewCell() }
+
+        if let suggestion = completerResults?[indexPath.row] {
+            cell.configure(location: suggestion.title)
+        }
+        return cell
+    }
+
+}

iOS/Airbnb/Airbnb/View/DataSource/SearchViewDataSource.swift

@@ -2,114 +2,63 @@
 //  SearchViewDataSource.swift
 //  Airbnb
 //
-//  Created by Jason on 2022/05/27.
+//  Created by 이건행 on 2022/06/07.
 //
 
 import UIKit
 
 final class SearchViewDataSource: NSObject, UICollectionViewDataSource {
 
-    var homeData: [MyHomeSection] = [
-        .advertising([MyHomeSection.advertisingItem.init(image: UIImage(named: "mainImage") ?? UIImage())] ),
-        .destination([MyHomeSection.destinationItem].init(repeating: MyHomeSection.destinationItem.init(image: UIImage(named: "seoul") ?? UIImage(),
-                                                                                                        title: "서울", distance: "차로 30분 거리"), count: 20)),
-        .livingSpot([MyHomeSection.livingSpotItem].init(repeating: MyHomeSection.livingSpotItem.init(image: UIImage(named: "blackHouse") ?? UIImage(), title: "자연생활을 만끽할 수 있는 숙소"), count: 5))
+    var searchData: [MySearchSection] = [
+        .searchListSection([MySearchSection.searchListItem].init(repeating: MySearchSection.searchListItem.init(image: UIImage(named:"seoul") ?? UIImage(), title: "서울", distance: "차로 30분 거리"), count: 10))
     ]
 
     func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return homeData.count
+        return searchData.count
     }
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        switch homeData[section] {
-        case let .advertising(items):
-            return items.count
-        case let .destination(items):
-            return items.count
-        case let .livingSpot(items):
+        switch searchData[section] {
+        case let .searchListSection(items):
             return items.count
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        switch homeData[indexPath.section] {
-        case let .advertising(items):
-            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: AdvertisingCell.identifier,
-                                                                for: indexPath) as? AdvertisingCell else {
-                return UICollectionViewCell()
-            }
-            cell.configure(image: items[indexPath.item].image)
+
+        switch searchData[indexPath.section] {
 
-            return cell
-        case let .destination(items):
-            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: NearbyDestinationCell.identifier,
-                                                                for: indexPath) as? NearbyDestinationCell else {
+        case let .searchListSection(items):
+            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: SearchViewCell.identifier,
+                                                                for: indexPath) as? SearchViewCell else {
                 return UICollectionViewCell()
             }
             let item = items[indexPath.item]
             cell.configure(image: item.image, title: item.title, distance: item.distance)
 
-            return cell
-        case let .livingSpot(items):
-            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: LivingSpotCell.identifier,
-                                                                for: indexPath) as? LivingSpotCell else {
-                return UICollectionViewCell()
-            }
-            let item = items[indexPath.item]
-            cell.configure(image: item.image, title: item.title)
-
             return cell
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
-        switch kind {
-        case UICollectionView.elementKindSectionHeader:
-            guard let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: CollectionHeaderView.identifier, for: indexPath) as? CollectionHeaderView else {
-                return UICollectionReusableView()
-            }
-
-            let sectionType = SectionList.allCases[indexPath.section]
-            switch sectionType {
-            case .otherwise:
-                headerView.setHeaderText(text: "")
-            case .destination:
-                headerView.setHeaderText(text: "가까운 여행지 둘러보기")
-                headerView.setHeaderFontSize(size: 22)
-            case .livingSpot:
-                headerView.setHeaderText(text: "어디에서나,\n여행은 살아보는거야!")
-                headerView.setHeaderFontSize(size: 22)
-            }
-
-            return headerView
-        default:
+        guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: CollectionHeaderView.identifier, for: indexPath) as? CollectionHeaderView else {
             return UICollectionReusableView()
         }
+        if indexPath.section == 0 {
+            header.setHeaderText(text: "근처의 인기 여행지")
+            header.setHeaderFontSize(size: 22)
+        }
+
+        return header
     }
 
-    enum MyHomeSection {
-        case advertising([advertisingItem])
-        case destination([destinationItem])
-        case livingSpot([livingSpotItem])
-
-        struct advertisingItem {
-            let image: UIImage
-        }
+    enum MySearchSection {
+        case searchListSection([searchListItem])
 
-        struct destinationItem {
+        struct searchListItem {
             let image: UIImage
             let title: String
             let distance: String
         }
-
-        struct livingSpotItem {
-            let image: UIImage
-            let title: String
-        }
-    }
-    enum SectionList: Int, CaseIterable {
-        case otherwise = 0
-        case destination
-        case livingSpot
     }
 }

iOS/Airbnb/Airbnb/View/Location/LocationView.swift

@@ -0,0 +1,44 @@
+//
+//  LocationView.swift
+//  Airbnb
+//
+//  Created by Jason on 2022/06/10.
+//
+
+import UIKit
+
+final class LocationView: UITableView {
+
+    override init(frame: CGRect, style: UITableView.Style) {
+        super.init(frame: frame, style: .grouped)
+        setupLocationTableView()
+        setupLocationViewLayout()
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError()
+    }
+
+    private let tableView: UITableView = {
+        let tableView = UITableView()
+        tableView.backgroundColor = .yellow
+        return tableView
+    }()
+
+    func setupLocationTableView() {
+        tableView.register(LocationViewCell.self, forCellReuseIdentifier: LocationViewCell.identifier)
+        tableView.separatorStyle = .none
+    }
+
+    func setupLocationViewLayout() {
+        addSubview(tableView)
+        tableView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            tableView.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor),
+            tableView.leadingAnchor.constraint(equalTo: safeAreaLayoutGuide.leadingAnchor),
+            tableView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor),
+            tableView.bottomAnchor.constraint(equalTo: safeAreaLayoutGuide.bottomAnchor)
+        ])
+    }
+}