From 43e5e640ecf15baef315717b2a2e31daa3b186c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B0=A8=EC=9C=A0=EC=83=81?= Date: Sat, 1 Apr 2023 01:29:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fis:=20=EC=B0=9C=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0=20=EB=AC=B4=ED=95=9C=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KeKi/Scenes/Feed/FeedViewController.swift | 4 ++-- KeKi/Scenes/Heart/HeartViewController.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/KeKi/Scenes/Feed/FeedViewController.swift b/KeKi/Scenes/Feed/FeedViewController.swift index 63c71e0..81fc886 100644 --- a/KeKi/Scenes/Feed/FeedViewController.swift +++ b/KeKi/Scenes/Feed/FeedViewController.swift @@ -46,7 +46,6 @@ class FeedViewController: UIViewController { } private func setupNavigationBar() { - self.navigationController?.isNavigationBarHidden = false self.navigationController?.navigationBar.isHidden = false self.navigationController?.navigationBar.tintColor = .black @@ -68,7 +67,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) From 852dd1013a0329b62aee8546ec4d890ac341328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B0=A8=EC=9C=A0=EC=83=81?= Date: Sat, 1 Apr 2023 01:54:22 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EA=B2=80=EC=83=89=20=ED=83=AD?= =?UTF-8?q?=EB=B0=94=20=EB=86=92=EC=9D=B4=20=EB=8B=AC=EB=9D=BC=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KeKi/Scenes/Feed/FeedViewController.swift | 1 + KeKi/Scenes/Search/Search.storyboard | 320 +++++++++--------- KeKi/Scenes/Search/SearchViewController.swift | 2 +- 3 files changed, 162 insertions(+), 161 deletions(-) diff --git a/KeKi/Scenes/Feed/FeedViewController.swift b/KeKi/Scenes/Feed/FeedViewController.swift index 81fc886..abedc38 100644 --- a/KeKi/Scenes/Feed/FeedViewController.swift +++ b/KeKi/Scenes/Feed/FeedViewController.swift @@ -46,6 +46,7 @@ class FeedViewController: UIViewController { } private func setupNavigationBar() { + self.tabBarController?.tabBar.isHidden = true self.navigationController?.navigationBar.isHidden = false self.navigationController?.navigationBar.tintColor = .black 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) } }