Merge pull request #18544 from wordpress-mobile/feature/18473-consolidate-prompt-objects

Blogging Prompts: Remove extra `Prompt` object and use `BloggingPrompt`

Author: wargcm

WordPress/Classes/Extensions/Post+BloggingPrompts.swift

@@ -1,76 +1,11 @@
-
 extension Post {
 
-    func prepareForPrompt(_ prompt: Prompt?) {
+    func prepareForPrompt(_ prompt: BloggingPrompt?) {
         guard let prompt = prompt else {
             return
         }
-        postTitle = prompt.postTitle
-        let pullquoteBlock = getPullquoteBlock(title: prompt.promptText,
-                                               promptUrl: prompt.promptUrl?.absoluteString,
-                                               answerUrl: prompt.answerUrl?.absoluteString,
-                                               answerCount: prompt.answerCount)
-        content = pullquoteBlock + Strings.emptyParagraph
+        postTitle = prompt.title
+        content = prompt.content
     }
 
 }
-
-// MARK: - Private methods
-
-private extension Post {
-
-    func getPullquoteBlock(title: String,
-                           promptUrl: String?,
-                           answerUrl: String?,
-                           answerCount: Int) -> String {
-        let answerFormat = answerCount == 1 ? Strings.answerInfoSingularFormat : Strings.answerInfoPluralFormat
-        let answerText = String(format: answerFormat, answerCount)
-        let promptUrlHtml = getUrlHtml(url: promptUrl, urlText: Strings.prompt)
-        let answerUrlHtml = getUrlHtml(url: answerUrl, urlText: answerText)
-        let separatorText = promptUrlHtml.isEmpty || answerUrlHtml.isEmpty ? "" : " — "
-        let subtitleHtml = promptUrlHtml.isEmpty && answerUrlHtml.isEmpty ? "" :  "<cite>\(promptUrlHtml)\(separatorText)\(answerUrlHtml)</cite>"
-        return """
-            <!-- wp:pullquote -->
-            <figure class="wp-block-pullquote"><blockquote><p>\(title)</p>\(subtitleHtml)</blockquote></figure>
-            <!-- /wp:pullquote -->
-            """
-    }
-
-    func getUrlHtml(url: String?, urlText: String) -> String {
-        guard let url = url else {
-            return ""
-        }
-        return "<a href=\"\(url)\">\(urlText)</a>"
-    }
-
-    // MARK: - Strings
-
-    struct Strings {
-        static let prompt = NSLocalizedString("Prompt", comment: "Prompt link text in a new blogging prompts post")
-        static let answerInfoSingularFormat = NSLocalizedString("%1$d answer", comment: "Singular format string for displaying the number of users that answered the blogging prompt.")
-        static let answerInfoPluralFormat = NSLocalizedString("%1$d answers", comment: "Plural format string for displaying the number of users that answered the blogging prompt.")
-        static let emptyParagraph = """
-            <!-- wp:paragraph -->
-            <p></p>
-            <!-- /wp:paragraph -->
-            """
-    }
-
-}
-
-// MARK: - Temporary prompt object
-
-// TODO: Remove after prompt object is created and use that
-struct Prompt {
-    let postTitle: String
-    let promptText: String
-    let promptUrl: URL?
-    let answerUrl: URL?
-    let answerCount: Int
-
-    static let examplePrompt = Prompt(postTitle: "Cast the movie of my life",
-                                      promptText: "Cast the movie of your life.",
-                                      promptUrl: URL(string: "https://wordpress.com"),
-                                      answerUrl: URL(string: "https://wordpress.com"),
-                                      answerCount: 19)
-}

WordPress/Classes/Services/BloggingPromptsService.swift

@@ -74,6 +74,19 @@ struct BloggingPrompt {
     let answerCount: Int
     let displayAvatarURLs: [URL]
 
+    static let examplePrompt = BloggingPrompt(
+            promptID: 239,
+            text: "Was there a toy or thing you always wanted as a child, during the holidays or on your birthday, but never received? Tell us about it.",
+            title: "Prompt number 1",
+            content: "<!-- wp:pullquote -->\n<figure class=\"wp-block-pullquote\"><blockquote><p>Was there a toy or thing you always wanted as a child, during the holidays or on your birthday, but never received? Tell us about it.</p><cite>(courtesy of plinky.com)</cite></blockquote></figure>\n<!-- /wp:pullquote -->",
+            date: Date(),
+            answered: false,
+            answerCount: 5,
+            displayAvatarURLs: []
+    )
+}
+
+extension BloggingPrompt {
     init(with remotePrompt: RemoteBloggingPrompt) {
         promptID = remotePrompt.promptID
         text = remotePrompt.text

WordPress/Classes/ViewRelated/Post/EditPostViewController.swift

@@ -23,7 +23,7 @@ class EditPostViewController: UIViewController {
     private let loadAutosaveRevision: Bool
 
     @objc fileprivate(set) var post: Post?
-    private let prompt: Prompt?
+    private let prompt: BloggingPrompt?
     fileprivate var hasShownEditor = false
     fileprivate var editingExistingPost = false
     fileprivate let blog: Blog
@@ -65,7 +65,7 @@ class EditPostViewController: UIViewController {
     ///
     /// - Parameter blog: blog to create a new post for
     /// - Parameter prompt: blogging prompt to configure the new post for
-    convenience init(blog: Blog, prompt: Prompt) {
+    convenience init(blog: Blog, prompt: BloggingPrompt) {
         self.init(post: nil, blog: blog, prompt: prompt)
     }
 
@@ -75,7 +75,7 @@ class EditPostViewController: UIViewController {
     ///   - post: the post to edit
     ///   - blog: the blog to create a post for, if post is nil
     /// - Note: it's preferable to use one of the convenience initializers
-    fileprivate init(post: Post?, blog: Blog, loadAutosaveRevision: Bool = false, prompt: Prompt? = nil) {
+    fileprivate init(post: Post?, blog: Blog, loadAutosaveRevision: Bool = false, prompt: BloggingPrompt? = nil) {
         self.post = post
         self.loadAutosaveRevision = loadAutosaveRevision
         if let post = post {