VLCMediaCategoryViewController: Rename to MediaCategoryViewController

Sources/MediaCategories/MediaCategory.swift

@@ -10,7 +10,7 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-class VLCMovieCategoryViewController: VLCMediaCategoryViewController {
+class VLCMovieCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = VideoModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -20,7 +20,7 @@ class VLCMovieCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCShowEpisodeCategoryViewController: VLCMediaCategoryViewController {
+class VLCShowEpisodeCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = ShowEpisodeModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -30,7 +30,7 @@ class VLCShowEpisodeCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCPlaylistCategoryViewController: VLCMediaCategoryViewController {
+class VLCPlaylistCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = PlaylistModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -40,7 +40,7 @@ class VLCPlaylistCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCTrackCategoryViewController: VLCMediaCategoryViewController {
+class VLCTrackCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = TrackModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -50,7 +50,7 @@ class VLCTrackCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCGenreCategoryViewController: VLCMediaCategoryViewController {
+class VLCGenreCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = GenreModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -60,7 +60,7 @@ class VLCGenreCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCArtistCategoryViewController: VLCMediaCategoryViewController {
+class VLCArtistCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = ArtistModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -70,7 +70,7 @@ class VLCArtistCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCAlbumCategoryViewController: VLCMediaCategoryViewController {
+class VLCAlbumCategoryViewController: MediaCategoryViewController {
     init(_ services: Services) {
         let model = AlbumModel(medialibrary: services.medialibraryService)
         super.init(services: services, model: model)
@@ -80,7 +80,7 @@ class VLCAlbumCategoryViewController: VLCMediaCategoryViewController {
     }
 }
 
-class VLCCollectionCategoryViewController: VLCMediaCategoryViewController {
+class VLCCollectionCategoryViewController: MediaCategoryViewController {
     init(_ services: Services, mediaCollection: MediaCollectionModel) {
         let model = CollectionModel(mediaService: services.medialibraryService, mediaCollection: mediaCollection)
         super.init(services: services, model: model)

Sources/MediaCategories/MediaCategoryViewController.swift

@@ -14,10 +14,10 @@
 import Foundation
 
 protocol MediaCategoryViewControllerDelegate: NSObjectProtocol {
-    func needsToUpdateNavigationbarIfNeeded(_ viewController: VLCMediaCategoryViewController)
+    func needsToUpdateNavigationbarIfNeeded(_ viewController: MediaCategoryViewController)
 }
 
-class VLCMediaCategoryViewController: UICollectionViewController, UICollectionViewDelegateFlowLayout, UISearchBarDelegate, IndicatorInfoProvider {
+class MediaCategoryViewController: UICollectionViewController, UICollectionViewDelegateFlowLayout, UISearchBarDelegate, IndicatorInfoProvider {
 
     var model: MediaLibraryBaseModel
     private var services: Services
@@ -310,7 +310,7 @@ class VLCMediaCategoryViewController: UICollectionViewController, UICollectionVi
 
 // MARK: - UISearchBarDelegate
 
-extension VLCMediaCategoryViewController {
+extension MediaCategoryViewController {
     func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
         reloadData()
         isSearching = true
@@ -342,7 +342,7 @@ extension VLCMediaCategoryViewController {
 
 // MARK: - UICollectionViewDelegateFlowLayout
 
-extension VLCMediaCategoryViewController {
+extension MediaCategoryViewController {
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         if cachedCellSize == .zero {
             //For iOS 10 when rotating we take the value from willTransition to size, for the first layout pass that value is 0 though,
@@ -397,7 +397,7 @@ extension VLCMediaCategoryViewController {
 
 // MARK: VLCActionSheetDelegate
 
-extension VLCMediaCategoryViewController: ActionSheetDelegate {
+extension MediaCategoryViewController: ActionSheetDelegate {
     func headerViewTitle() -> String? {
         return NSLocalizedString("HEADER_TITLE_SORT", comment: "")
     }
@@ -416,7 +416,7 @@ extension VLCMediaCategoryViewController: ActionSheetDelegate {
 
 // MARK: VLCActionSheetDataSource
 
-extension VLCMediaCategoryViewController: ActionSheetDataSource {
+extension MediaCategoryViewController: ActionSheetDataSource {
     func numberOfRows() -> Int {
         return model.sortModel.sortingCriteria.count
     }
@@ -444,7 +444,7 @@ extension VLCMediaCategoryViewController: ActionSheetDataSource {
 
 // MARK: - ActionSheetSortSectionHeaderDelegate
 
-extension VLCMediaCategoryViewController: ActionSheetSortSectionHeaderDelegate {
+extension MediaCategoryViewController: ActionSheetSortSectionHeaderDelegate {
     func actionSheetSortSectionHeader(_ header: ActionSheetSortSectionHeader,
                                       onSwitchIsOnChange: Bool) {
         model.sort(by: model.sortModel.currentSort, desc: onSwitchIsOnChange)
@@ -453,7 +453,7 @@ extension VLCMediaCategoryViewController: ActionSheetSortSectionHeaderDelegate {
 
 // MARK: - EditControllerDelegate
 
-extension VLCMediaCategoryViewController: EditControllerDelegate {
+extension MediaCategoryViewController: EditControllerDelegate {
     func editController(editController: EditController, cellforItemAt indexPath: IndexPath) -> MediaEditCell? {
         return collectionView.cellForItem(at: indexPath) as? MediaEditCell
     }
@@ -465,7 +465,7 @@ extension VLCMediaCategoryViewController: EditControllerDelegate {
     }
 }
 
-private extension VLCMediaCategoryViewController {
+private extension MediaCategoryViewController {
     func setupCollectionView() {
         let cellNib = UINib(nibName: model.cellType.nibName, bundle: nil)
         collectionView?.register(cellNib, forCellWithReuseIdentifier: model.cellType.defaultReuseIdentifier)
@@ -504,7 +504,7 @@ private extension VLCMediaCategoryViewController {
 
 // MARK: - Player
 
-extension VLCMediaCategoryViewController {
+extension MediaCategoryViewController {
 
     func play(media: VLCMLMedia, at indexPath: IndexPath) {
         let playbackController = VLCPlaybackController.sharedInstance()

Sources/MediaViewControllers/MediaViewController.swift

@@ -68,7 +68,7 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell>, MediaCatego
         }
         super.viewDidLoad()
         viewControllers.forEach {
-            ($0 as? VLCMediaCategoryViewController)?.delegate = self
+            ($0 as? MediaCategoryViewController)?.delegate = self
         }
         setupNavigationBar()
     }
@@ -82,7 +82,7 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell>, MediaCatego
     }
     // MARK: - MediaCatgoryViewControllerDelegate
 
-    func needsToUpdateNavigationbarIfNeeded(_ viewController: VLCMediaCategoryViewController) {
+    func needsToUpdateNavigationbarIfNeeded(_ viewController: MediaCategoryViewController) {
         if viewController == viewControllers[currentIndex] {
             updateButtonsFor(viewController)
         }
@@ -95,7 +95,7 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell>, MediaCatego
 
     func updateButtonsFor(_ viewController: UIViewController) {
         var showButtons = false
-        if let mediaCategoryViewController = viewController as? VLCMediaCategoryViewController,
+        if let mediaCategoryViewController = viewController as? MediaCategoryViewController,
             !mediaCategoryViewController.isEmptyCollectionView()
                 && !mediaCategoryViewController.isSearching {
             showButtons = true
@@ -142,7 +142,7 @@ extension VLCMediaViewController {
 
 extension VLCMediaViewController {
     @objc func handleSort() {
-        if let mediaCategoryViewController = viewControllers[currentIndex] as? VLCMediaCategoryViewController {
+        if let mediaCategoryViewController = viewControllers[currentIndex] as? MediaCategoryViewController {
             mediaCategoryViewController.handleSort()
         }
     }
@@ -152,7 +152,7 @@ extension VLCMediaViewController {
             if #available(iOS 10.0, *) {
                 UIImpactFeedbackGenerator(style: .light).impactOccurred()
             }
-            if let mediaCategoryViewController = viewControllers[currentIndex] as? VLCMediaCategoryViewController {
+            if let mediaCategoryViewController = viewControllers[currentIndex] as? MediaCategoryViewController {
                 mediaCategoryViewController.handleSortShortcut()
             }
         }