Skip to content

Commit

Permalink
Remove deprecated code
Browse files Browse the repository at this point in the history
  • Loading branch information
@kean
kean committed Nov 17, 2023
1 parent 86643d5 commit 0989edb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 189 deletions.
3 changes: 3 additions & 0 deletions WordPress/Classes/Utility/Editor/EditorFactory.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ class EditorFactory {
// MARK: - Editor: Instantiation

func instantiateEditor(for post: AbstractPost, loadAutosaveRevision: Bool = false, replaceEditor: @escaping ReplaceEditorBlock) -> EditorViewController {
#warning("TODO: test")
return AztecPostViewController(post: post, loadAutosaveRevision: loadAutosaveRevision, replaceEditor: replaceEditor)

if gutenbergSettings.mustUseGutenberg(for: post) {
return createGutenbergVC(with: post, loadAutosaveRevision: loadAutosaveRevision, replaceEditor: replaceEditor)
} else {
Expand Down
192 changes: 3 additions & 189 deletions WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Gridicons
import WordPressShared
import MobileCoreServices
import WordPressEditor
import WPMediaPicker
import AVKit
import MobileCoreServices
import AutomatticTracks
Expand Down Expand Up @@ -371,14 +370,6 @@ class AztecPostViewController: UIViewController, PostEditor {
///
fileprivate var activeMediaRequests = [ImageDownloaderTask]()

/// Media Library Data Source
///
lazy var mediaLibraryDataSource: MediaLibraryPickerDataSource = {
let dataSource = MediaLibraryPickerDataSource(post: self.post)
dataSource.ignoreSyncErrors = true
return dataSource
}()

fileprivate let mediaCoordinator = MediaCoordinator.shared

/// Media Progress View
Expand Down Expand Up @@ -447,23 +438,12 @@ class AztecPostViewController: UIViewController, PostEditor {

fileprivate var originalTrailingBarButtonGroup = [UIBarButtonItemGroup]()

/// The view to show when media picker has no assets to show.
///
fileprivate let noResultsView = NoResultsViewController.controller()

fileprivate var mediaLibraryChangeObserverKey: NSObjectProtocol? = nil

/// Presents whatever happens when FormatBar's more button is selected
///
fileprivate lazy var moreCoordinator: AztecMediaPickingCoordinator = {
return AztecMediaPickingCoordinator(delegate: self)
}()


/// Helps choosing the correct view controller for previewing a media asset
///
private var mediaPreviewHelper: MediaPreviewHelper? = nil

private let database: KeyValueDatabase = UserDefaults.standard
private enum Key {
static let classicDeprecationNoticeHasBeenShown = "kClassicDeprecationNoticeHasBeenShown"
Expand Down Expand Up @@ -534,7 +514,6 @@ class AztecPostViewController: UIViewController, PostEditor {
configureNavigationBar()
configureView()
configureSubviews()
noResultsView.configureForNoAssets(userCanUploadMedia: false)

// UI elements might get their properties reset when the view is effectively loaded. Refresh it all!
refreshInterface()
Expand Down Expand Up @@ -910,44 +889,6 @@ class AztecPostViewController: UIViewController, PostEditor {
navigationBarManager.reloadPublishButton()
}

fileprivate func updateSearchBar(mediaPicker: WPMediaPickerViewController) {
let isSearching = mediaLibraryDataSource.searchQuery?.count ?? 0 != 0
let hasAssets = mediaLibraryDataSource.totalAssetCount > 0

if isSearching || hasAssets {
mediaPicker.showSearchBar()
if let searchBar = mediaPicker.searchBar {
WPStyleGuide.configureSearchBar(searchBar)
}
} else {
mediaPicker.hideSearchBar()
}
}

fileprivate func registerChangeObserver(forPicker picker: WPMediaPickerViewController) {
assert(mediaLibraryChangeObserverKey == nil)
mediaLibraryChangeObserverKey = mediaLibraryDataSource.registerChangeObserverBlock({ [weak self] _, _, _, _, _ in

self?.updateSearchBar(mediaPicker: picker)

let isNotSearching = self?.mediaLibraryDataSource.searchQuery?.count ?? 0 == 0
let hasNoAssets = self?.mediaLibraryDataSource.numberOfAssets() == 0

if isNotSearching && hasNoAssets {
self?.noResultsView.removeFromView()
self?.noResultsView.configureForNoAssets(userCanUploadMedia: false)
}
})
}

fileprivate func unregisterChangeObserver() {
if let mediaLibraryChangeObserverKey = mediaLibraryChangeObserverKey {
mediaLibraryDataSource.unregisterChangeObserver(mediaLibraryChangeObserverKey)
}
mediaLibraryChangeObserverKey = nil
}


// MARK: - Keyboard Handling

override var keyCommands: [UIKeyCommand] {
Expand Down Expand Up @@ -2361,13 +2302,12 @@ extension AztecPostViewController {
attachment?.uploadID = media.uploadID
}

/// Sets the badge title of `attachment` to "GIF" if either the media is being imported from Tenor,
/// or if it's a PHAsset with an animated playback style.
/// Sets the badge title of `attachment` to "GIF".
private func setGifBadgeIfNecessary(for attachment: MediaAttachment, asset: ExportableAsset, source: MediaSource) {
var isGif = source == .tenor

if let asset = asset as? PHAsset,
asset.playbackStyle == .imageAnimated {
if let asset = (asset as? NSItemProvider),
asset.hasItemConformingToTypeIdentifier(UTType.gif.identifier) {
isGif = true
}

Expand All @@ -2384,10 +2324,6 @@ extension AztecPostViewController {
insert(exportableAsset: image, source: source)
}

fileprivate func insertDeviceMedia(phAsset: PHAsset, source: MediaSource = .deviceLibrary) {
insert(exportableAsset: phAsset, source: source)
}

private func insertStockPhotosMedia(_ media: StockPhotosMedia) {
insert(exportableAsset: media, source: .stockPhotos)
}
Expand Down Expand Up @@ -3188,93 +3124,6 @@ extension AztecPostViewController: PHPickerViewControllerDelegate {
}
closeMediaPickerInputViewController()
}
}

// MARK: - MediaPickerViewController Delegate Conformance
//
extension AztecPostViewController: WPMediaPickerViewControllerDelegate {

func emptyViewController(forMediaPickerController picker: WPMediaPickerViewController) -> UIViewController? {
return nil
}

func mediaPickerController(_ picker: WPMediaPickerViewController, didUpdateSearchWithAssetCount assetCount: Int) {
noResultsView.removeFromView()

if (mediaLibraryDataSource.searchQuery?.count ?? 0) > 0 {
noResultsView.configureForNoSearchResult()
}
}

func mediaPickerControllerWillBeginLoadingData(_ picker: WPMediaPickerViewController) {
updateSearchBar(mediaPicker: picker)
noResultsView.configureForFetching()
}

func mediaPickerControllerDidEndLoadingData(_ picker: WPMediaPickerViewController) {
updateSearchBar(mediaPicker: picker)
noResultsView.removeFromView()
noResultsView.configureForNoAssets(userCanUploadMedia: false)
}

func mediaPickerControllerDidCancel(_ picker: WPMediaPickerViewController) {
unregisterChangeObserver()
mediaLibraryDataSource.searchCancelled()
dismiss(animated: true)
}

func mediaPickerController(_ picker: WPMediaPickerViewController, didFinishPicking assets: [WPMediaAsset]) {
unregisterChangeObserver()
mediaLibraryDataSource.searchCancelled()
dismiss(animated: true)
mediaSelectionMethod = .fullScreenPicker

closeMediaPickerInputViewController()

if assets.isEmpty {
return
}

for asset in assets {
switch asset {
case let phAsset as PHAsset:
insertDeviceMedia(phAsset: phAsset)
case let media as Media:
insertSiteMediaLibrary(media: media)
default:
continue
}
}
}


func mediaPickerController(_ picker: WPMediaPickerViewController, selectionChanged assets: [WPMediaAsset]) {
updateFormatBarInsertAssetCount()
}

func mediaPickerController(_ picker: WPMediaPickerViewController, didSelect asset: WPMediaAsset) {
updateFormatBarInsertAssetCount()
}

func mediaPickerController(_ picker: WPMediaPickerViewController, didDeselect asset: WPMediaAsset) {
updateFormatBarInsertAssetCount()
}

func mediaPickerController(_ picker: WPMediaPickerViewController, handleError error: Error) -> Bool {
let alert = WPMediaPickerAlertHelper.buildAlertControllerWithError(error)
present(alert, animated: true)
return true
}

func mediaPickerController(_ picker: WPMediaPickerViewController, previewViewControllerFor assets: [WPMediaAsset], selectedIndex selected: Int) -> UIViewController? {
if let phAssets = assets as? [PHAsset], phAssets.allSatisfy({ $0.mediaType == .image }) {
edit(fromMediaPicker: picker, assets: phAssets)
return nil
} else {
mediaPreviewHelper = MediaPreviewHelper(assets: assets)
return mediaPreviewHelper?.previewViewController(selectedIndex: selected)
}
}

private func updateFormatBarInsertAssetCount() {
let assetCount = selectedPickerResults.count
Expand Down Expand Up @@ -3560,41 +3409,6 @@ extension AztecPostViewController {
// MARK: - Media Editing
//
extension AztecPostViewController {
private func edit(fromMediaPicker picker: WPMediaPickerViewController, assets: [PHAsset]) {
let mediaEditor = WPMediaEditor(assets)

// When the photo's library is updated (eg.: a new photo is added)
// the actionBar is appearing and conflicting with Media Editor.
// We hide it to prevent that issue
picker.actionBar?.isHidden = true

mediaEditor.edit(from: picker,
onFinishEditing: { [weak self] images, actions in
images.forEach { mediaEditorImage in
if let image = mediaEditorImage.editedImage {
self?.insertImage(image: image)
} else if let phAsset = mediaEditorImage as? PHAsset {
self?.insertDeviceMedia(phAsset: phAsset)
}
}

self?.dismissMediaPicker()
}, onCancel: {
// Dismiss the Preview screen in Media Picker
picker.navigationController?.popViewController(animated: false)

// Show picker actionBar again
picker.actionBar?.isHidden = false
})
}

private func dismissMediaPicker() {
unregisterChangeObserver()
mediaLibraryDataSource.searchCancelled()
closeMediaPickerInputViewController()
dismiss(animated: false)
}

private func edit(_ imageAttachment: ImageAttachment) {

guard imageAttachment.mediaURL?.isGif == false else {
Expand Down

0 comments on commit 0989edb

Please sign in to comment.