Merge branch 'trunk' into task/19601-overlay-cta

# Conflicts:
#	WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewController.swift
#	WordPress/WordPress.xcodeproj/project.pbxproj

Author: hassaanelgarem

.buildkite/commands/lint-localized-strings-format.sh

@@ -0,0 +1,43 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :writing_hand: Copy Files"
+mkdir -pv ~/.configure/wordpress-ios/secrets
+cp -v fastlane/env/project.env-example ~/.configure/wordpress-ios/secrets/project.env
+
+echo "--- Lint Localized Strings Format"
+LOGS=logs.txt
+set +e
+set -o pipefail
+bundle exec fastlane generate_strings_file_for_glotpress skip_commit:true | tee $LOGS
+EXIT_CODE=$?
+set -e
+
+echo $EXIT_CODE
+
+if [[ $EXIT_CODE -ne 0 ]]; then
+  # Strings generation finished with errors, extract the errors in an easy-to-find section
+  echo "--- Report genstrings errors"
+  ERRORS=errors.txt
+  echo "Found errors when trying to run \`genstrings\` to generate the \`.strings\` files from \`*LocalizedStrings\` calls:" | tee $ERRORS
+  echo '' >> $ERRORS
+  # Print the errors inline.
+  #
+  # Notice the second `sed` call that removes the ANSI escape sequences that
+  # Fastlane uses to color the output.
+  grep -e "\[.*\].*genstrings:" $LOGS \
+    | sed -e 's/\[.*\].*genstrings: error: /- /' \
+    | sed -e $'s/\x1b\[[0-9;]*m//g' \
+    | sort \
+    | uniq \
+    | tee -a $ERRORS
+  # Annotate the build with the errors
+  cat $ERRORS | buildkite-agent annotate --style error --context genstrings
+fi
+
+exit $EXIT_CODE

.buildkite/pipeline.yml

@@ -123,3 +123,10 @@ steps:
         plugins: *common_plugins
         agents:
           queue: "android"
+      # Runs the `.strings` generation automation to ensure all the
+      # `LocalizedString` calls in the code can be correctly parsed by Apple's
+      # `genstrings`.
+      - label: "Lint Localized Strings Format"
+        command: .buildkite/commands/lint-localized-strings-format.sh
+        plugins: *common_plugins
+        env: *common_env

Podfile

@@ -218,7 +218,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WPMediaPicker', '~> 1.8.4'
+  pod 'WPMediaPicker', '~> 1.8.7'
   # 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)
   - 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)
   - 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: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
@@ -880,6 +880,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 879b8a4d9da3b3bad6cfed2de24977912ce560b0
+PODFILE CHECKSUM: e4762593ef0d1097286d309c828f611976c1e771
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,7 +1,13 @@
+21.3
+-----
+* [*] [internal] Blogging Reminders notifications and scheduling can be turned off for WordPress as part of Jetpack focus behind a feature flag. [#19611]
+* [*] [internal] Weekly Roundup notifications and scheduling can be turned off for WordPress as part of Jetpack focus behind a feature flag. [#19590]
+* [*] Fixed a minor UI issue where the segmented control under My SIte was being clipped when "Home" is selected. [#19595]
+
 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/Extensions/UIImageView+SiteIcon.swift

@@ -11,21 +11,14 @@ extension UIImageView {
     /// Default Settings
     ///
     struct SiteIconDefaults {
-
         /// Default SiteIcon's Image Size, in points.
         ///
-        static let imageSize = 40
-
-        /// Default SiteIcon's Image Size, in pixels.
-        ///
-        static var imageSizeInPixels: Int {
-            return imageSize * Int(UIScreen.main.scale)
-        }
+        static let imageSize = CGSize(width: 40, height: 40)
     }
 
 
     /// Downloads the SiteIcon Image, hosted at the specified path. This method will attempt to optimize the URL, so that
-    /// the download Image Size matches `SiteIconDefaults.imageSize`.
+    /// the download Image Size matches `imageSize`.
     ///
     /// TODO: This is a convenience method. Nuke me once we're all swifted.
     ///
@@ -38,35 +31,42 @@ extension UIImageView {
 
 
     /// Downloads the SiteIcon Image, hosted at the specified path. This method will attempt to optimize the URL, so that
-    /// the download Image Size matches `SiteIconDefaults.imageSize`.
+    /// the download Image Size matches `imageSize`.
     ///
     /// - Parameters:
     ///     - path: SiteIcon's url (string encoded) to be downloaded.
+    ///     - imageSize: Request site icon in the specified image size.
     ///     - placeholderImage: Yes. It's the "place holder image", Sherlock.
     ///
     @objc
-    func downloadSiteIcon(at path: String, placeholderImage: UIImage?) {
-        guard let siteIconURL = optimizedURL(for: path) else {
+    func downloadSiteIcon(
+        at path: String,
+        imageSize: CGSize = SiteIconDefaults.imageSize,
+        placeholderImage: UIImage?
+    ) {
+        guard let siteIconURL = optimizedURL(for: path, imageSize: imageSize) else {
             image = placeholderImage
             return
         }
 
         logURLOptimization(from: path, to: siteIconURL)
 
         let request = URLRequest(url: siteIconURL)
-        downloadSiteIcon(with: request, placeholderImage: placeholderImage)
+        downloadSiteIcon(with: request, imageSize: imageSize, placeholderImage: placeholderImage)
     }
 
     /// Downloads a SiteIcon image, using a specified request.
     ///
     /// - Parameters:
-    ///     - request: the request for the SiteIcon.
+    ///     - request: The request for the SiteIcon.
+    ///     - imageSize: Request site icon in the specified image size.
     ///     - placeholderImage: Yes. It's the "place holder image".
     ///
     private func downloadSiteIcon(
         with request: URLRequest,
-        placeholderImage: UIImage?) {
-
+        imageSize expectedSize: CGSize = SiteIconDefaults.imageSize,
+        placeholderImage: UIImage?
+    ) {
         af_setImage(withURLRequest: request, placeholderImage: placeholderImage, completion: { [weak self] dataResponse in
             switch dataResponse.result {
             case .success(let image):
@@ -82,8 +82,6 @@ extension UIImageView {
                 // The following lines of code ensure that we resize the image to the default Site Icon size, to
                 // ensure there is no UI breakage due to having larger images set here.
                 //
-                let expectedSize = CGSize(width: SiteIconDefaults.imageSize, height: SiteIconDefaults.imageSize)
-
                 if image.size != expectedSize {
                     self.image = image.resizedImage(with: .scaleAspectFill, bounds: expectedSize, interpolationQuality: .default)
                 } else {
@@ -103,19 +101,21 @@ extension UIImageView {
 
 
     /// Downloads the SiteIcon Image, associated to a given Blog. This method will attempt to optimize the URL, so that
-    /// the download Image Size matches `SiteIconDefaults.imageSize`.
+    /// the download Image Size matches `imageSize`.
     ///
     /// - Parameters:
     ///     - blog: reference to the source blog
     ///     - placeholderImage: Yes. It's the "place holder image".
     ///
-    @objc
-    func downloadSiteIcon(for blog: Blog, placeholderImage: UIImage? = .siteIconPlaceholder) {
-        guard let siteIconPath = blog.icon, let siteIconURL = optimizedURL(for: siteIconPath) else {
+    @objc func downloadSiteIcon(
+        for blog: Blog,
+        imageSize: CGSize = SiteIconDefaults.imageSize,
+        placeholderImage: UIImage? = .siteIconPlaceholder
+    ) {
+        guard let siteIconPath = blog.icon, let siteIconURL = optimizedURL(for: siteIconPath, imageSize: imageSize) else {
 
             if blog.isWPForTeams() && placeholderImage == .siteIconPlaceholder {
-                let standardSize = CGSize(width: SiteIconDefaults.imageSize, height: SiteIconDefaults.imageSize)
-                image = UIImage.gridicon(.p2, size: standardSize)
+                image = UIImage.gridicon(.p2, size: imageSize)
                 return
             }
 
@@ -135,7 +135,7 @@ extension UIImageView {
             for: siteIconURL,
             from: host,
             onComplete: { [weak self] request in
-                self?.downloadSiteIcon(with: request, placeholderImage: placeholderImage)
+                self?.downloadSiteIcon(with: request, imageSize: imageSize, placeholderImage: placeholderImage)
         }) { error in
             DDLogError(error.localizedDescription)
         }
@@ -145,31 +145,31 @@ extension UIImageView {
 
 // MARK: - Private Methods
 //
-private extension UIImageView {
+extension UIImageView {
     /// Returns the Size Optimized URL for a given Path.
     ///
-    func optimizedURL(for path: String) -> URL? {
+    func optimizedURL(for path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
         if isPhotonURL(path) || isDotcomURL(path) {
-            return optimizedDotcomURL(from: path)
+            return optimizedDotcomURL(from: path, imageSize: imageSize)
         }
 
         if isBlavatarURL(path) {
-            return optimizedBlavatarURL(from: path)
+            return optimizedBlavatarURL(from: path, imageSize: imageSize)
         }
 
-        return optimizedPhotonURL(from: path)
+        return optimizedPhotonURL(from: path, imageSize: imageSize)
     }
 
 
     // MARK: - Private Helpers
 
-    /// Returns the download URL for a square icon with a size of `SiteIconDefaults.imageSizeInPixels`
+    /// Returns the download URL for a square icon with a size of `imageSize` in pixels.
     ///
     /// - Parameter path: SiteIcon URL (string encoded).
     ///
-    private func optimizedDotcomURL(from path: String) -> URL? {
-        let size = SiteIconDefaults.imageSizeInPixels
-        let query = String(format: "w=%d&h=%d", size, size)
+    private func optimizedDotcomURL(from path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
+        let size = imageSize.toPixels()
+        let query = String(format: "w=%d&h=%d", Int(size.width), Int(size.height))
 
         return parseURL(path: path, query: query)
     }
@@ -179,9 +179,9 @@ private extension UIImageView {
     ///
     /// - Parameter path: Blavatar URL (string encoded).
     ///
-    private func optimizedBlavatarURL(from path: String) -> URL? {
-        let size = SiteIconDefaults.imageSizeInPixels
-        let query = String(format: "d=404&s=%d", size)
+    private func optimizedBlavatarURL(from path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
+        let size = imageSize.toPixels()
+        let query = String(format: "d=404&s=%d", Int(max(size.width, size.height)))
 
         return parseURL(path: path, query: query)
     }
@@ -191,13 +191,12 @@ private extension UIImageView {
     ///
     /// - Parameter siteIconPath: SiteIcon URL (string encoded).
     ///
-    private func optimizedPhotonURL(from path: String) -> URL? {
+    private func optimizedPhotonURL(from path: String, imageSize: CGSize = SiteIconDefaults.imageSize) -> URL? {
         guard let url = URL(string: path) else {
             return nil
         }
 
-        let size = CGSize(width: SiteIconDefaults.imageSize, height: SiteIconDefaults.imageSize)
-        return PhotonImageURLHelper.photonURL(with: size, forImageURL: url)
+        return PhotonImageURLHelper.photonURL(with: imageSize, forImageURL: url)
     }
 
 
@@ -267,3 +266,19 @@ private extension UIImageView {
         DDLogInfo("URL optimized from \(original) to \(optimized.absoluteString) for blog \(blogInfo)")
     }
 }
+
+// MARK: - CGFloat Extension
+
+private extension CGSize {
+
+    func toPixels() -> CGSize {
+        return CGSize(width: width.toPixels(), height: height.toPixels())
+    }
+}
+
+private extension CGFloat {
+
+    func toPixels() -> CGFloat {
+        return self * UIScreen.main.scale
+    }
+}

WordPress/Classes/Models/Notifications/NotificationSettings.swift

@@ -139,15 +139,15 @@ open class NotificationSettings {
     }
 
     // MARK: - Private Properties
-    fileprivate let blogPreferenceKeys: [String] = {
+    fileprivate var blogPreferenceKeys: [String] {
         var keys = [Keys.commentAdded, Keys.commentLiked, Keys.postLiked, Keys.follower, Keys.achievement, Keys.mention]
 
         if Feature.enabled(.weeklyRoundup) {
             keys.append(Keys.weeklyRoundup)
         }
 
         return keys
-    }()
+    }
     fileprivate let blogEmailPreferenceKeys = [Keys.commentAdded, Keys.commentLiked, Keys.postLiked, Keys.follower, Keys.mention]
     fileprivate let otherPreferenceKeys     = [Keys.commentLiked, Keys.commentReplied]
     fileprivate let wpcomPreferenceKeys     = [Keys.marketing, Keys.research, Keys.community]