From 00d962aa27a9c6d0dab33b26c4ea1d023e882e6b Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Sun, 1 Sep 2024 11:26:37 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20#193=20-=20=ED=83=80=EC=9D=B4=EB=A8=B8?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Remind/View/RemindViewController.swift | 16 ++++++---------- .../TimerAdd/RemindTimerAddViewController.swift | 10 ++++++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/TOASTER-iOS/Present/Remind/View/RemindViewController.swift b/TOASTER-iOS/Present/Remind/View/RemindViewController.swift index e41c284..e0a5c43 100644 --- a/TOASTER-iOS/Present/Remind/View/RemindViewController.swift +++ b/TOASTER-iOS/Present/Remind/View/RemindViewController.swift @@ -182,11 +182,9 @@ private extension RemindViewController { let exampleBottom = ToasterBottomSheetViewController(bottomType: .gray, bottomTitle: "수정하기", - height: 128, insertView: editView) - exampleBottom.modalPresentationStyle = .overFullScreen - - present(exampleBottom, animated: false) + exampleBottom.setupSheetPresentation(bottomHeight: 226) + present(exampleBottom, animated: true) } func setupAlarmBottomSheet() { @@ -195,11 +193,9 @@ private extension RemindViewController { let exampleBottom = ToasterBottomSheetViewController(bottomType: .white, bottomTitle: "알림이 꺼져있어요!", - height: 311, insertView: alarmView) - exampleBottom.modalPresentationStyle = .overFullScreen - - present(exampleBottom, animated: false) + exampleBottom.setupSheetPresentation(bottomHeight: 427) + present(exampleBottom, animated: true) } func reloadCollectionViewWithView(forType: RemindViewType) { @@ -265,7 +261,7 @@ extension RemindViewController: RemindAlarmOffBottomSheetViewDelegate { extension RemindViewController: RemindEditViewDelegate { func editTimer(forID: Int?) { selectedTimerID = forID - dismiss(animated: false) + dismiss(animated: true) if let forID { let editViewController = RemindTimerAddViewController() editViewController.configureView(forTimerID: forID) @@ -275,7 +271,7 @@ extension RemindViewController: RemindEditViewDelegate { func deleteTimer(forID: Int?) { selectedTimerID = forID - dismiss(animated: false) + dismiss(animated: true) showPopup(forMainText: "타이머를 삭제하시겠어요?", forSubText: "더 이상 해당 클립의 리마인드를 \n받을 수 없어요", forLeftButtonTitle: StringLiterals.Button.cancel, diff --git a/TOASTER-iOS/Present/RemindAdd/TimerAdd/RemindTimerAddViewController.swift b/TOASTER-iOS/Present/RemindAdd/TimerAdd/RemindTimerAddViewController.swift index 5c9adee..7bbacf2 100644 --- a/TOASTER-iOS/Present/RemindAdd/TimerAdd/RemindTimerAddViewController.swift +++ b/TOASTER-iOS/Present/RemindAdd/TimerAdd/RemindTimerAddViewController.swift @@ -358,9 +358,11 @@ private extension RemindTimerAddViewController { let repeatView = TimerRepeatBottomSheetView() repeatView.setupDelegate(forDelegate: self) repeatView.setupSelectedIndex(forIndexList: selectedIndex) - let exampleBottom = ToasterBottomSheetViewController(bottomType: .gray, bottomTitle: "반복설정", height: view.convertByHeightRatio(622), insertView: repeatView) - exampleBottom.modalPresentationStyle = .overFullScreen - self.present(exampleBottom, animated: false) + let exampleBottom = ToasterBottomSheetViewController(bottomType: .gray, + bottomTitle: "반복설정", + insertView: repeatView) + exampleBottom.setupSheetPresentation(bottomHeight: view.convertByHeightRatio(720)) + self.present(exampleBottom, animated: true) } @objc func completeButtonTapped() { @@ -391,6 +393,6 @@ extension RemindTimerAddViewController: TimerRepeatBottomSheetDelegate { setSelectedIndex(contains: 9, deleteFirst: 1, deleteSecond: 5) setSelectedIndex(contains: 10, deleteFirst: 6, deleteSecond: 7) - dismiss(animated: false) + dismiss(animated: true) } }