From b6d5e70aabddb83eb3e382f745e37467d057c8b2 Mon Sep 17 00:00:00 2001 From: Hamp Date: Sun, 18 Aug 2024 21:54:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20::=20=EC=9D=B4=EB=A6=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseFeature/Sources/Protocols/EditSheetViewType.swift | 4 ++-- .../Sources/Protocols/PlaylistEditSheetViewType.swift | 4 ++-- .../BaseFeature/Sources/Protocols/SongCartViewType.swift | 4 ++-- .../BaseFeature/Sources/Protocols/WMBottomSheetViewType.swift | 4 ++-- .../BaseFeature/Sources/Views/WMBottomSheetView.swift | 4 ++-- .../Sources/ViewControllers/MainContainerViewController.swift | 4 ++-- .../Sources/Extensions/Extension+Notification.Name.swift | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Projects/Features/BaseFeature/Sources/Protocols/EditSheetViewType.swift b/Projects/Features/BaseFeature/Sources/Protocols/EditSheetViewType.swift index 0848b4111..66f680f61 100644 --- a/Projects/Features/BaseFeature/Sources/Protocols/EditSheetViewType.swift +++ b/Projects/Features/BaseFeature/Sources/Protocols/EditSheetViewType.swift @@ -51,7 +51,7 @@ public extension EditSheetViewType where Self: UIViewController { bottomSheetView.present(in: view) // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 숨깁니다. - NotificationCenter.default.post(name: .willShowSongCart, object: nil) + NotificationCenter.default.post(name: .shouldHidePlaylistFloatingButton, object: nil) } /// 편집하기 팝업을 제거합니다. @@ -66,6 +66,6 @@ public extension EditSheetViewType where Self: UIViewController { self.bottomSheetView = nil // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 다시 보여줍니다. - NotificationCenter.default.post(name: .willHideSongCart, object: nil) + NotificationCenter.default.post(name: .shouldShowPlaylistFloatingButton, object: nil) } } diff --git a/Projects/Features/BaseFeature/Sources/Protocols/PlaylistEditSheetViewType.swift b/Projects/Features/BaseFeature/Sources/Protocols/PlaylistEditSheetViewType.swift index 1f8ba768e..0e1366615 100644 --- a/Projects/Features/BaseFeature/Sources/Protocols/PlaylistEditSheetViewType.swift +++ b/Projects/Features/BaseFeature/Sources/Protocols/PlaylistEditSheetViewType.swift @@ -42,7 +42,7 @@ public extension PlaylistEditSheetViewType where Self: UIViewController { bottomSheetView.present(in: view) // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 숨깁니다. - NotificationCenter.default.post(name: .willShowSongCart, object: nil) + NotificationCenter.default.post(name: .shouldHidePlaylistFloatingButton, object: nil) } /// 편집하기 팝업을 제거합니다. @@ -57,6 +57,6 @@ public extension PlaylistEditSheetViewType where Self: UIViewController { self.bottomSheetView = nil // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 다시 보여줍니다. - NotificationCenter.default.post(name: .willHideSongCart, object: nil) + NotificationCenter.default.post(name: .shouldShowPlaylistFloatingButton, object: nil) } } diff --git a/Projects/Features/BaseFeature/Sources/Protocols/SongCartViewType.swift b/Projects/Features/BaseFeature/Sources/Protocols/SongCartViewType.swift index 0661ebdd0..1a696743d 100644 --- a/Projects/Features/BaseFeature/Sources/Protocols/SongCartViewType.swift +++ b/Projects/Features/BaseFeature/Sources/Protocols/SongCartViewType.swift @@ -77,7 +77,7 @@ public extension SongCartViewType where Self: UIViewController { bottomSheetView.present(in: view) // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 숨깁니다. - NotificationCenter.default.post(name: .willShowSongCart, object: nil) + NotificationCenter.default.post(name: .shouldHidePlaylistFloatingButton, object: nil) } /// 노래 담기 팝업을 제거합니다. @@ -92,6 +92,6 @@ public extension SongCartViewType where Self: UIViewController { self.bottomSheetView = nil // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 다시 보여줍니다. - NotificationCenter.default.post(name: .willHideSongCart, object: nil) + NotificationCenter.default.post(name: .shouldShowPlaylistFloatingButton, object: nil) } } diff --git a/Projects/Features/BaseFeature/Sources/Protocols/WMBottomSheetViewType.swift b/Projects/Features/BaseFeature/Sources/Protocols/WMBottomSheetViewType.swift index a81b7e208..2f01b0108 100644 --- a/Projects/Features/BaseFeature/Sources/Protocols/WMBottomSheetViewType.swift +++ b/Projects/Features/BaseFeature/Sources/Protocols/WMBottomSheetViewType.swift @@ -37,7 +37,7 @@ public extension WMBottomSheetViewType where Self: UIViewController { bottomSheetView.present(in: view) // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 숨깁니다. - NotificationCenter.default.post(name: .willShowSongCart, object: nil) + NotificationCenter.default.post(name: .shouldHidePlaylistFloatingButton, object: nil) } /// 편집하기 팝업을 제거합니다. @@ -52,7 +52,7 @@ public extension WMBottomSheetViewType where Self: UIViewController { // 메인 컨테이너 뷰컨에서 해당 노티를 수신, 팝업이 올라오면 미니 플레이어를 다시 보여줍니다. if postNoti { - NotificationCenter.default.post(name: .willHideSongCart, object: nil) + NotificationCenter.default.post(name: .shouldShowPlaylistFloatingButton, object: nil) } } } diff --git a/Projects/Features/BaseFeature/Sources/Views/WMBottomSheetView.swift b/Projects/Features/BaseFeature/Sources/Views/WMBottomSheetView.swift index 07955d527..c7e90835c 100644 --- a/Projects/Features/BaseFeature/Sources/Views/WMBottomSheetView.swift +++ b/Projects/Features/BaseFeature/Sources/Views/WMBottomSheetView.swift @@ -68,7 +68,7 @@ public extension UIViewController { ) bottomSheetView.present(in: self.view) - NotificationCenter.default.post(name: .willShowSongCart, object: nil) + NotificationCenter.default.post(name: .shouldHidePlaylistFloatingButton, object: nil) } func hideInlineBottomSheet() { @@ -77,6 +77,6 @@ public extension UIViewController { .last as? BottomSheetView else { return } bottomSheetView.dismiss() - NotificationCenter.default.post(name: .willHideSongCart, object: nil) + NotificationCenter.default.post(name: .shouldShowPlaylistFloatingButton, object: nil) } } diff --git a/Projects/Features/MainTabFeature/Sources/ViewControllers/MainContainerViewController.swift b/Projects/Features/MainTabFeature/Sources/ViewControllers/MainContainerViewController.swift index 16c708bd0..1eb10f5de 100644 --- a/Projects/Features/MainTabFeature/Sources/ViewControllers/MainContainerViewController.swift +++ b/Projects/Features/MainTabFeature/Sources/ViewControllers/MainContainerViewController.swift @@ -150,7 +150,7 @@ private extension MainContainerViewController { .disposed(by: disposeBag) NotificationCenter.default.rx - .notification(.willShowSongCart) + .notification(.shouldHidePlaylistFloatingButton) .subscribe(onNext: { [playlistFloatingActionButton] _ in UIView.animate(withDuration: 0.2) { playlistFloatingActionButton.alpha = 0 @@ -159,7 +159,7 @@ private extension MainContainerViewController { .disposed(by: disposeBag) NotificationCenter.default.rx - .notification(.willHideSongCart) + .notification(.shouldShowPlaylistFloatingButton) .subscribe(onNext: { [playlistFloatingActionButton] _ in UIView.animate(withDuration: 0.2) { playlistFloatingActionButton.alpha = 1 diff --git a/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift b/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift index e106bfd7c..ffb1cbf4a 100644 --- a/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift +++ b/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift @@ -7,7 +7,7 @@ public extension Notification.Name { static let willRefreshUserInfo = Notification.Name("willRefreshUserInfo") // 유저 정보 갱신 static let willStatusBarEnterDarkBackground = Notification.Name("willStatusBarEnterDarkBackground") static let willStatusBarEnterLightBackground = Notification.Name("willStatusBarEnterLightBackground") - static let willShowSongCart = Notification.Name("willShowSongCart") - static let willHideSongCart = Notification.Name("willHideSongCart") + static let shouldHidePlaylistFloatingButton = Notification.Name("shouldHidePlaylistFloatingButton") + static let shouldShowPlaylistFloatingButton = Notification.Name("shouldShowPlaylistFloatingButton") static let didChangeTabInStorage = Notification.Name("didChangeTabInStorage") } From 1233cd1ee37be433e85cb88801cfe50293cfcc8f Mon Sep 17 00:00:00 2001 From: Hamp Date: Mon, 19 Aug 2024 15:14:05 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:zap:=20::=20=EB=A7=88=EC=9D=B4=ED=94=8C?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=84=EB=8F=84=20restore=20=EC=8B=9C=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=EB=B2=84=ED=8A=BC=20=EC=88=A8=EA=B9=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Reactors/MyPlaylistDetailReactor.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift b/Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift index 95e371514..a667feaf6 100644 --- a/Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift +++ b/Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift @@ -424,6 +424,7 @@ private extension MyPlaylistDetailReactor { let backUpPlaylist = state.backupPlaylistModels return .concat([ + updateComplectionButtonVisible(flag: false), .just(Mutation.updateEditingState(false)), .just(Mutation.updatePlaylist(backUpPlaylist)), .just(.updateSelectedCount(0))