Synchronise presentations for settings and account modals

mullvad · Oct 9, 2023 · c132dc6 · c132dc6
1 parent 48d6a75
commit c132dc6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/ios/MullvadVPN/Coordinators/AccountCoordinator.swift b/ios/MullvadVPN/Coordinators/AccountCoordinator.swift
@@ -90,11 +90,7 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting {
             animated: true,
             configuration: ModalPresentationConfiguration(
                 preferredContentSize: UIMetrics.SettingsRedeemVoucher.preferredContentSize,
-                modalPresentationStyle: .custom,
-                transitioningDelegate: FormSheetTransitioningDelegate(options: FormSheetPresentationOptions(
-                    useFullScreenPresentationInCompactWidth: false,
-                    adjustViewWhenKeyboardAppears: true
-                ))
+                modalPresentationStyle: .formSheet
             )
         )
     }
@@ -121,11 +117,7 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting {
             animated: true,
             configuration: ModalPresentationConfiguration(
                 preferredContentSize: UIMetrics.AccountDeletion.preferredContentSize,
-                modalPresentationStyle: .custom,
-                transitioningDelegate: FormSheetTransitioningDelegate(options: FormSheetPresentationOptions(
-                    useFullScreenPresentationInCompactWidth: true,
-                    adjustViewWhenKeyboardAppears: false
-                ))
+                modalPresentationStyle: .formSheet
             )
         )
     }

diff --git a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift
@@ -728,11 +728,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
             animated: animated,
             configuration: ModalPresentationConfiguration(
                 preferredContentSize: UIMetrics.preferredFormSheetContentSize,
-                modalPresentationStyle: .custom,
-                transitioningDelegate: FormSheetTransitioningDelegate(options: FormSheetPresentationOptions(
-                    useFullScreenPresentationInCompactWidth: true,
-                    adjustViewWhenKeyboardAppears: false
-                ))
+                modalPresentationStyle: .formSheet
             )
         ) { [weak self] in
             completion(coordinator)

diff --git a/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift b/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift
@@ -352,7 +352,6 @@ final class RedeemVoucherContentView: UIView {
     }
 
     private func addKeyboardResponderIfNeeded() {
-        guard configuration.adjustViewWhenKeyboardAppears else { return }
         keyboardResponder = AutomaticKeyboardResponder(
             targetView: self,
             handler: { [weak self] _, offset in