fix: Image selector anchor - WPB-11605

wire-ios/Wire-iOS/Sources/Managers/Image/ImagePickerManager.swift

@@ -33,22 +33,22 @@ extension UIImage {
 class ImagePickerManager: NSObject {
 
     // MARK: - Properties
-    private weak var viewController: UIViewController?
-    private var sourceType: UIImagePickerController.SourceType?
     private var completion: ((UIImage) -> Void)?
     private let mediaShareRestrictionManager = MediaShareRestrictionManager(sessionRestriction: ZMUserSession.shared())
 
     // MARK: - Methods
-    func showActionSheet(on viewController: UIViewController? = UIApplication.shared.topmostViewController(onlyFullScreen: false),
-                         completion: @escaping (UIImage) -> Void) -> UIAlertController {
+    func showActionSheet(
+        on viewController: UIViewController? = UIApplication.shared.topmostViewController(onlyFullScreen: false),
+        popoverSourceView: UIView,
+        completion: @escaping (UIImage) -> Void
+    ) -> UIAlertController {
         self.completion = completion
-        self.viewController = viewController
 
-        let actionSheet = imagePickerAlert()
+        let actionSheet = imagePickerAlert(popoverSourceView: popoverSourceView, viewController: viewController)
         return actionSheet
     }
 
-    private func imagePickerAlert() -> UIAlertController {
+    private func imagePickerAlert(popoverSourceView: UIView, viewController: UIViewController?) -> UIAlertController {
         typealias Alert = L10n.Localizable.Self.Settings.AccountPictureGroup.Alert
         let actionSheet = UIAlertController(title: Alert.title,
                                             message: nil,
@@ -57,16 +57,26 @@ class ImagePickerManager: NSObject {
         // Choose from gallery option, if security flag enabled
         if mediaShareRestrictionManager.isPhotoLibraryEnabled {
             let galleryAction = UIAlertAction(title: Alert.choosePicture, style: .default) { [weak self] _ in
-                self?.sourceType = .photoLibrary
-                self?.getImage(fromSourceType: .photoLibrary)
+                guard let self, let viewController else { return }
+
+                self.getImage(
+                    fromSourceType: .photoLibrary,
+                    viewController: viewController,
+                    popoverSourceView: popoverSourceView
+                )
             }
             actionSheet.addAction(galleryAction)
         }
 
         // Take photo
         let cameraAction = UIAlertAction(title: Alert.takePicture, style: .default) { [weak self] _ in
-            self?.sourceType = .camera
-            self?.getImage(fromSourceType: .camera)
+            guard let self, let viewController else { return }
+
+            self.getImage(
+                fromSourceType: .camera,
+                viewController: viewController,
+                popoverSourceView: popoverSourceView
+            )
         }
         actionSheet.addAction(cameraAction)
 
@@ -76,11 +86,12 @@ class ImagePickerManager: NSObject {
         return actionSheet
     }
 
-    private func getImage(fromSourceType sourceType: UIImagePickerController.SourceType) {
-        guard UIImagePickerController.isSourceTypeAvailable(sourceType),
-              let viewController else {
-                  return
-              }
+    private func getImage(
+        fromSourceType sourceType: UIImagePickerController.SourceType,
+        viewController: UIViewController,
+        popoverSourceView: UIView
+    ) {
+        guard UIImagePickerController.isSourceTypeAvailable(sourceType) else { return }
 
         let imagePickerController = UIImagePickerController()
         imagePickerController.delegate = self
@@ -96,23 +107,13 @@ class ImagePickerManager: NSObject {
             imagePickerController.cameraDevice = .front
             imagePickerController.modalTransitionStyle = .coverVertical
         case .photoLibrary, .savedPhotosAlbum:
-            if viewController.isIPadRegular() {
+            if viewController.isIPad() {
+                // UIKit will crash if the photo library is not presented using a popoverPresentationController on iPad
+                // https://developer.apple.com/documentation/uikit/uiimagepickercontroller
                 imagePickerController.modalPresentationStyle = .popover
-
                 if let popoverPresentationController = imagePickerController.popoverPresentationController {
                     popoverPresentationController.backgroundColor = UIColor.white
-
-                    // UIKit will crash if the photo library is not presented using a popoverPresentationController
-                    // https://developer.apple.com/documentation/uikit/uiimagepickercontroller
-                    // TODO: [WPB-11605] fix this workaround and choose proper sourceView/sourceRect
-                    popoverPresentationController.sourceView = viewController.view
-                    popoverPresentationController.sourceRect = .init(
-                        origin: .init(
-                            x: viewController.view.safeAreaLayoutGuide.layoutFrame.maxX,
-                            y: viewController.view.safeAreaLayoutGuide.layoutFrame.minY
-                        ),
-                        size: .zero
-                    )
+                    popoverPresentationController.sourceView = popoverSourceView
                 }
             }
         default:

wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift

@@ -21,14 +21,13 @@ import WireSyncEngine
 
 final class ProfileImagePickerManager: ImagePickerManager {
 
-    func selectProfileImage() -> UIAlertController {
-        let actionSheet = showActionSheet { image in
-            guard let jpegData = image.jpegData else {
-                return
+    func selectProfileImage(popoverSourceView: UIView) -> UIAlertController {
+        let actionSheet = showActionSheet(popoverSourceView: popoverSourceView) { image in
+            guard let jpegData = image.jpegData, let session = ZMUserSession.shared() else { return }
+
+            session.enqueue {
+                session.userProfileImage.updateImage(imageData: jpegData)
             }
-            ZMUserSession.shared()?.enqueue({
-                ZMUserSession.shared()?.userProfileImage.updateImage(imageData: jpegData)
-            })
         }
         return actionSheet
     }

wire-ios/Wire-iOS/Sources/UserInterface/Helpers/UITraitEnvironment+SizeClass.swift

@@ -29,6 +29,10 @@ extension UITraitEnvironment {
         return device.userInterfaceIdiom == .pad && isHorizontalSizeClassRegular
     }
 
+    func isIPad(device: DeviceAbstraction = DeviceWrapper(device: .current)) -> Bool {
+        return device.userInterfaceIdiom == .pad
+    }
+
     func isIPadRegularPortrait(
         device: DeviceAbstraction = DeviceWrapper(device: .current)
     ) -> Bool {

wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewController.swift

@@ -206,10 +206,10 @@ final class SelfProfileViewController: UIViewController {
     @objc private func userDidTapProfileImage(_ sender: UIGestureRecognizer) {
         guard userRightInterfaceType.selfUserIsPermitted(to: .editProfilePicture) else { return }
 
-        let alertController = profileImagePicker.selectProfileImage()
+        let imageView = profileHeaderViewController.imageView
+        let alertController = profileImagePicker.selectProfileImage(popoverSourceView: imageView)
         if let popoverPresentationController = alertController.popoverPresentationController {
-            popoverPresentationController.sourceView = profileHeaderViewController.imageView.superview!
-            popoverPresentationController.sourceRect = profileHeaderViewController.imageView.frame.insetBy(dx: -4, dy: -4)
+            popoverPresentationController.sourceView = imageView
         }
         present(alertController, animated: true)
     }

wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsAppearanceCellDescriptor.swift

@@ -21,14 +21,14 @@ import UIKit
 import WireSettingsUI
 import WireSyncEngine
 
-class SettingsAppearanceCellDescriptor: SettingsCellDescriptorType, SettingsExternalScreenCellDescriptorType {
+class SettingsAppearanceCellDescriptor: SettingsGroupCellDescriptorType, SettingsCellDescriptorType {
     static let cellType: SettingsTableCellProtocol.Type = SettingsAppearanceCell.self
 
     private var text: String
     private let presentationStyle: PresentationStyle
 
     weak var viewController: UIViewController?
-    let presentationAction: () -> (UIViewController?)
+    let presentationAction: (_ sender: UIView) -> UIViewController?
 
     var identifier: String?
     weak var group: SettingsGroupCellDescriptorType?
@@ -48,7 +48,7 @@ class SettingsAppearanceCellDescriptor: SettingsCellDescriptorType, SettingsExte
         text: String,
         previewGenerator: PreviewGeneratorType? = .none,
         presentationStyle: PresentationStyle,
-        presentationAction: @escaping () -> (UIViewController?),
+        presentationAction: @escaping (_ sender: UIView) -> UIViewController?,
         settingsCoordinator: AnySettingsCoordinator
     ) {
         self.text = text
@@ -81,7 +81,7 @@ class SettingsAppearanceCellDescriptor: SettingsCellDescriptorType, SettingsExte
     // MARK: - SettingsCellDescriptorType
 
     func select(_ value: SettingsPropertyValue, sender: UIView) {
-        guard let controllerToShow = generateViewController() else { return }
+        guard let controllerToShow = generateViewController(sender: sender)  else { return }
 
         switch presentationStyle {
         case .alert:
@@ -97,7 +97,7 @@ class SettingsAppearanceCellDescriptor: SettingsCellDescriptorType, SettingsExte
         }
     }
 
-    func generateViewController() -> UIViewController? {
-        presentationAction()
+    private func generateViewController(sender: UIView) -> UIViewController? {
+        presentationAction(sender)
     }
 }

wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptor.swift

@@ -115,10 +115,6 @@ extension SettingsInternalGroupCellDescriptorType {
     }
 }
 
-protocol SettingsExternalScreenCellDescriptorType: SettingsGroupCellDescriptorType {
-    var presentationAction: () -> (UIViewController?) {get}
-}
-
 protocol SettingsPropertyCellDescriptorType: SettingsCellDescriptorType {
     var settingsProperty: SettingsProperty { get }
 }

wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift

@@ -300,8 +300,8 @@ extension SettingsCellDescriptorFactory {
             return .image(image)
         }
 
-        let presentationAction: () -> (UIViewController?) = {
-            let actionSheet = profileImagePicker.selectProfileImage()
+        let presentationAction: (_ sender: UIView) -> UIViewController? = { sender in
+            let actionSheet = profileImagePicker.selectProfileImage(popoverSourceView: sender)
             return actionSheet
         }
         return SettingsAppearanceCellDescriptor(
@@ -331,7 +331,7 @@ extension SettingsCellDescriptorFactory {
         return SettingsCellPreview.color((selfUser.accentColor ?? .default).uiColor)
     }
 
-    private func colorElementPresentationAction() -> UIViewController {
+    private func colorElementPresentationAction(sender: UIView) -> UIViewController {
         guard
             let selfUser = ZMUser.selfUser(),
             let userSession = ZMUserSession.shared()

wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsExternalScreenCellDescriptor.swift

@@ -33,7 +33,7 @@ enum AccessoryViewMode: Int {
     case alwaysHide
 }
 
-class SettingsExternalScreenCellDescriptor: SettingsExternalScreenCellDescriptorType, SettingsControllerGeneratorType {
+class SettingsExternalScreenCellDescriptor: SettingsGroupCellDescriptorType, SettingsControllerGeneratorType {
     static let cellType: SettingsTableCellProtocol.Type = SettingsTableCell.self
     var visible: Bool = true
     let title: String