Add initial Status & Visibility integration

Author: kean

WordPress/Classes/ViewRelated/Post/PostSettings/PostSettingsView.swift

@@ -154,8 +154,8 @@ struct PostSettingsFormContentView: View {
     private var publishingOptionsSection: some View {
         Section {
             BlogListSiteView(site: .init(blog: viewModel.post.blog))
+            statusRow
             publishDateRow
-            visibilityRow
         } header: {
             SectionHeader(Strings.readyToPublish)
         }
@@ -269,7 +269,7 @@ struct PostSettingsFormContentView: View {
         NavigationLink {
             PostStatusView(settings: $viewModel.settings, timeZone: viewModel.timeZone)
         } label: {
-            SettingsRow(Strings.status) {
+            SettingsRow(viewModel.context == .publishing ? Strings.statusAndVisibility : Strings.status) {
                 HStack(alignment: .center, spacing: 2) {
                     ScaledImage(viewModel.settings.status.image, height: 23)
                     VStack(alignment: .leading, spacing: 2) {
@@ -703,4 +703,10 @@ private enum Strings {
         value: "Status",
         comment: "Label for the status field in Post Settings"
     )
+
+    static let statusAndVisibility = NSLocalizedString(
+        "postSettings.statusAndVisibility.label",
+        value: "Status & Visibility",
+        comment: "Label for the Status & Visibility field in Post Settings (should be short)"
+    )
 }

WordPress/Classes/ViewRelated/Post/PostSettings/PostSettingsViewModel.swift

@@ -157,7 +157,11 @@ final class PostSettingsViewModel: NSObject, ObservableObject {
         self.preferences = preferences
 
         // Initialize settings from the post
-        let initialSettings = PostSettings(from: post)
+        var initialSettings = PostSettings(from: post)
+        if context == .publishing {
+            initialSettings.status = .publish
+            initialSettings.updateStatusForPublishDate()
+        }
         self.settings = initialSettings
         self.originalSettings = initialSettings
 
@@ -359,6 +363,13 @@ final class PostSettingsViewModel: NSObject, ObservableObject {
         settings.password = selection.password.isEmpty ? nil : selection.password
     }
 
+    func didSelectPublshDate(_ date: Date?) {
+        settings.publishDate = date
+        if context == .publishing {
+            settings.updateStatusForPublishDate()
+        }
+    }
+
     func didSelectSuggestedTag(_ tag: String) {
         suggestedTags.removeAll(where: { $0 == tag })
         settings.tags.append(",\(tag)")
@@ -558,6 +569,26 @@ extension PostSettingsViewModel: @MainActor PrepublishingSocialAccountsDelegate
     }
 }
 
+private extension PostSettings {
+    mutating func updateStatusForPublishDate() {
+        switch status {
+        case .publish:
+            if let date = publishDate, date > .now, status == .publish {
+                status = .scheduled
+            }
+        case .scheduled:
+            if let date = publishDate, date <= .now {
+                status = .publish
+            } else if publishDate == nil {
+                status = .publish
+            }
+        default:
+            break // Do nothing
+
+        }
+    }
+}
+
 // MARK: - Localized Strings
 
 private enum Strings {

WordPress/Classes/ViewRelated/Post/PostSettings/Views/PostSettingsPublishDatePicker.swift

@@ -10,7 +10,7 @@ struct PostSettingsPublishDatePicker: View {
             isRequired: !viewModel.isDraftOrPending,
             timeZone: viewModel.timeZone,
             updated: { date in
-                viewModel.settings.publishDate = date
+                viewModel.didSelectPublshDate(date)
             }
         ))
     }

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

@@ -94,7 +94,7 @@ extension AbstractPostButton: AbstractPostMenuAction {
     var icon: UIImage? {
         switch self {
         case .view: return UIImage(systemName: "safari")
-        case .publish: return UIImage(systemName: "tray.and.arrow.up")
+        case .publish: return UIImage(systemName: "paperplane")
         case .stats: return UIImage(systemName: "chart.line.uptrend.xyaxis")
         case .duplicate: return UIImage(systemName: "doc.on.doc")
         case .moveToDraft: return UIImage(systemName: "pencil.line")