Merge branch 'develop' into webviewError

Toonie/Look/Look.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="KIX-zJ-v7V">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="KIX-zJ-v7V">
     <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -164,7 +164,7 @@
                                     <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gN6-NB-GFI">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="56.666666666666664"/>
                                         <connections>
-                                            <segue destination="jcd-BY-Dvv" kind="embed" id="OtI-nA-lcC"/>
+                                            <segue destination="jcd-BY-Dvv" kind="embed" identifier="topSetting" id="OtI-nA-lcC"/>
                                         </connections>
                                     </containerView>
                                 </subviews>

Toonie/Look/LookDetailViewController/LookDetailTopSelectViewController.swift

@@ -8,20 +8,50 @@
 
 import UIKit
 
+struct TagStructure {
+    let tagName: String
+    var state: Bool
+}
+
 final class LookDetailTopSelectViewController: UIViewController {
+
+    // MARK: - IBOutlets
+
     @IBOutlet weak var lookDetailTopSelectCollectionView: UICollectionView!
 
-    //임시데이터
-    let dummy =  ["전체보기",
-                  "#유럽여행",
-                  "#국내여행",
-                  "#바캉스",
-                  "#지하철여행",
-                  "#뚜벅이여행"]
+    // MARK: - Properties
+
+    //collectionView didSelected 했을시 호출할 클로저
+    var tagDidTapClosure: ((String) -> Void)?
+    var selectedKeyword: String = ""
+
+    //state로 on off 진행
+    var tags = [TagStructure]()
+
+    // MARK: - Life Cycle
 
     override func viewDidLoad() {
         super.viewDidLoad()
-    } 
+        setTags()
+    }
+
+    func setTags() {
+
+        //맨처음 전체보기 기본세팅
+        let tagStructure: TagStructure = TagStructure.init(tagName: "전체보기",
+                                                           state: true)
+        tags.append(tagStructure)
+
+        KeywordToonListService
+            .shared
+            .getKeywords(keyword: selectedKeyword) {(tags) in
+                for tag in tags ?? [String]() {
+                    self.tags.append(TagStructure.init(tagName: "#"+tag,
+                                                       state: false))
+                }
+                self.lookDetailTopSelectCollectionView.reloadData()
+        }
+    }
 }
 
 // MARK: - UICollectionViewDataSource
@@ -30,7 +60,7 @@ extension LookDetailTopSelectViewController: UICollectionViewDataSource {
 
     func collectionView(_ collectionView: UICollectionView,
                         numberOfItemsInSection section: Int) -> Int {
-        return dummy.count
+        return tags.count
     }
 
     func collectionView(_ collectionView: UICollectionView,
@@ -40,34 +70,44 @@ extension LookDetailTopSelectViewController: UICollectionViewDataSource {
             .dequeueReusableCell(withReuseIdentifier: "LookDetailTopSelectCell",
                                  for: indexPath) as? LookDetailTopSelectCell
             else { return UICollectionViewCell() }
-        
-        cell.setTitleLabel(text: dummy[indexPath.row])
-        cell.setCellStatus(bool: indexPath.row == 0 ? true : false)
+
+        cell.setTitleLabel(text: tags[indexPath.row].tagName)
+        cell.setCellStatus(bool: tags[indexPath.row].state)
 
         return cell
     }
 
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        if let cell = collectionView.cellForItem(at: indexPath) as? LookDetailTopSelectCell {
-            
-            for _ in 0...dummy.count {
-                cell.setCellStatus(bool: false)
-            }
-
-            cell.setCellStatus(bool: !cell.getCellStatus())
+    func collectionView(_ collectionView: UICollectionView,
+                        didSelectItemAt indexPath: IndexPath) {
+
+        if let closure = self.tagDidTapClosure {
+            closure(tags[indexPath.row]
+                .tagName
+                .replacingOccurrences(of: "#",
+                                      with: ""))
         }
+
+        //우선 cell 상태 모두 초기화
+        for index in 0..<tags.count {
+            tags[index].state = false
+        }
+
+        //선택한 cell만 상태 변경
+        tags[indexPath.row].state = true
+
+        self.lookDetailTopSelectCollectionView.reloadData()
     }
 
     func collectionView(_ collectionView: UICollectionView,
                         layout collectionViewLayout: UICollectionViewLayout,
                         sizeForItemAt indexPath: IndexPath) -> CGSize {
 
-        let keyword = dummy[indexPath.row]
+        let keyword = tags[indexPath.row].tagName
         let font = UIFont.getAppleSDGothicNeo(option: .medium,
                                               size: 14)
         var width = Int(keyword.widthWithConstrainedHeight(height: 17,
                                                            font: font))
-        width += 42
+        width += 41
 
         return CGSize(width: width, height: 30)
     }
@@ -87,12 +127,12 @@ extension LookDetailTopSelectViewController: UICollectionViewDelegateFlowLayout
                                 layout collectionViewLayout: UICollectionViewLayout,
                                 sizeForItemAtIndexPath indexPath: IndexPath) -> CGSize {
 
-        let keyword = dummy[indexPath.row]
+        let keyword = tags[indexPath.row].tagName
         let font = UIFont.getAppleSDGothicNeo(option: .medium,
                                               size: 14)
         var width = Int(keyword.widthWithConstrainedHeight(height: 17,
                                                            font: font))
-        width += 42
+        width += 41
 
         return CGSize(width: width, height: 30)
     }

Toonie/Look/LookDetailViewController/LookDetailViewController.swift

@@ -17,6 +17,9 @@ final class LookDetailViewController: GestureViewController {
     @IBOutlet private weak var lookDetailCollectionView: UICollectionView!
     @IBOutlet private weak var lookDetailCollectionViewFlowLayout: UICollectionViewFlowLayout!
 
+    // MARK: - Properties
+    var selectedKeyword: String = ""
+
     //임시데이터
     let dummy =  [#imageLiteral(resourceName: "myRecentlyLoadingImg"),
                   #imageLiteral(resourceName: "sample2"),
@@ -46,11 +49,28 @@ final class LookDetailViewController: GestureViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        setLookDeatilTitleLabel(string: "여행") //임시
+        lookDetailTitleLabel.text = selectedKeyword
+
         setCollectionViewLayout()
 
     }
 
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        if segue.identifier == "topSetting" {
+            if let viewController = segue.destination as? LookDetailTopSelectViewController {
+                viewController.selectedKeyword = self.selectedKeyword
+                viewController.tagDidTapClosure = {
+                    (tagString) -> Void in
+                    print("Top 컬렉션 뷰의 선택된 tagString\(tagString)")
+                    /*
+                     To. 어진
+                     여기서 받아온 tagString으로 toonList 조회하시면 될것 같습니다
+                     */
+                }
+            }
+        }
+    }
+
     // MARK: - IBAction
 
     @IBAction func backButtonDidTap(_ sender: Any) {
@@ -69,11 +89,7 @@ final class LookDetailViewController: GestureViewController {
                                                                        bottom: 0,
                                                                        right: 5 * CommonUtility.getDeviceRatioWidth())
         lookDetailCollectionViewFlowLayout.minimumLineSpacing = 1.0 * CommonUtility.getDeviceRatioWidth()
-    }
-
-    func setLookDeatilTitleLabel(string: String) {
-        lookDetailTitleLabel.text = string
-    }
+    } 
 
     /// 인스타툰 상세정보 화면으로 이동
     func moveDetailToon() {
@@ -83,6 +99,11 @@ final class LookDetailViewController: GestureViewController {
         CommonUtility.sharedInstance.mainNavigationViewController?.pushViewController(viewController,
                                                                                       animated: true)
     }
+
+    ///타이틀 세팅
+    func setLookDetailTitleLabel(titleString: String) {
+        self.lookDetailTitleLabel.text = titleString
+    }
 }
 
 // MARK: - UICollectionViewDataSource

Toonie/Look/LookViewController/LookViewController.swift

@@ -87,10 +87,14 @@ extension LookViewController: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView,
                         didSelectItemAt indexPath: IndexPath) {
         let storyboard = UIStoryboard(name: "Look", bundle: nil)
-        let viewController = storyboard.instantiateViewController(withIdentifier: "LookDetailViewController")
+        guard let viewController = storyboard
+            .instantiateViewController(withIdentifier: "LookDetailViewController") as? LookDetailViewController
+            else {
+                return
+        }
+        viewController.selectedKeyword = keywords[indexPath.row]
         self.navigationController?.pushViewController(viewController, animated: true)
     }
-
 }
 
 // MARK: - UICollectionViewDataSource

Toonie/Network/API+Base.swift

@@ -29,8 +29,12 @@ class API {
         return baseURL + "/keywords"
     }()
 
+//    static let myKeywords = {
+//        return baseURL + "/mykeywords/\(String(describing: CommonUtility.userToken))"
+//    }()
+
     static let myKeywords = {
-        return baseURL + "/mykeywords/\(String(describing: CommonUtility.userToken))"
+        return baseURL + "/mykeywords"
     }()
 
     static let tags = {
@@ -40,12 +44,23 @@ class API {
     static let toons = {
         return baseURL + "/toons"
     }()
+
+    //mykeywords/:token
+    static let myKeywordsToken = { (token) in
+        return myKeywords + "/" + token
+    }
+
+    //kewords/:keyword
+    static let keywordInfo = { (keyword) in
+        return keywords + "/" + keyword
+    }
 
-    static let worklist = {
+      static let worklist = {
         return baseURL + "/worklist"
     }()
 
     static let myWorklist = {
         return baseURL + "/worklist/\(CommonUtility.userToken)/default"
     }()
+
 }

Toonie/Network/Model/Keywords.swift

@@ -14,6 +14,11 @@ struct Keywords: Codable {
 
 struct MyKeywords: Codable {
     let success: Bool?
-    let token: String?
     let myKeywords: [String]?
+    let token: String?
+}
+
+struct KeywordToonList: Codable {
+    let toonKeyword: String?
+    let toonTags: [String]?
 }

Toonie/Network/Requestable.swift

@@ -64,8 +64,7 @@ extension Requestable {
         guard let encodedUrl = URL.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) else {
             print("networking - invalid url")
             return
-        }
-        print("params \(params)")
+        } 
 
         Alamofire.request(encodedUrl,
                           method: .post,

Toonie/Network/Service/KeywordsService.swift

@@ -37,12 +37,12 @@ class MyKeywordsService: Requestable {
 
     ///전체 키워드 리스트를 조회
     func getMyKeywords(completion: @escaping ([String]?) -> Void) {
-        get(API.myKeywords) { result in
+        get(API.myKeywordsToken(CommonUtility.userToken)) { result in
             switch result {
             case .networkSuccess(let data):
                 if data.resResult.success == false {
                     return
-                } 
+                }
                 completion(data.resResult.myKeywords)
             case .networkError(let error):
                 print(error)
@@ -55,19 +55,40 @@ class MyKeywordsService: Requestable {
     ///선택한 키워드 post 통신
     func postMyKeywords(params: [String: Any],
                         completion: @escaping () -> Void) {
-        post((API.myKeywords),
+        post((API.myKeywordsToken(CommonUtility.userToken)),
              params: params) { result in
+                switch result {
+                case .networkSuccess(let data):
+                    if data.resResult.success == false {
+                        return
+                    }
+                    completion()
+                case .networkError(let error):
+                    print(error)
+                case .networkFail:
+                    print("fail")
+                }
+        }
+    }
+}
+
+class KeywordToonListService: Requestable {
+    typealias NetworkData = KeywordToonList
+    static let shared = KeywordToonListService()
+
+    //전체 키워드 리스트를 조회
+    func getKeywords(keyword: String,
+                     completion: @escaping ([String]?) -> Void) {
+        get(API.keywordInfo(keyword)) { result in
             switch result {
             case .networkSuccess(let data):
-                if data.resResult.success == false {
-                    return
-                }
-                completion()
+                completion(data.resResult.toonTags)
             case .networkError(let error):
                 print(error)
             case .networkFail:
                 print("fail")
             }
         }
     }
+
 }