Add Media Upload to Post Settings

wordpress-mobile · Apr 26, 2024 · a62d150 · a62d150
1 parent 998a240
commit a62d150
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/WordPress/Classes/ViewRelated/Post/PostMediaUploadsView.swift b/WordPress/Classes/ViewRelated/Post/PostMediaUploadsView.swift
@@ -4,8 +4,8 @@ import SwiftUI
 final class PostMediaUploadsViewController: UIHostingController<PostMediaUploadsView> {
     private let viewModel: PostMediaUploadsViewModel
 
-    init(post: AbstractPost) {
-        self.viewModel = PostMediaUploadsViewModel(post: post) // Manange lifecycle
+    init(post: AbstractPost, isShowingOnlyPending: Bool = true) {
+        self.viewModel = PostMediaUploadsViewModel(post: post, isShowingOnlyPending: isShowingOnlyPending) // Manange lifecycle
         super.init(rootView: PostMediaUploadsView(viewModel: viewModel))
     }
 

diff --git a/WordPress/Classes/ViewRelated/Post/PostMediaUploadsViewModel.swift b/WordPress/Classes/ViewRelated/Post/PostMediaUploadsViewModel.swift
@@ -21,10 +21,13 @@ final class PostMediaUploadsViewModel: ObservableObject {
         timer?.invalidate()
     }
 
-    init(post: AbstractPost, coordinator: MediaCoordinator = .shared) {
+    init(post: AbstractPost, isShowingOnlyPending: Bool = true, coordinator: MediaCoordinator = .shared) {
         self.post = post
         self.coordinator = coordinator
-        self.uploads = Array(post.media).filter(\.isUploadNeeded).sorted {
+        let media = Array(post.media).filter {
+            isShowingOnlyPending ? $0.isUploadNeeded : true
+        }
+        self.uploads = media.sorted {
             ($0.creationDate ?? .now) < ($1.creationDate ?? .now)
         }.map {
             PostMediaUploadItemViewModel(media: $0, coordinator: coordinator)
@@ -41,6 +44,10 @@ final class PostMediaUploadsViewModel: ObservableObject {
         }.store(in: &cancellables)
     }
 
+    static func getPendingUploads(for post: AbstractPost) -> [Media] {
+        Array(post.media).filter(\.isUploadNeeded)
+    }
+
     private func didUpdateMedia(_ media: Set<Media>) {
         let remainingObjectIDs = Set(media.map(\.objectID))
         withAnimation {

diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController+Swift.swift b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController+Swift.swift
@@ -172,6 +172,13 @@ extension PostSettingsViewController {
     private static var cancellablesKey: UInt8 = 0
 }
 
+extension PostSettingsViewController {
+    @objc func showMediaUploadsController() {
+        let viewController = PostMediaUploadsViewController(post: apost, isShowingOnlyPending: false)
+        navigationController?.pushViewController(viewController, animated: true)
+    }
+}
+
 extension PostSettingsViewController: UIAdaptivePresentationControllerDelegate {
     public func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
         deleteRevision()

diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
@@ -42,7 +42,8 @@ typedef NS_ENUM(NSInteger, PostSettingsRow) {
     PostSettingsRowSlug,
     PostSettingsRowExcerpt,
     PostSettingsRowSocialNoConnections,
-    PostSettingsRowSocialRemainingShares
+    PostSettingsRowSocialRemainingShares,
+    PostSettingsRowMediaUploads
 };
 
 static CGFloat CellHeight = 44.0f;
@@ -418,7 +419,8 @@ - (void)configureSections
                                    @(PostSettingsSectionShare),
                                    disabledTwitterSection,
                                    remainingSharesSection,
-                                   @(PostSettingsSectionMoreOptions) ] mutableCopy];
+                                   @(PostSettingsSectionMoreOptions),
+                                   @(PostSettingsSectionMaintenance)] mutableCopy];
     // Remove sticky post section for self-hosted non Jetpack site
     // and non admin user
     //
@@ -466,6 +468,8 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         return 1;
     } else if (sec == PostSettingsSectionMoreOptions) {
         return 2;
+    } else if (sec == PostSettingsSectionMaintenance) {
+        return 1;
     }
 
     return 0;
@@ -502,6 +506,8 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
     } else if (sec == PostSettingsSectionMoreOptions) {
         return NSLocalizedString(@"More Options", @"Label for the More Options area in post settings. Should use the same translation as core WP.");
 
+    } else if (sec == PostSettingsSectionMaintenance) {
+        return NSLocalizedStringWithDefaultValue(@"postSettings.section.maintenance.header", nil, [NSBundle mainBundle], @"Maintenance", @"Section title for the Maintanence Settings screen");
     }
     return nil;
 }
@@ -584,6 +590,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell = [self configureRemainingSharesCell];
     } else if (sec == PostSettingsSectionMoreOptions) {
         cell = [self configureMoreOptionsCellForIndexPath:indexPath];
+    } else if (sec == PostSettingsSectionMaintenance) {
+        cell = [self configureMaintanenceSectionCellForIndexPath:indexPath];
     }
 
     return cell ?: [UITableViewCell new];
@@ -626,6 +634,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         [self showEditSlugController];
     } else if (cell.tag == PostSettingsRowExcerpt) {
         [self showEditExcerptController];
+    } else if (cell.tag == PostSettingsRowMediaUploads) {
+        [self showMediaUploadsController];
     }
 }
 
@@ -949,6 +959,15 @@ - (UITableViewCell *)configureSocialCellForIndexPath:(NSIndexPath *)indexPath
     return cell;
 }
 
+- (UITableViewCell *)configureMaintanenceSectionCellForIndexPath:(NSIndexPath *)indexPath {
+
+    UITableViewCell *cell = [self getWPTableViewDisclosureCell];
+    cell.textLabel.text = NSLocalizedStringWithDefaultValue(@"postSettings.mediaUploadsRow", nil, [NSBundle mainBundle], @"Media Uploads", @"Post Settings media uploads row title");
+    cell.detailTextLabel.text = [NSString stringWithFormat:@"%i", self.apost.media.count];
+    cell.tag = PostSettingsRowMediaUploads;
+    return cell;
+}
+
 - (UITableViewCell *)configureDisclosureCellWithSharing:(BOOL)canEditSharing
 {
     UITableViewCell *cell = [self getWPTableViewDisclosureCell];

diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController_Internal.h b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController_Internal.h
@@ -10,7 +10,8 @@ typedef enum {
     PostSettingsSectionDisabledTwitter, // NOTE: Clean up when Twitter has been removed from Publicize services.
     PostSettingsSectionSharesRemaining,
     PostSettingsSectionGeolocation,
-    PostSettingsSectionMoreOptions
+    PostSettingsSectionMoreOptions,
+    PostSettingsSectionMaintenance
 } PostSettingsSection;