Merge branch 'fix/CLIENT-6233-composer-ipad-ios18' into 'develop'

CLIENT-6233 Fix composer on iPads running iOS 18

See merge request ProtonMail/protonmail-ios!4414

Author: jacekkra

ProtonMail/ProtonMail/Resource/APP_share/content_light.css

@@ -53,6 +53,12 @@ table a, table p {
     word-break: break-word;
 }
 
+@supports (height: fit-content) {
+    html {
+        height: fit-content;
+    }
+}
+
 blockquote {
     padding: 0 0 0 0.6rem !important;
     margin: 0 !important;

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements.latest_result.txt

@@ -106,7 +106,7 @@ name: lottie-ios, nameSpecified: Lottie, owner: airbnb, version: 4.3.3, source:
 
 name: OHHTTPStubs, nameSpecified: OHHTTPStubs, owner: AliSoftware, version: 9.1.0, source: https://github.com/AliSoftware/OHHTTPStubs
 
-name: protoncore_ios, nameSpecified: ProtonCore, owner: ProtonMail, version: 31.1.5, source: https://github.com/ProtonMail/protoncore_ios
+name: protoncore_ios, nameSpecified: ProtonCore, owner: ProtonMail, version: 31.1.6, source: https://github.com/ProtonMail/protoncore_ios
 
 name: Reachability.swift, nameSpecified: Reachability, owner: ashleymills, version: 5.2.4, source: https://github.com/ashleymills/Reachability.swift
 

ProtonMail/ProtonMail/ViewControllers/APP_share/Compose/ComposerContainer/ComposeContainerViewController.swift

@@ -954,11 +954,35 @@ extension ComposeContainerViewController: NSNotificationCenterKeyboardObserverPr
 
     func keyboardWillShowNotification(_ notification: Notification) {
         if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
-            self.bottomPadding?.constant = keyboardFrame.cgRectValue.height + Constant.toolBarHeight
-            self.toolbarBottom?.constant = -1 * keyboardFrame.cgRectValue.height
-            UIView.animate(withDuration: 0.25) {
-                self.view.layoutIfNeeded()
+            if UIDevice.current.isIpad {
+                keyboardWillShowOnIpad(keyboardFrame: keyboardFrame.cgRectValue)
+            } else {
+                adjustViewForKeyboard(extraBottomPadding: keyboardFrame.cgRectValue.height)
+            }
+        }
+    }
+
+    private func keyboardWillShowOnIpad(keyboardFrame: CGRect) {
+        // this delay is needed, because the appearance of the keyboard might cause the view to move up a little
+        // we need to wait with `convert` until that happens
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            let keyboardFrameInView = self.view.convert(keyboardFrame, from: nil)
+            let extraBottomPadding = self.view.bounds.height - max(0, keyboardFrameInView.origin.y)
+
+            guard extraBottomPadding >= 0 else {
+                return
             }
+
+            self.adjustViewForKeyboard(extraBottomPadding: extraBottomPadding)
+        }
+    }
+
+    private func adjustViewForKeyboard(extraBottomPadding: CGFloat) {
+        bottomPadding?.constant = extraBottomPadding + Constant.toolBarHeight
+        toolbarBottom?.constant = -extraBottomPadding
+
+        UIView.animate(withDuration: 0.25) {
+            self.view.layoutIfNeeded()
         }
     }
 }

ProtonMail/ProtonMail/ViewControllers/APP_share/Compose/ComposerViewFactory.swift

@@ -104,6 +104,7 @@ final class ComposerViewFactory {
         controller.delegate = composerDelegate
         let navigationVC = UINavigationController(rootViewController: controller)
         router.setupNavigation(navigationVC)
+        navigationVC.modalPresentationStyle = .pageSheet
         return navigationVC
     }