From 938735cf250aa333dc0d6eccecaa958d78d7b7d3 Mon Sep 17 00:00:00 2001 From: youz2me Date: Thu, 18 Jul 2024 19:37:15 +0900 Subject: [PATCH] =?UTF-8?q?feat/#223=20=EB=AA=A8=EC=9E=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=ED=94=8C=EB=A1=9C=EC=9A=B0=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheckInviteCodeViewController.swift | 19 ++++++++++++------- .../CreateMeetingViewController.swift | 12 ++++++++++++ .../FinishCreateViewController.swift | 14 ++++++++++++++ .../InviteCodeViewController.swift | 14 +++++++++++++- .../MeetingListViewController.swift | 18 ++++++++++++++++++ 5 files changed, 69 insertions(+), 8 deletions(-) diff --git a/KkuMulKum/Source/MeetingCreate/CheckInviteCode/ViewController/CheckInviteCodeViewController.swift b/KkuMulKum/Source/MeetingCreate/CheckInviteCode/ViewController/CheckInviteCodeViewController.swift index 07f198a3..6a706a82 100644 --- a/KkuMulKum/Source/MeetingCreate/CheckInviteCode/ViewController/CheckInviteCodeViewController.swift +++ b/KkuMulKum/Source/MeetingCreate/CheckInviteCode/ViewController/CheckInviteCodeViewController.swift @@ -16,6 +16,18 @@ class CheckInviteCodeViewController: BaseViewController { // MARK: LifeCycle + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + navigationController?.isNavigationBarHidden = false + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + + navigationController?.isNavigationBarHidden = true + } override func loadView() { view = checkInviteCodeView @@ -26,7 +38,6 @@ class CheckInviteCodeViewController: BaseViewController { override func setupView() { view.backgroundColor = .white - self.tabBarController?.tabBar.isHidden = true setupNavigationBarTitle(with: "내 모임 추가하기") setupNavigationBarBackButton() @@ -56,9 +67,6 @@ private extension CheckInviteCodeViewController { ) ) - inviteCodeViewController.modalTransitionStyle = .crossDissolve - inviteCodeViewController.modalPresentationStyle = .fullScreen - navigationController?.pushViewController(inviteCodeViewController, animated: true) } @@ -70,9 +78,6 @@ private extension CheckInviteCodeViewController { ) ) - createMeetingViewController.modalTransitionStyle = .crossDissolve - createMeetingViewController.modalPresentationStyle = .fullScreen - navigationController?.pushViewController(createMeetingViewController, animated: true) } } diff --git a/KkuMulKum/Source/MeetingCreate/CreateMeeting/ViewController/CreateMeetingViewController.swift b/KkuMulKum/Source/MeetingCreate/CreateMeeting/ViewController/CreateMeetingViewController.swift index d49eabce..a4b54679 100644 --- a/KkuMulKum/Source/MeetingCreate/CreateMeeting/ViewController/CreateMeetingViewController.swift +++ b/KkuMulKum/Source/MeetingCreate/CreateMeeting/ViewController/CreateMeetingViewController.swift @@ -31,6 +31,18 @@ class CreateMeetingViewController: BaseViewController { // MARK: - LifeCycle + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + navigationController?.isNavigationBarHidden = false + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + + navigationController?.isNavigationBarHidden = true + } override func loadView() { view = createMeetingView diff --git a/KkuMulKum/Source/MeetingCreate/FinishCreate/ViewController/FinishCreateViewController.swift b/KkuMulKum/Source/MeetingCreate/FinishCreate/ViewController/FinishCreateViewController.swift index 5f0cb059..555fb69f 100644 --- a/KkuMulKum/Source/MeetingCreate/FinishCreate/ViewController/FinishCreateViewController.swift +++ b/KkuMulKum/Source/MeetingCreate/FinishCreate/ViewController/FinishCreateViewController.swift @@ -30,6 +30,20 @@ class FinishCreateViewController: BaseViewController { } + // MARK: - LifeCycle + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + navigationController?.isNavigationBarHidden = false + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + + navigationController?.isNavigationBarHidden = true + } + // MARK: - Setup override func setupView() { diff --git a/KkuMulKum/Source/MeetingCreate/InviteCode/ViewController/InviteCodeViewController.swift b/KkuMulKum/Source/MeetingCreate/InviteCode/ViewController/InviteCodeViewController.swift index 7379c789..805b61d2 100644 --- a/KkuMulKum/Source/MeetingCreate/InviteCode/ViewController/InviteCodeViewController.swift +++ b/KkuMulKum/Source/MeetingCreate/InviteCode/ViewController/InviteCodeViewController.swift @@ -30,6 +30,18 @@ class InviteCodeViewController: BaseViewController { // MARK: - LifeCycle + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + navigationController?.isNavigationBarHidden = false + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + + navigationController?.isNavigationBarHidden = true + } override func loadView() { view = inviteCodeView @@ -107,7 +119,7 @@ extension InviteCodeViewController { // TODO: 서버 연결할 때 데이터 바인딩해서 화면 전환 시키기 let basePromiseViewController = PagePromiseViewController() - navigationController?.pushViewController(basePromiseViewController, animated: true) + tabBarController?.navigationController?.pushViewController(basePromiseViewController, animated: true) } @objc private func textFieldDidChange(_ textField: UITextField) { diff --git a/KkuMulKum/Source/MeetingList/ViewController/MeetingListViewController.swift b/KkuMulKum/Source/MeetingList/ViewController/MeetingListViewController.swift index 43a343e0..9fdaf2c6 100644 --- a/KkuMulKum/Source/MeetingList/ViewController/MeetingListViewController.swift +++ b/KkuMulKum/Source/MeetingList/ViewController/MeetingListViewController.swift @@ -48,6 +48,10 @@ class MeetingListViewController: BaseViewController { viewModel.requestMeetingList() } + override func setupAction() { + rootView.addButton.addTarget(self, action: #selector(addButtonDidTap), for: .touchUpInside) + } + // MARK: - Function @@ -77,6 +81,20 @@ class MeetingListViewController: BaseViewController { } +// MARK: - Extension + +extension MeetingListViewController { + @objc + func addButtonDidTap() { + let checkInviteCodeViewController = CheckInviteCodeViewController() + + tabBarController?.navigationController?.pushViewController( + checkInviteCodeViewController, + animated: true + ) + } +} + // MARK: - UITableViewDelegate extension MeetingListViewController: UITableViewDelegate {