diff --git a/KeKi/Scenes/Feed/FeedViewController.swift b/KeKi/Scenes/Feed/FeedViewController.swift index 63c71e0..abedc38 100644 --- a/KeKi/Scenes/Feed/FeedViewController.swift +++ b/KeKi/Scenes/Feed/FeedViewController.swift @@ -46,7 +46,7 @@ class FeedViewController: UIViewController { } private func setupNavigationBar() { - self.navigationController?.isNavigationBarHidden = false + self.tabBarController?.tabBar.isHidden = true self.navigationController?.navigationBar.isHidden = false self.navigationController?.navigationBar.tintColor = .black @@ -68,7 +68,8 @@ class FeedViewController: UIViewController { @objc private func didTapBackItem() { self.tabBarController?.tabBar.isHidden = false - self.navigationController?.popViewController(animated: true) } + self.navigationController?.popViewController(animated: true) + } func setPostIdx(postIdx: Int) { diff --git a/KeKi/Scenes/Heart/HeartViewController.swift b/KeKi/Scenes/Heart/HeartViewController.swift index a117d36..4952dea 100644 --- a/KeKi/Scenes/Heart/HeartViewController.swift +++ b/KeKi/Scenes/Heart/HeartViewController.swift @@ -170,7 +170,7 @@ extension HeartViewController { hud.textLabel.text = "Loading" hud.show(in: self.view) - APIManeger.shared.testGetData(urlEndpointString: "/posts/likes", dataType: HeartResponse.self, parameter: nil) { [weak self] response in + APIManeger.shared.testGetData(urlEndpointString: "/posts/likes", dataType: HeartResponse.self, parameter: queryParam) { [weak self] response in hud.dismiss(animated: true) response.result.feeds.forEach { feed in self?.feedList.append(feed) diff --git a/KeKi/Scenes/Search/Search.storyboard b/KeKi/Scenes/Search/Search.storyboard index 9e01409..4bf8c88 100644 --- a/KeKi/Scenes/Search/Search.storyboard +++ b/KeKi/Scenes/Search/Search.storyboard @@ -47,166 +47,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -394,6 +234,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/KeKi/Scenes/Search/SearchViewController.swift b/KeKi/Scenes/Search/SearchViewController.swift index 75bad62..627a45c 100644 --- a/KeKi/Scenes/Search/SearchViewController.swift +++ b/KeKi/Scenes/Search/SearchViewController.swift @@ -370,7 +370,7 @@ extension SearchViewController: UICollectionViewDelegate, UICollectionViewDataSo let storyboard = UIStoryboard.init(name: "Feed", bundle: nil) guard let feedViewController = storyboard.instantiateViewController(withIdentifier: "FeedViewController") as? FeedViewController else { return } feedViewController.postIdx = searchResultList[indexPath.row].postIdx - self.tabBarController?.tabBar.isHidden = true + tabBarController?.tabBar.isHidden = true self.navigationController?.pushViewController(feedViewController, animated: true) } }