Merge pull request #20885 from wordpress-mobile/disable-posts-list-ac…

…tion-menu-when-uploading PostsList - Disable the menu button/action bar when a post is being uploaded
wordpress-mobile · Jun 19, 2023 · b39df1b · b39df1b
2 parents de22f2a + bf99521
commit b39df1b
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 6 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 * [**] Fixed crash issue when accessing drafts that are mid-upload from the Home 'Work on a Draft Post' card. [#20872]
 * [**] [internal] Make sure a database tidy-up task (null blog property sanitizer) is completed before any other Core Data queries. [#20867]
 * [**] [internal] Make sure media-related features function correctly. [#20889], [20887]
+* [*] [internal] Posts list: Disable action bar/menu button when a post is being uploaded [#20885]
 
 22.6
 -----

diff --git a/WordPress/Classes/ViewRelated/Post/PostCardCell.swift b/WordPress/Classes/ViewRelated/Post/PostCardCell.swift
@@ -68,6 +68,7 @@ class PostCardCell: UITableViewCell, ConfigurablePostView {
         configureProgressView()
         configureActionBar()
         configureAccessibility()
+        configureActionBarInteraction()
     }
 
     override func awakeFromNib() {
@@ -360,6 +361,22 @@ class PostCardCell: UITableViewCell, ConfigurablePostView {
             .joined(separator: " ")
     }
 
+    private func configureActionBarInteraction() {
+        guard let viewModel = viewModel else {
+            return
+        }
+
+        let isProgressBarVisible = !viewModel.shouldHideProgressView
+
+        if isProgressBarVisible {
+            actionBarView.isUserInteractionEnabled = false
+            actionBarView.alpha = 0.3
+        } else {
+            actionBarView.isUserInteractionEnabled = true
+            actionBarView.alpha = 1.0
+        }
+    }
+
     private func setupBorders() {
         WPStyleGuide.applyBorderStyle(upperBorder)
         WPStyleGuide.applyBorderStyle(bottomBorder)

diff --git a/WordPress/Classes/ViewRelated/Post/PostCompactCell.swift b/WordPress/Classes/ViewRelated/Post/PostCompactCell.swift
@@ -47,6 +47,7 @@ class PostCompactCell: UITableViewCell, ConfigurablePostView {
         configureStatus()
         configureFeaturedImage()
         configureProgressView()
+        configureMenuInteraction()
     }
 
     @IBAction func more(_ sender: Any) {
@@ -179,6 +180,22 @@ class PostCompactCell: UITableViewCell, ConfigurablePostView {
         }
     }
 
+    private func configureMenuInteraction() {
+        guard let viewModel = viewModel else {
+            return
+        }
+
+        let isProgressBarVisible = !viewModel.shouldHideProgressView
+
+        if isProgressBarVisible {
+            menuButton.isEnabled = false
+            menuButton.alpha = 0.3
+        } else {
+            menuButton.isEnabled = true
+            menuButton.alpha = 1.0
+        }
+    }
+
     private func setupAccessibility() {
         menuButton.accessibilityLabel =
             NSLocalizedString("More", comment: "Accessibility label for the More button in Post List (compact view).")

diff --git a/WordPress/WordPressTest/PostCardCellGhostableTests.swift b/WordPress/WordPressTest/PostCardCellGhostableTests.swift
@@ -74,13 +74,21 @@ class PostCardCellGhostableTests: CoreDataTestCase {
     }
 
     func testActionBarOpacityAfterConfigure() {
-        let post = PostBuilder(mainContext).build()
+        let post = PostBuilder(mainContext).with(remoteStatus: .sync).build()
         assert(post.managedObjectContext != nil)
         postCell.configure(with: post)
 
         XCTAssertEqual(postCell.actionBarView.layer.opacity, 1)
     }
 
+    func testActionBarOpacityAfterConfigureWithPushingStatus() {
+        let post = PostBuilder(mainContext).with(remoteStatus: .pushing).build()
+        assert(post.managedObjectContext != nil)
+        postCell.configure(with: post)
+
+        XCTAssertEqual(postCell.actionBarView.layer.opacity, 0.3)
+    }
+
     func testHideGhostView() {
         let post = PostBuilder(mainContext).build()
 

diff --git a/WordPress/WordPressTest/PostCompactCellGhostableTests.swift b/WordPress/WordPressTest/PostCompactCellGhostableTests.swift
@@ -3,7 +3,7 @@ import XCTest
 
 @testable import WordPress
 
-class PostCompactCellGhostableTests: XCTestCase {
+class PostCompactCellGhostableTests: CoreDataTestCase {
 
     var postCell: PostCompactCell!
 
@@ -30,23 +30,23 @@ class PostCompactCellGhostableTests: XCTestCase {
     }
 
     func testIsInteractiveAfterAConfigure() {
-        let post = PostBuilder().build()
+        let post = PostBuilder(mainContext).build()
 
         postCell.configure(with: post)
 
         XCTAssertTrue(postCell.isUserInteractionEnabled)
     }
 
     func testShowBadgesLabelAfterConfigure() {
-        let post = PostBuilder().build()
+        let post = PostBuilder(mainContext).build()
 
         postCell.configure(with: post)
 
         XCTAssertFalse(postCell.badgesLabel.isHidden)
     }
 
     func testHideGhostAfterConfigure() {
-        let post = PostBuilder().build()
+        let post = PostBuilder(mainContext).build()
 
         postCell.configure(with: post)
 
@@ -55,13 +55,21 @@ class PostCompactCellGhostableTests: XCTestCase {
     }
 
     func testMenuButtonOpacityAfterConfigure() {
-        let post = PostBuilder().build()
+        let post = PostBuilder(mainContext).with(remoteStatus: .sync).build()
 
         postCell.configure(with: post)
 
         XCTAssertEqual(postCell.menuButton.layer.opacity, 1)
     }
 
+    func testMenuButtonOpacityAfterConfigureWithPushingStatus() {
+        let post = PostBuilder(mainContext).with(remoteStatus: .pushing).build()
+
+        postCell.configure(with: post)
+
+        XCTAssertEqual(postCell.menuButton.layer.opacity, 0.3)
+    }
+
     private func postCellFromNib() -> PostCompactCell {
         let bundle = Bundle(for: PostCardCell.self)
         guard let postCell = bundle.loadNibNamed("PostCompactCell", owner: nil)?.first as? PostCompactCell else {