Fix Media Picker no results message hidden in some cases (#19555)

Fixes #18840

Author: mokagio

Podfile

@@ -218,7 +218,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WPMediaPicker', '~> 1.8.4'
+  pod 'WPMediaPicker', '~> 1.8.7-beta.1'
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
   ## while PR is in review:
   # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''

Podfile.lock

@@ -512,7 +512,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.5)
-  - WPMediaPicker (1.8.6)
+  - WPMediaPicker (1.8.7-beta.1)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (6.1.2)
@@ -605,7 +605,7 @@ DEPENDENCIES:
   - WordPressKit (>= 4.58.2, ~> 4.58)
   - WordPressShared (~> 1.18.0)
   - WordPressUI (~> 1.12.5)
-  - WPMediaPicker (~> 1.8.4)
+  - WPMediaPicker (~> 1.8.7-beta.1)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.85.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
@@ -868,7 +868,7 @@ SPEC CHECKSUMS:
   WordPressKit: d8bc00bce09273fc241cf171b0e61ef8f4f29479
   WordPressShared: e5a479220643f46dc4d7726ef8dd45f18bf0c53b
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
-  WPMediaPicker: 749ebfa75fb2b6df4f5e5d9d0847e9512ad74d28
+  WPMediaPicker: 59135aebb058a95a507045f93e478516729e5c0f
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -880,6 +880,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 879b8a4d9da3b3bad6cfed2de24977912ce560b0
+PODFILE CHECKSUM: 936784ec2e9d8246acccd6b123c0ba5b1b6e13b9
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,7 +1,7 @@
 21.2
 -----
 * [*] [internal] Refactored fetching posts in the Reader tab. [#19539]
-
+* [*] Fixed an issue where the message "No media matching your search" for the media picker is not visible [#19555]
 
 21.1
 -----

WordPress/Classes/ViewRelated/Views/NoResultsViewController.swift

@@ -98,9 +98,8 @@ import Reachability
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         setAccessoryViewsVisibility()
-    }
-
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        // `traitCollectionDidChange` is not fired for iOS 16.0 + Media adding flow. The reason why the constraints update call was moved to here.
+        // Since `viewWillTransition` is always called when the orientation changes (portrait | landscape), it will work for all scenarios.
         DispatchQueue.main.async {
             self.configureTitleViewConstraints()
         }
@@ -481,12 +480,13 @@ private extension NoResultsViewController {
                 let titleLabelTopConstraint = titleLabelTopConstraint else {
                     return
             }
-
+            titleLabelTopConstraint.constant = TitleLabelConstraints.topLandscape
             NSLayoutConstraint.activate([titleLabelTopConstraint, titleLabelMaxWidthConstraint, titleLabelCenterXConstraint])
         }
     }
 
     func resetTitleViewConstraints() {
+        titleLabelTopConstraint?.isActive = false
         titleLabelTrailingConstraint?.isActive = false
         titleLabelLeadingConstraint?.isActive = false
         titleLabelMaxWidthConstraint?.isActive = false
@@ -517,6 +517,7 @@ private extension NoResultsViewController {
 
     struct TitleLabelConstraints {
         static let top = CGFloat(64)
+        static let topLandscape = CGFloat(32)
         static let leading = CGFloat(38)
         static let trailing = CGFloat(-38)
         static let maxWidth = CGFloat(360)

WordPress/WordPressTest/ViewRelated/Views/Controllers/NoResultsViewControllerTests.swift

@@ -10,6 +10,7 @@ class NoResultsViewControllerTests: XCTestCase {
         This is a long Text. This is a long Text. This is a long Text. This is a long Text. This is a long Text.
         This is a long Text. This is a long Text. This is a long Text. This is a long Text. This is a long Text.
         """
+        static let noResultsText = "No media matching your search"
         static let iPhoneSeSize = CGSize(width: 320, height: 568)
         static let iPadProSize = CGSize(width: 1024, height: 1366)
         static let resultViewMaxWidth: CGFloat = 360
@@ -20,13 +21,13 @@ class NoResultsViewControllerTests: XCTestCase {
     private var parentViewController: UIViewController!
 
     override func setUpWithError() throws {
-        self.resultViewController = NoResultsViewController.controller()
-        self.parentViewController = UIViewController()
+        resultViewController = NoResultsViewController.controller()
+        parentViewController = UIViewController()
     }
 
     override func tearDownWithError() throws {
-        self.resultViewController = nil
-        self.parentViewController = nil
+        resultViewController = nil
+        parentViewController = nil
     }
 
     func testTitleLabelWidthForLongTextInSmallScreen() {
@@ -91,6 +92,20 @@ class NoResultsViewControllerTests: XCTestCase {
         XCTAssertTrue(resultViewController.subtitleTextView.frame.width <= Constants.resultViewMaxWidth)
     }
 
+    func testTitleLabelWidthForNoSearchResults() {
+        // Given
+        let parentViewSize = Constants.iPadProSize
+        parentViewController.view.frame = CGRect(origin: .zero, size: parentViewSize)
+
+        // When
+        resultViewController.configureForNoSearchResults(title: Constants.noResultsText)
+        addResultViewControllerToParent()
+
+        // Then
+        XCTAssertEqual(resultViewController.titleLabel.text, Constants.noResultsText)
+        XCTAssertTrue(resultViewController.noResultsView.isHidden)
+        XCTAssertLessThanOrEqual(resultViewController.titleLabel.frame.width, parentViewSize.width)
+    }
 }
 
 private extension NoResultsViewControllerTests {