Merge pull request #17795 from wordpress-mobile/feature/media-permissions-dynamic-type

Adds dynamic type support to media permissions prompt

Author: frosty

Podfile

@@ -210,7 +210,7 @@ abstract_target 'Apps' do
 
     pod 'NSURL+IDN', '~> 0.4'
 
-    pod 'WPMediaPicker', '~> 1.8.2-beta.1'
+    pod 'WPMediaPicker', '~> 1.8.2-beta.2'
     # 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

@@ -477,7 +477,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.3)
-  - WPMediaPicker (1.8.2-beta.1)
+  - WPMediaPicker (1.8.2-beta.2)
   - wpxmlrpc (0.9.0)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (6.1.1)
@@ -573,7 +573,7 @@ DEPENDENCIES:
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.0)
   - WordPressUI (~> 1.12.3)
-  - WPMediaPicker (~> 1.8.2-beta.1)
+  - WPMediaPicker (~> 1.8.2-beta.2)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.70.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
@@ -837,7 +837,7 @@ SPEC CHECKSUMS:
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: a4b0308a6345d4dda20c8f7ad9317df4246b4a00
   WordPressUI: 45591178e843ecb82e65e868ec766148befe9f9f
-  WPMediaPicker: e3c1e9c226eed11408210351b5c92cb800045278
+  WPMediaPicker: 95682a64d24d2a1de4e140e7da68da79030f8173
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
   ZendeskCommonUISDK: 5808802951ad2bb424f0bed4259dc3c0ce9b52ec
@@ -849,6 +849,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: ebdcdd2b30dd680be23e92f8167141254e055594
+PODFILE CHECKSUM: 2198bf3dcf133317995199bc08b6af69a74ee863
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -8,6 +8,7 @@
 * [*] Self-hosted login: Improved error messages. [#17724]
 * [*] Share Sheet from Photos: Fix an issue where certain filenames would not upload or render in Post [#16773]
 * [*] Block editor: Fixed an issue where video thumbnails could show when selecting images, and vice versa. [#17670]
+* [**] Media: If a user has only enabled limited device media access, we now show a prompt to allow the user to change their selection. [#17795]
 * [**] Block editor: Fix content justification attribute in Buttons block [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4451]
 * [*] Block editor: Hide help button from Unsupported Block Editor. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4352]
 * [*] Block editor: Add contrast checker to text-based blocks [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4357]

WordPress/Classes/ViewRelated/Media/DeviceMediaPermissionsHeader.swift

@@ -12,6 +12,7 @@ class DeviceMediaPermissionsHeader: UICollectionReusableView {
     private let label: UILabel = {
         let label = UILabel()
         label.translatesAutoresizingMaskIntoConstraints = false
+        label.adjustsFontForContentSizeCategory = true
         label.setContentHuggingPriority(.defaultLow, for: .vertical)
         label.setContentCompressionResistancePriority(.defaultHigh, for: .vertical)
         label.text = TextContent.message
@@ -48,6 +49,14 @@ class DeviceMediaPermissionsHeader: UICollectionReusableView {
         return infoIcon
     }()
 
+    private let buttonStackView: UIStackView = {
+        let buttonStackView = UIStackView()
+        buttonStackView.translatesAutoresizingMaskIntoConstraints = false
+        buttonStackView.distribution = .fillEqually
+        buttonStackView.spacing = Metrics.spacing
+        return buttonStackView
+    }()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
 
@@ -80,12 +89,6 @@ class DeviceMediaPermissionsHeader: UICollectionReusableView {
         labelButtonsStackView.distribution = .fillProportionally
         labelButtonsStackView.spacing = Metrics.spacing
 
-        let buttonStackView = UIStackView()
-        buttonStackView.translatesAutoresizingMaskIntoConstraints = false
-        buttonStackView.axis = .horizontal
-        buttonStackView.distribution = .fillEqually
-        buttonStackView.spacing = Metrics.spacing
-
         outerStackView.addArrangedSubviews([infoIcon, labelButtonsStackView])
         labelButtonsStackView.addArrangedSubviews([label, buttonStackView])
         buttonStackView.addArrangedSubviews([selectButton, settingsButton])
@@ -104,16 +107,36 @@ class DeviceMediaPermissionsHeader: UICollectionReusableView {
             infoIcon.widthAnchor.constraint(equalTo: infoIcon.heightAnchor),
             infoIcon.widthAnchor.constraint(equalToConstant: Metrics.iconSize)
         ])
+
+        configureViewsForContentSizeCategoryChange()
     }
 
     private func configureButton(_ button: UIButton) {
         button.translatesAutoresizingMaskIntoConstraints = false
         button.titleLabel?.font = .preferredFont(forTextStyle: .subheadline).bold()
         button.titleLabel?.lineBreakMode = .byTruncatingTail
+        button.titleLabel?.adjustsFontForContentSizeCategory = true
         button.contentHorizontalAlignment = .leading
         button.setTitleColor(.invertedLink, for: .normal)
     }
 
+    private func configureViewsForContentSizeCategoryChange() {
+        let isAccessibilityCategory = traitCollection.preferredContentSizeCategory.isAccessibilityCategory
+
+        buttonStackView.axis = isAccessibilityCategory ? .vertical : .horizontal
+        buttonStackView.spacing = isAccessibilityCategory ? Metrics.spacing / 2.0 : Metrics.spacing
+
+        infoIcon.isHidden = isAccessibilityCategory
+    }
+
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        configureViewsForContentSizeCategoryChange()
+    }
+
+    // MARK: - Actions
+
     @objc private func selectMoreTapped() {
         if let presenter = presenter {
             PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: presenter)

WordPress/Info.plist

@@ -503,6 +503,8 @@
 		<string>org.wordpress.notifications</string>
 		<string>org.wordpress.reader</string>
 	</array>
+	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
+	<true/>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Noticons.ttf</string>

WordPress/Jetpack/Info.plist

@@ -103,6 +103,8 @@
 		<string>org.wordpress.notifications</string>
 		<string>org.wordpress.reader</string>
 	</array>
+	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
+	<true/>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Noticons.ttf</string>