Merge pull request #18576 from wordpress-mobile/feature/18523-limit_prompts_list

Blogging Prompts List: limit to 11 prompts, no filtering

Author: ScoutHarris

WordPress/Classes/Services/BloggingPromptsService.swift

@@ -47,6 +47,18 @@ class BloggingPromptsService {
         }, failure: failure)
     }
 
+    /// Convenience method to fetch the blogging prompts for the Prompts List.
+    /// Fetches 11 prompts - the current day and 10 previous.
+    ///
+    /// - Parameters:
+    ///   - success: Closure to be called when the fetch process succeeded.
+    ///   - failure: Closure to be called when the fetch process failed.
+    func fetchListPrompts(success: @escaping ([BloggingPrompt]) -> Void,
+                          failure: @escaping (Error?) -> Void) {
+        let fromDate = calendar.date(byAdding: .day, value: -9, to: Date()) ?? Date()
+        fetchPrompts(from: fromDate, number: 11, success: success, failure: failure)
+    }
+
     required init?(context: NSManagedObjectContext = ContextManager.shared.mainContext,
                    remote: BloggingPromptsServiceRemote? = nil,
                    blog: Blog? = nil) {

WordPress/Classes/ViewRelated/Blog/Blogging Prompts/BloggingPromptsViewController.storyboard

@@ -20,15 +20,15 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bno-oB-pDf" customClass="FilterTabBar" customModule="WordPress" customModuleProvider="target">
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bno-oB-pDf" customClass="FilterTabBar" customModule="WordPress" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="46" id="mN2-YL-PRM"/>
                                 </constraints>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="7aR-Vp-g6a">
-                                <rect key="frame" x="0.0" y="46" width="375" height="621"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <inset key="separatorInset" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <connections>
@@ -41,12 +41,18 @@
                         <constraints>
                             <constraint firstItem="bno-oB-pDf" firstAttribute="leading" secondItem="gDw-cc-yIW" secondAttribute="leading" id="7Jf-su-8WM"/>
                             <constraint firstAttribute="trailing" secondItem="bno-oB-pDf" secondAttribute="trailing" id="AgG-aE-VG8"/>
+                            <constraint firstItem="7aR-Vp-g6a" firstAttribute="top" secondItem="gDw-cc-yIW" secondAttribute="top" id="Ndp-h3-R7q"/>
                             <constraint firstItem="7aR-Vp-g6a" firstAttribute="leading" secondItem="gDw-cc-yIW" secondAttribute="leading" id="Nt5-JK-DbB"/>
-                            <constraint firstItem="uCp-uQ-tOJ" firstAttribute="top" secondItem="7aR-Vp-g6a" secondAttribute="bottom" id="Oly-V9-tho"/>
+                            <constraint firstAttribute="bottom" secondItem="7aR-Vp-g6a" secondAttribute="bottom" id="Oly-V9-tho"/>
                             <constraint firstItem="7aR-Vp-g6a" firstAttribute="top" secondItem="bno-oB-pDf" secondAttribute="bottom" id="Rmm-F3-kCp"/>
                             <constraint firstAttribute="trailing" secondItem="7aR-Vp-g6a" secondAttribute="trailing" id="htA-bQ-QaF"/>
-                            <constraint firstItem="bno-oB-pDf" firstAttribute="top" secondItem="MpO-o7-pbX" secondAttribute="bottom" id="tfA-U7-Sc2"/>
+                            <constraint firstItem="bno-oB-pDf" firstAttribute="top" secondItem="gDw-cc-yIW" secondAttribute="top" id="tfA-U7-Sc2"/>
                         </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="Rmm-F3-kCp"/>
+                            </mask>
+                        </variation>
                     </view>
                     <connections>
                         <outlet property="filterTabBar" destination="bno-oB-pDf" id="fxk-Bw-WWL"/>

WordPress/Classes/ViewRelated/Blog/Blogging Prompts/BloggingPromptsViewController.swift

@@ -116,7 +116,7 @@ private extension BloggingPromptsViewController {
 
         isLoading = true
 
-        bloggingPromptsService.fetchPrompts(success: { [weak self] (prompts) in
+        bloggingPromptsService.fetchListPrompts(success: { [weak self] (prompts) in
             self?.isLoading = false
             self?.prompts = prompts.sorted(by: { $0.date.compare($1.date) == .orderedDescending })
         }, failure: { [weak self] (error) in
@@ -164,6 +164,13 @@ extension BloggingPromptsViewController: UITableViewDataSource, UITableViewDeleg
 
 private extension BloggingPromptsViewController {
 
+    // For Blogging Prompts V1, there is a single unfiltered prompts list.
+    // The expectation is it will be filtered at some point. So the FilterTabBar is hidden instead of removed.
+    // To show it, in the storyboard:
+    // - Unhide the FilterTabBar.
+    // - Remove the tableView top constraint to superview.
+    // - Enable the tableView top constraint to the FilterTabBar bottom.
+
     enum PromptFilter: Int, FilterTabBarItem, CaseIterable {
         case all
         case answered