Merge pull request #1318 from wakmusic/implement-swipe-delete

🔀 :: (#1310) 재생목록, 나의 플리 swipe delete 구현
wakmusic · Oct 25, 2024 · 32265c4 · 32265c4
2 parents 4008c69 + 3d436c3
commit 32265c4
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 20 deletions.
diff --git a/Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift b/Projects/Features/PlaylistFeature/Sources/Reactors/MyPlaylistDetailReactor.swift
@@ -26,6 +26,7 @@ final class MyPlaylistDetailReactor: Reactor {
         case changeImageData(PlaylistImageKind)
         case shareButtonDidTap
         case moreButtonDidTap
+        case didTapSwippedRemoveButton(IndexPath)
     }
 
     enum Mutation {
@@ -151,14 +152,20 @@ final class MyPlaylistDetailReactor: Reactor {
             return deselectAll()
 
         case .removeSongs:
-            return removeSongs()
+            return removeSongs(
+                targets: currentState.playlistModels.filter { $0.isSelected }
+            )
 
         case let .changeImageData(imageData):
             return updateImageData(imageData: imageData)
         case .shareButtonDidTap:
             return updateShareLink()
         case .moreButtonDidTap:
             return updateShowEditSheet(flag: !self.currentState.showEditSheet)
+
+        case let .didTapSwippedRemoveButton(index):
+            let target = currentState.playlistModels[index.row]
+            return removeSongs(targets: [target])
         }
     }
 
@@ -462,12 +469,9 @@ private extension MyPlaylistDetailReactor {
         ])
     }
 
-    func removeSongs() -> Observable<Mutation> {
-        let state = currentState
-        let playlists = state.playlistModels
-
-        let remainSongs = playlists.filter { !$0.isSelected }
-        let removeSongs = playlists.filter { $0.isSelected }.map { $0.id }
+    func removeSongs(targets: [PlaylistItemModel]) -> Observable<Mutation> {
+        let remainSongs = currentState.playlistModels.filter { !targets.contains($0) }
+        let removeSongs = targets.map { $0.id }
         var prevHeader = currentState.header
         prevHeader.updateSongCount(remainSongs.count)
 

diff --git a/...cts/Features/PlaylistFeature/Sources/ViewControllers/MyPlaylistDetailViewController.swift b/...cts/Features/PlaylistFeature/Sources/ViewControllers/MyPlaylistDetailViewController.swift
@@ -536,6 +536,23 @@ extension MyPlaylistDetailViewController: UITableViewDelegate, UITableViewDragDe
         return false // 편집모드 시 셀의 들여쓰기를 없애려면 false를 리턴합니다.
     }
 
+    public func tableView(
+        _ tableView: UITableView,
+        trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath
+    ) -> UISwipeActionsConfiguration? {
+        let deleteAction = UIContextualAction(style: .destructive, title: "삭제") { [weak self] _, _, _ in
+            guard let self else { return }
+            self.reactor?.action.onNext(.didTapSwippedRemoveButton(indexPath))
+        }
+
+        deleteAction.backgroundColor = DesignSystemAsset.PrimaryColorV2.increase.color
+
+        let configuration = UISwipeActionsConfiguration(actions: [deleteAction])
+        configuration.performsFirstActionWithFullSwipe = false
+
+        return configuration
+    }
+
     public func tableView(
         _ tableView: UITableView,
         itemsForBeginning session: any UIDragSession,

diff --git a/...ts/Features/PlaylistFeature/Sources/ViewControllers/PlaylistViewController+Delegate.swift b/...ts/Features/PlaylistFeature/Sources/ViewControllers/PlaylistViewController+Delegate.swift
@@ -109,6 +109,23 @@ extension PlaylistViewController: UITableViewDelegate, UITableViewDragDelegate {
         return true // 모든 Cell 을 이동 가능하게 설정합니다.
     }
 
+    public func tableView(
+        _ tableView: UITableView,
+        trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath
+    ) -> UISwipeActionsConfiguration? {
+        let deleteAction = UIContextualAction(style: .destructive, title: "삭제") { [weak self] _, _, _ in
+            guard let self else { return }
+            self.didTapSwippedRemoveSongSubject.onNext(indexPath.row)
+        }
+
+        deleteAction.backgroundColor = DesignSystemAsset.PrimaryColorV2.increase.color
+
+        let configuration = UISwipeActionsConfiguration(actions: [deleteAction])
+        configuration.performsFirstActionWithFullSwipe = false
+
+        return configuration
+    }
+
     public func tableView(
         _ tableView: UITableView,
         targetIndexPathForMoveFromRowAt sourceIndexPath: IndexPath,

diff --git a/Projects/Features/PlaylistFeature/Sources/ViewControllers/PlaylistViewController.swift b/Projects/Features/PlaylistFeature/Sources/ViewControllers/PlaylistViewController.swift
@@ -25,6 +25,7 @@ public final class PlaylistViewController: UIViewController, SongCartViewType {
     var tappedAddPlaylist = PublishSubject<Void>()
     var tappedRemoveSongs = PublishSubject<Void>()
     var didLongPressedSongSubject = PublishSubject<Int>()
+    var didTapSwippedRemoveSongSubject = PublishSubject<Int>()
 
     private(set) var containSongsFactory: any ContainSongsFactory
     private(set) var songDetailPresenter: any SongDetailPresentable
@@ -50,7 +51,8 @@ public final class PlaylistViewController: UIViewController, SongCartViewType {
         addPlaylistButtonDidTapEvent: tappedAddPlaylist.asObservable(),
         removeSongsButtonDidTapEvent: tappedRemoveSongs.asObservable(),
         itemMovedEvent: playlistView.playlistTableView.rx.itemMoved.asObservable(),
-        didLongPressedSongEvent: didLongPressedSongSubject
+        didLongPressedSongEvent: didLongPressedSongSubject,
+        didTapSwippedRemoveButtonEvent: didTapSwippedRemoveSongSubject
     )
     lazy var output = self.viewModel.transform(from: input)
 
@@ -95,7 +97,6 @@ public final class PlaylistViewController: UIViewController, SongCartViewType {
         playlistView.playlistTableView.dragDelegate = self
 //        playlistView.playlistTableView.dragInteractionEnabled = true
         bindViewModel()
-        bindActions()
     }
 
     override public func viewDidAppear(_ animated: Bool) {
@@ -126,8 +127,6 @@ private extension PlaylistViewController {
         case .changed:
             let distanceY = max(distance.y, 0)
             view.frame = CGRect(x: 0, y: distanceY, width: view.frame.width, height: screenHeight)
-            // let opacity = 1 - (distanceY / screenHeight)
-            // updateOpacity(value: Float(opacity))
 
         case .ended:
             let velocity = gestureRecognizer.velocity(in: self.view)
@@ -144,7 +143,6 @@ private extension PlaylistViewController {
                     options: [.curveEaseInOut],
                     animations: {
                         self.view.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: screenHeight)
-                        self.updateOpacity(value: 1)
                     }
                 )
             }
@@ -153,10 +151,6 @@ private extension PlaylistViewController {
             break
         }
     }
-
-    func updateOpacity(value: Float) {
-        playlistView.layer.opacity = value
-    }
 }
 
 private extension PlaylistViewController {
@@ -291,10 +285,6 @@ private extension PlaylistViewController {
     }
 }
 
-private extension PlaylistViewController {
-    private func bindActions() {}
-}
-
 extension PlaylistViewController {
     private func createDatasources(
         output: PlaylistViewModel

diff --git a/Projects/Features/PlaylistFeature/Sources/ViewModels/PlaylistViewModel.swift b/Projects/Features/PlaylistFeature/Sources/ViewModels/PlaylistViewModel.swift
@@ -22,6 +22,7 @@ final class PlaylistViewModel: ViewModelType {
         let removeSongsButtonDidTapEvent: Observable<Void>
         let itemMovedEvent: Observable<(sourceIndex: IndexPath, destinationIndex: IndexPath)>
         let didLongPressedSongEvent: Observable<Int>
+        let didTapSwippedRemoveButtonEvent: Observable<Int>
     }
 
     struct Output {
@@ -149,6 +150,17 @@ final class PlaylistViewModel: ViewModelType {
                 output.countOfSongs.send(output.playlists.value.count)
             }).disposed(by: disposeBag)
 
+        input.didTapSwippedRemoveButtonEvent
+            .bind(with: self, onNext: { owner, index in
+                var mutablePlaylist = output.playlists.value
+                mutablePlaylist.remove(at: index)
+                output.playlists.accept(mutablePlaylist)
+                output.countOfSongs.send(mutablePlaylist.count)
+
+                owner.playState.remove(indexs: [index])
+            })
+            .disposed(by: disposeBag)
+
         input.itemMovedEvent
             .map { (sourceIndex: $0.row, destIndex: $1.row) }
             .subscribe { (sourceIndex: Int, destIndex: Int) in