Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ”€ :: (#1196) notiname λ³€κ²½ 및 마이 ν”Œλ¦¬ νŽΈμ§‘λͺ¨λ“œ 버그 ν•΄κ²° #1198

Merged
merged 2 commits into from
Aug 19, 2024
Merged

πŸ”€ :: (#1196) notiname λ³€κ²½ 및 마이 ν”Œλ¦¬ νŽΈμ§‘λͺ¨λ“œ 버그 ν•΄κ²° #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6d5e70
:zap: :: 이름 λ³€κ²½
yongbeomkwak Aug 18, 2024
1233cd1
:zap: :: λ§ˆμ΄ν”Œλ¦¬ 별도 restore μ‹œ μ™„λ£Œλ²„νŠΌ μˆ¨κΉ€
yongbeomkwak Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Projects/Features/BaseFeature/Sources/Protocols/EditSheetViewType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/// νŽΈμ§‘ν•˜κΈ° νŒμ—…μ„ μ œκ±°ν•©λ‹ˆλ‹€.
Expand All @@ -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)
}
}
4 changes: 2 additions & 2 deletions Projects/Features/BaseFeature/Sources/Protocols/PlaylistEditSheetViewType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/// νŽΈμ§‘ν•˜κΈ° νŒμ—…μ„ μ œκ±°ν•©λ‹ˆλ‹€.
Expand All @@ -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)
}
}
4 changes: 2 additions & 2 deletions Projects/Features/BaseFeature/Sources/Protocols/SongCartViewType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/// λ…Έλž˜ λ‹΄κΈ° νŒμ—…μ„ μ œκ±°ν•©λ‹ˆλ‹€.
Expand All @@ -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)
}
}
4 changes: 2 additions & 2 deletions Projects/Features/BaseFeature/Sources/Protocols/WMBottomSheetViewType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/// νŽΈμ§‘ν•˜κΈ° νŒμ—…μ„ μ œκ±°ν•©λ‹ˆλ‹€.
Expand All @@ -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)
}
}
}
4 changes: 2 additions & 2 deletions Projects/Features/BaseFeature/Sources/Views/WMBottomSheetView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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)
}
}
4 changes: 2 additions & 2 deletions Projects/Features/MainTabFeature/Sources/ViewControllers/MainContainerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Loading