Integrate upload view snackbar

Author: kean

WordPress/Classes/Services/MediaCoordinator.swift

@@ -398,10 +398,10 @@ class MediaCoordinator: NSObject {
         // https://github.com/wordpress-mobile/WordPress-iOS/issues/20298#issuecomment-1465319707
         let service = self.mediaServiceFactory.create(coreDataStack.mainContext)
         var progress: Progress? = nil
-        service.uploadMedia(media, automatedRetry: automatedRetry, progress: &progress, success: success, failure: failure)
-        if let progress {
-            resultProgress.addChild(progress, withPendingUnitCount: resultProgress.totalUnitCount)
-        }
+//        service.uploadMedia(media, automatedRetry: automatedRetry, progress: &progress, success: success, failure: failure)
+//        if let progress {
+//            resultProgress.addChild(progress, withPendingUnitCount: resultProgress.totalUnitCount)
+//        }
 
         uploading(media, progress: resultProgress)
 

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -84,7 +84,7 @@ public enum FeatureFlag: Int, CaseIterable {
         case .newStats:
             return false
         case .newPublishingSheet:
-            return BuildConfiguration.current == .debug
+            return false
         }
     }
 

WordPress/Classes/ViewRelated/Post/Prepublishing/Views/PostMediaUploadsSnackbarView.swift

@@ -0,0 +1,58 @@
+import SwiftUI
+
+struct PostMediaUploadsSnackbarView: View {
+    let state: PostMediaUploadsSnackbarState
+
+    private let accessoryViewWidth: CGFloat = 20
+
+    var body: some View {
+        HStack(spacing: 10) {
+            switch state {
+            case let .uploading(title, details, progress):
+                if let progress {
+                    MediaUploadProgressView(progress: progress)
+                        .frame(width: accessoryViewWidth)
+                } else {
+                    ProgressView()
+                        .foregroundStyle(.secondary)
+                        .frame(width: accessoryViewWidth)
+                }
+                makeDetailsView(title: title, details: details)
+            case let .failed(title, details):
+                Image(systemName: "exclamationmark.triangle.fill")
+                    .foregroundStyle(Color.red)
+                    .frame(width: accessoryViewWidth)
+                makeDetailsView(title: title, details: details)
+            }
+        }
+    }
+
+    private func makeDetailsView(title: String, details: String?) -> some View {
+        VStack(alignment: .leading) {
+            Text(title)
+                .font(.subheadline.weight(.medium))
+                .foregroundStyle(.primary)
+            if let details {
+                Text(details)
+                    .font(.footnote)
+                    .foregroundStyle(.secondary)
+            }
+        }
+        .tint(.primary)
+        .lineLimit(1)
+    }
+}
+
+enum PostMediaUploadsSnackbarState {
+    case uploading(title: String, details: String, progress: Double?)
+    case failed(title: String, details: String? = nil)
+}
+
+#Preview {
+    VStack(spacing: 16) {
+        PostMediaUploadsSnackbarView(state: .uploading(title: "Uploading media...", details: "2 items remaining", progress: 0.2))
+        PostMediaUploadsSnackbarView(state: .failed(title: "Failed to upload media"))
+        PostMediaUploadsSnackbarView(state: .failed(title: "Failed to upload media", details: "Not connected to Internet"))
+    }
+    .padding()
+}

WordPress/Classes/ViewRelated/Post/Publishing/PublishPostViewController.swift

@@ -9,6 +9,7 @@ import WordPressUI
 /// the post settings along with some publishing options like the publish date.
 final class PublishPostViewController: UIHostingController<PublishPostView> {
     private let viewModel: PostSettingsViewModel
+    private let uploadsViewModel: PostMediaUploadsViewModel
 
     var onCompletion: ((PrepublishingSheetResult) -> Void)?
 
@@ -19,7 +20,12 @@ final class PublishPostViewController: UIHostingController<PublishPostView> {
             context: .publishing
         )
         self.viewModel = viewModel
-        super.init(rootView: PublishPostView(viewModel: viewModel))
+
+        let uploadsViewModel = PostMediaUploadsViewModel(post: post)
+        self.uploadsViewModel = uploadsViewModel
+
+        let view = PublishPostView(viewModel: viewModel, uploadsViewModel: uploadsViewModel)
+        super.init(rootView: view)
     }
 
     required dynamic init?(coder aDecoder: NSCoder) {
@@ -44,6 +50,7 @@ final class PublishPostViewController: UIHostingController<PublishPostView> {
 
 struct PublishPostView: View {
     @ObservedObject var viewModel: PostSettingsViewModel
+    @ObservedObject var uploadsViewModel: PostMediaUploadsViewModel
 
     @State private var isShowingDiscardChangesAlert = false
 
@@ -52,6 +59,13 @@ struct PublishPostView: View {
     var body: some View {
         Form {
             Section {
+                if let state = uploadsViewModel.uploadingSnackbarState {
+                    NavigationLink {
+                        PostMediaUploadsView(viewModel: uploadsViewModel)
+                    } label: {
+                        PostMediaUploadsSnackbarView(state: state)
+                    }
+                }
                 BlogListSiteView(site: .init(blog: viewModel.post.blog))
             } header: {
                 SectionHeader(Strings.readyToPublish)
@@ -126,13 +140,16 @@ struct PublishPostView: View {
         if viewModel.isSaving {
             ProgressView()
         } else {
+            let isDisabled = !uploadsViewModel.isCompleted
+
             Button(viewModel.publishButtonTitle) {
                 viewModel.buttonPublishTapped()
             }
             .fontWeight(.medium)
             .buttonStyle(.borderedProminent)
             .buttonBorderShape(.capsule)
-            .tint(AppColor.primary)
+            .tint(isDisabled ? Color(.opaqueSeparator) : AppColor.primary)
+            .disabled(isDisabled)
         }
     }
 }

WordPress/Classes/ViewRelated/Post/Views/PostMediaUploadsViewModel.swift

@@ -42,6 +42,24 @@ final class PostMediaUploadsViewModel: ObservableObject {
         }.store(in: &cancellables)
     }
 
+    /// - returns `nil` if upload is completed.
+    var uploadingSnackbarState: PostMediaUploadsSnackbarState? {
+        guard !isCompleted else {
+            return nil
+        }
+        typealias Strings = PrepublishingSheetStrings
+        let errors = uploads.compactMap(\.error)
+        if !errors.isEmpty {
+            let details = errors.count == 1 ? errors[0].localizedDescription : String(format: Strings.mediaUploadFailedDetailsMultipleFailures, errors.count.description)
+            return .failed(title: Strings.mediaUploadFailedTitle, details: details)
+        }
+        return .uploading(
+            title: Strings.uploadingMedia,
+            details: Strings.uploadMediaRemaining(count: uploads.count - completedUploadsCount),
+            progress: fractionCompleted
+        )
+    }
+
     private func didUpdateMedia(_ media: Set<Media>) {
         let remainingObjectIDs = Set(media.map(\.objectID))
         withAnimation {