[WCiOS17] Address warnings from WPMediaPicker deprecations

Modules/Sources/WPMediaPicker/WPImageExporter.m

@@ -2,6 +2,7 @@
 
 @import MobileCoreServices;
 @import ImageIO;
+@import UniformTypeIdentifiers;
 
 @implementation WPImageExporter
 
@@ -33,7 +34,7 @@ + (BOOL)writeImage:(UIImage *)image withMetadata:(NSDictionary *)metadata toURL:
         adjustedMetadata[(NSString *)kCGImagePropertyIPTCDictionary] = adjustedIPTC;
     }
 
-    CGImageDestinationRef destination = CGImageDestinationCreateWithURL((CFURLRef)fileURL, kUTTypeJPEG, 1, nil);
+    CGImageDestinationRef destination = CGImageDestinationCreateWithURL((CFURLRef)fileURL, (CFStringRef)UTTypeJPEG.identifier, 1, nil);
     if (destination == NULL) {
         return NO;
     }

Modules/Sources/WPMediaPicker/WPMediaCapturePresenter.m

@@ -3,6 +3,7 @@
 
 @import MobileCoreServices;
 @import AVFoundation;
+@import UniformTypeIdentifiers;
 
 @interface WPMediaCapturePresenter () <UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 @property (nonatomic, strong, nullable) UIViewController *presentingViewController;
@@ -79,11 +80,10 @@ - (void)presentCaptureViewController
                                                            UIImagePickerControllerSourceTypeCamera]];
     NSMutableSet *mediaDesired = [NSMutableSet new];
     if (self.mediaType & WPMediaTypeImage) {
-        [mediaDesired addObject:(__bridge NSString *)kUTTypeImage];
+        [mediaDesired addObject:UTTypeImage.identifier];
     }
     if (self.mediaType & WPMediaTypeVideo) {
-        [mediaDesired addObject:(__bridge NSString *)kUTTypeMovie];
-
+        [mediaDesired addObject:UTTypeMovie.identifier];
     }
     if (mediaDesired.count > 0){
         [mediaTypes intersectSet:mediaDesired];

Modules/Sources/WPMediaPicker/WPMediaCapturePreviewCollectionView.m

@@ -110,8 +110,8 @@ - (void)startCapture
                         CALayer *viewLayer = self.previewView.layer;
                         self.captureVideoPreviewLayer.frame = viewLayer.bounds;
                         self.captureVideoPreviewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
-                        UIWindowScene *currentScene = [[[[UIApplication sharedApplication] windows] lastObject] windowScene];
-                        self.captureVideoPreviewLayer.connection.videoOrientation = [self videoOrientationForInterfaceOrientation:[currentScene interfaceOrientation]];
+                        UIWindowScene *currentScene = [self activeWindowScene];
+                        self.captureVideoPreviewLayer.connection.videoRotationAngle = [self videoRotationAngleForInterfaceOrientation:[currentScene interfaceOrientation]];
                         [viewLayer addSublayer:self.captureVideoPreviewLayer];
                 });
             }
@@ -121,24 +121,39 @@ - (void)startCapture
 
 - (void)deviceOrientationDidChange:(NSNotification *)notification
 {
-    if (self.captureVideoPreviewLayer.connection.supportsVideoOrientation) {
-        UIWindowScene *currentScene = [[[[UIApplication sharedApplication] windows] lastObject] windowScene];
-        self.captureVideoPreviewLayer.connection.videoOrientation = [self videoOrientationForInterfaceOrientation:[currentScene interfaceOrientation]];
+    UIWindowScene *currentScene = [self activeWindowScene];
+    self.captureVideoPreviewLayer.connection.videoRotationAngle = [self videoRotationAngleForInterfaceOrientation:[currentScene interfaceOrientation]];
+}
+
+- (UIWindowScene *)activeWindowScene
+{
+    for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+        if ([scene isKindOfClass:[UIWindowScene class]] && scene.activationState == UISceneActivationStateForegroundActive) {
+            return (UIWindowScene *)scene;
+        }
+    }
+    // Fallback to first window scene if no active one found
+    for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+        if ([scene isKindOfClass:[UIWindowScene class]]) {
+            return (UIWindowScene *)scene;
+        }
     }
+    return nil;
 }
 
-- (AVCaptureVideoOrientation)videoOrientationForInterfaceOrientation:(UIInterfaceOrientation)orientation
+- (CGFloat)videoRotationAngleForInterfaceOrientation:(UIInterfaceOrientation)orientation
 {
     switch (orientation) {
         case UIInterfaceOrientationPortrait:
-            return AVCaptureVideoOrientationPortrait;
+            return 90.0;
         case UIInterfaceOrientationPortraitUpsideDown:
-            return AVCaptureVideoOrientationPortraitUpsideDown;
+            return 270.0;
         case UIInterfaceOrientationLandscapeLeft:
-            return AVCaptureVideoOrientationLandscapeLeft;
+            return 180.0;
         case UIInterfaceOrientationLandscapeRight:
-            return AVCaptureVideoOrientationLandscapeRight;
-        default:return AVCaptureVideoOrientationPortrait;
+            return 0.0;
+        default:
+            return 90.0;
     }
 }
 

Modules/Sources/WPMediaPicker/WPMediaPickerViewController.m

@@ -5,12 +5,12 @@
 #import "WPMediaGroupPickerViewController.h"
 #import "WPPHAssetDataSource.h"
 #import "WPMediaCapturePresenter.h"
-#import "WPInputMediaPickerViewController.h"
 #import "WPCarouselAssetsViewController.h"
 #import "UIViewController+MediaAdditions.h"
 
 @import MobileCoreServices;
 @import AVFoundation;
+@import UniformTypeIdentifiers;
 
 static CGFloat const IPhoneSELandscapeWidth = 568.0f;
 static CGFloat const IPhone7PortraitWidth = 375.0f;
@@ -114,7 +114,8 @@ - (void)viewDidLoad
     [self.view addGestureRecognizer:self.longPressGestureRecognizer];
 
     self.layout.sectionInsetReference = UICollectionViewFlowLayoutSectionInsetFromSafeArea;
-
+    [self registerForTraitObservation];
+
     [self refreshDataAnimated:NO];
 }
 
@@ -317,18 +318,6 @@ - (void)viewDidDisappear:(BOOL)animated
     [self unregisterForKeyboardNotifications];
 }
 
-- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
-{
-    [super traitCollectionDidChange:previousTraitCollection];
-
-    if ([self shouldShowCustomHeaderView]) {
-        // If there's a custom header, we'll invalidate it so that it can adapt itself to dynamic type changes.
-        UICollectionViewFlowLayoutInvalidationContext *context  = [UICollectionViewFlowLayoutInvalidationContext new];
-        [context invalidateSupplementaryElementsOfKind:UICollectionElementKindSectionHeader atIndexPaths:@[ [NSIndexPath indexPathForRow:0 inSection:0] ]];
-        [self.collectionView.collectionViewLayout invalidateLayout];
-    }
-}
-
 - (UIViewController *)viewControllerToUseToPresent
 {
     // viewControllerToUseToPresent defaults to self but could be set to nil. Reset to self if needed.
@@ -381,7 +370,6 @@ - (void)addCollectionViewToView
 - (void)setupSearchBar
 {
     BOOL shouldShowSearchBar = self.options.showSearchBar &&
-        ![self.parentViewController isKindOfClass:[WPInputMediaPickerViewController class]] && //Disable search bar on WPInputMediaPicker
         [self.dataSource respondsToSelector:@selector(searchFor:)];
 
     if (shouldShowSearchBar && self.searchBar == nil) {
@@ -999,7 +987,8 @@ - (void)configureBadgeViewForCell:(WPMediaCollectionViewCell *)cell withAsset:(i
     NSString *uttype = [asset UTTypeIdentifier];
 
     if ([self.options.badgedUTTypes containsObject:uttype]) {
-        NSString *tagName = (__bridge_transfer NSString *)(UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)uttype, kUTTagClassFilenameExtension));
+        UTType *type = [UTType typeWithIdentifier:uttype];
+        NSString *tagName = type.preferredFilenameExtension;
         cell.badgeView.label.text = [tagName uppercaseString];
         cell.badgeView.hidden = NO;
         return;
@@ -1274,12 +1263,12 @@ - (void)processMediaCaptured:(NSDictionary *)info
         }
         [self addMedia:media animated:YES];
     };
-    if ([info[UIImagePickerControllerMediaType] isEqual:(NSString *)kUTTypeImage]) {
+    if ([info[UIImagePickerControllerMediaType] isEqual:UTTypeImage.identifier]) {
         UIImage *image = (UIImage *)info[UIImagePickerControllerOriginalImage];
         [self.dataSource addImage:image
                          metadata:info[UIImagePickerControllerMediaMetadata]
                   completionBlock:completionBlock];
-    } else if ([info[UIImagePickerControllerMediaType] isEqual:(NSString *)kUTTypeMovie]) {
+    } else if ([info[UIImagePickerControllerMediaType] isEqual:UTTypeMovie.identifier]) {
         [self.dataSource addVideoFromURL:info[UIImagePickerControllerMediaURL] completionBlock:completionBlock];
     }
 }
@@ -1466,20 +1455,30 @@ - (BOOL)isPresentedAsPopover
     return NO;
 }
 
+- (void)registerForTraitObservation
+{
+    __weak typeof(self) weakSelf = self;
+    [self registerForTraitChanges:@[UITraitPreferredContentSizeCategory.class]
+                      withHandler:^(id<UITraitEnvironment> traitEnvironment, UITraitCollection *previousCollection) {
+        if ([weakSelf shouldShowCustomHeaderView]) {
+            // If there's a custom header, invalidate it so that it can adapt itself to dynamic type changes.
+            UICollectionViewFlowLayoutInvalidationContext *context = [UICollectionViewFlowLayoutInvalidationContext new];
+            [context invalidateSupplementaryElementsOfKind:UICollectionElementKindSectionHeader atIndexPaths:@[ [NSIndexPath indexPathForRow:0 inSection:0] ]];
+            [weakSelf.collectionView.collectionViewLayout invalidateLayout];
+        }
+    }];
+}
+
 - (void)registerForKeyboardNotifications
 {
-    if (![self.parentViewController isKindOfClass:[WPInputMediaPickerViewController class]]) {
-        [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(keyboardWillShowNotification:) name:UIKeyboardWillShowNotification object:nil];
-        [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(keyboardWillHideNotification:) name:UIKeyboardWillHideNotification object:nil];
-    }
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(keyboardWillShowNotification:) name:UIKeyboardWillShowNotification object:nil];
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(keyboardWillHideNotification:) name:UIKeyboardWillHideNotification object:nil];
 }
 
 - (void)unregisterForKeyboardNotifications
 {
-    if (![self.parentViewController isKindOfClass:[WPInputMediaPickerViewController class]]) {
-        [NSNotificationCenter.defaultCenter removeObserver:self name:UIKeyboardWillShowNotification object:nil];
-        [NSNotificationCenter.defaultCenter removeObserver:self name:UIKeyboardWillHideNotification object:nil];
-    }
+    [NSNotificationCenter.defaultCenter removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+    [NSNotificationCenter.defaultCenter removeObserver:self name:UIKeyboardWillHideNotification object:nil];
 }
 
 - (void)keyboardWillShowNotification:(NSNotification *)notification