VLCEditToolbar: Rename to EditToolbar

Sources/VLCEditToolbar.swift

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCEditToolbar.swift
+ * EditToolbar.swift
  *
  * Copyright © 2018 VLC authors and VideoLAN
  * Copyright © 2018 Videolabs
@@ -9,16 +9,16 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-protocol VLCEditToolbarDelegate: class {
-    func editToolbarDidDelete(_ editToolbar: VLCEditToolbar)
-    func editToolbarDidAddToPlaylist(_ editToolbar: VLCEditToolbar)
-    func editToolbarDidRename(_ editToolbar: VLCEditToolbar)
-    func editToolbarDidShare(_ editToolbar: VLCEditToolbar, presentFrom button: UIButton)
+protocol EditToolbarDelegate: class {
+    func editToolbarDidDelete(_ editToolbar: EditToolbar)
+    func editToolbarDidAddToPlaylist(_ editToolbar: EditToolbar)
+    func editToolbarDidRename(_ editToolbar: EditToolbar)
+    func editToolbarDidShare(_ editToolbar: EditToolbar, presentFrom button: UIButton)
 }
 
-class VLCEditToolbar: UIView {
+class EditToolbar: UIView {
     static let height: CGFloat = 60
-    weak var delegate: VLCEditToolbarDelegate?
+    weak var delegate: EditToolbarDelegate?
     private var category: MediaLibraryBaseModel
     private var stackView = UIStackView()
     private var shareButton: UIButton = {

Sources/MediaCategories/MediaCategoryViewController.swift

@@ -132,7 +132,7 @@ class VLCMediaCategoryViewController: UICollectionViewController, UICollectionVi
         if #available(iOS 11.0, *) {
             guide = view.safeAreaLayoutGuide
         }
-        editToolbarConstraint = editController.view.bottomAnchor.constraint(equalTo: guide.bottomAnchor, constant: VLCEditToolbar.height)
+        editToolbarConstraint = editController.view.bottomAnchor.constraint(equalTo: guide.bottomAnchor, constant: EditToolbar.height)
         NSLayoutConstraint.activate([
             editToolbarConstraint!,
             editController.view.leadingAnchor.constraint(equalTo: guide.leadingAnchor),
@@ -198,9 +198,9 @@ class VLCMediaCategoryViewController: UICollectionViewController, UICollectionVi
 
     private func displayEditToolbar() {
         UIView.animate(withDuration: 0.3) { [weak self] in
-            self?.editToolbarConstraint?.constant = self?.isEditing == true ? 0 : VLCEditToolbar.height
+            self?.editToolbarConstraint?.constant = self?.isEditing == true ? 0 : EditToolbar.height
             self?.view.layoutIfNeeded()
-            self?.collectionView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: self?.isEditing == true ? VLCEditToolbar.height : 0, right: 0)
+            self?.collectionView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: self?.isEditing == true ? EditToolbar.height : 0, right: 0)
         }
     }
 

Sources/VLCEditController.swift

@@ -27,7 +27,7 @@ class VLCEditController: UIViewController {
     weak var delegate: VLCEditControllerDelegate?
 
     override func loadView() {
-        let editToolbar = VLCEditToolbar(category: model)
+        let editToolbar = EditToolbar(category: model)
         editToolbar.delegate = self
         self.view = editToolbar
     }
@@ -133,7 +133,7 @@ private extension VLCEditController {
 
 // MARK: - VLCEditToolbarDelegate
 
-extension VLCEditController: VLCEditToolbarDelegate {
+extension VLCEditController: EditToolbarDelegate {
     func addToNewPlaylist() {
         let alertInfo = TextFieldAlertInfo(alertTitle: NSLocalizedString("PLAYLISTS", comment: ""),
                                            placeHolder: NSLocalizedString("PLAYLIST_PLACEHOLDER",
@@ -152,7 +152,7 @@ extension VLCEditController: VLCEditToolbarDelegate {
         }
     }
 
-    func editToolbarDidAddToPlaylist(_ editToolbar: VLCEditToolbar) {
+    func editToolbarDidAddToPlaylist(_ editToolbar: EditToolbar) {
         if !mediaLibraryService.playlists().isEmpty && !selectedCellIndexPaths.isEmpty {
             addToPlaylistViewController.playlists = mediaLibraryService.playlists()
             delegate?.editController(editController: self,
@@ -162,7 +162,7 @@ extension VLCEditController: VLCEditToolbarDelegate {
         }
     }
 
-    func editToolbarDidDelete(_ editToolbar: VLCEditToolbar) {
+    func editToolbarDidDelete(_ editToolbar: EditToolbar) {
         var objectsToDelete = [VLCMLObject]()
 
         for indexPath in selectedCellIndexPaths {
@@ -185,7 +185,7 @@ extension VLCEditController: VLCEditToolbarDelegate {
                                                                 deleteButton])
     }
 
-    func editToolbarDidShare(_ editToolbar: VLCEditToolbar, presentFrom button: UIButton) {
+    func editToolbarDidShare(_ editToolbar: EditToolbar, presentFrom button: UIButton) {
         UIApplication.shared.beginIgnoringInteractionEvents()
         let rootViewController = UIApplication.shared.keyWindow?.rootViewController
         guard let controller = VLCActivityViewControllerVendor.activityViewController(forFiles: fileURLsFromSelection(), presenting: button, presenting: rootViewController) else {
@@ -219,7 +219,7 @@ extension VLCEditController: VLCEditToolbarDelegate {
         return fileURLS
     }
 
-    func editToolbarDidRename(_ editToolbar: VLCEditToolbar) {
+    func editToolbarDidRename(_ editToolbar: EditToolbar) {
         // FIXME: Multiple renaming of files(multiple alert can get unfriendly if too many files)
         for indexPath in selectedCellIndexPaths {
             if let media = model.anyfiles[indexPath.row] as? VLCMLMedia {

VLC.xcodeproj/project.pbxproj

@@ -258,7 +258,7 @@
 		8DE18892210B5BAD00A091D2 /* ArtistModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE18891210B5BAD00A091D2 /* ArtistModel.swift */; };
 		8DE18894210B5F8200A091D2 /* AlbumModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE18893210B5F8200A091D2 /* AlbumModel.swift */; };
 		8DE18898210F144B00A091D2 /* GenreModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE18897210F144B00A091D2 /* GenreModel.swift */; };
-		8DF9669D2113317E00D0FCD6 /* VLCEditToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF9669C2113317100D0FCD6 /* VLCEditToolbar.swift */; };
+		8DF9669D2113317E00D0FCD6 /* EditToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF9669C2113317100D0FCD6 /* EditToolbar.swift */; };
 		8DF966B121188BDB00D0FCD6 /* VLCEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF966B021188BDB00D0FCD6 /* VLCEditController.swift */; };
 		8DF966EF211C643D00D0FCD6 /* PlaylistModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF966EE211C643D00D0FCD6 /* PlaylistModel.swift */; };
 		8F91EC79195CEC7900F5BCBA /* VLCOpenInActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F91EC78195CEC7900F5BCBA /* VLCOpenInActivity.m */; };
@@ -822,7 +822,7 @@
 		8DE18891210B5BAD00A091D2 /* ArtistModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtistModel.swift; sourceTree = "<group>"; };
 		8DE18893210B5F8200A091D2 /* AlbumModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumModel.swift; sourceTree = "<group>"; };
 		8DE18897210F144B00A091D2 /* GenreModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenreModel.swift; sourceTree = "<group>"; };
-		8DF9669C2113317100D0FCD6 /* VLCEditToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = VLCEditToolbar.swift; path = Sources/VLCEditToolbar.swift; sourceTree = "<group>"; };
+		8DF9669C2113317100D0FCD6 /* EditToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EditToolbar.swift; path = Sources/EditToolbar.swift; sourceTree = "<group>"; };
 		8DF966B021188BDB00D0FCD6 /* VLCEditController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = VLCEditController.swift; path = Sources/VLCEditController.swift; sourceTree = "<group>"; };
 		8DF966EE211C643D00D0FCD6 /* PlaylistModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaylistModel.swift; sourceTree = "<group>"; };
 		8F91EC77195CEC7900F5BCBA /* VLCOpenInActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCOpenInActivity.h; path = Sources/VLCOpenInActivity.h; sourceTree = SOURCE_ROOT; };
@@ -1267,7 +1267,7 @@
 				4144156920ECD2620078EC37 /* VLCSectionTableHeaderView.swift */,
 				4144156B20ECE6330078EC37 /* VLCFileServerView.swift */,
 				8D222DC120F779F1009C0D34 /* MediaEditCell.swift */,
-				8DF9669C2113317100D0FCD6 /* VLCEditToolbar.swift */,
+				8DF9669C2113317100D0FCD6 /* EditToolbar.swift */,
 				8DF966B021188BDB00D0FCD6 /* VLCEditController.swift */,
 				41B4DA3D21400E8E000BA27D /* MediaEditCell.xib */,
 				8D2AD4D722786F4000393833 /* AddToPlaylistViewController.swift */,
@@ -2872,7 +2872,7 @@
 				DD3EFF5D1BDEBCE500B68579 /* VLCLocalServerDiscoveryController.m in Sources */,
 				D6E034ED1CC284FC0037F516 /* VLCStreamingHistoryCell.m in Sources */,
 				DD3EFEED1BDEBA3800B68579 /* VLCNetworkServerBrowserViewController.m in Sources */,
-				8DF9669D2113317E00D0FCD6 /* VLCEditToolbar.swift in Sources */,
+				8DF9669D2113317E00D0FCD6 /* EditToolbar.swift in Sources */,
 				416443862048419E00CAC646 /* DeviceMotion.swift in Sources */,
 				7D9289751877459B009108FD /* VLCFirstStepsWifiSharingViewController.m in Sources */,
 				DD3EFF451BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserManualConnect.m in Sources */,