Skip to content

fix: iOS not respecting uiMode theme setting #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ecugol wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: iOS not respecting uiMode theme setting #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion ios/ottu_flutter_checkout/Sources/ottu_flutter_checkout/CheckoutPlatformView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class CheckoutPlatformView: NSObject, FlutterPlatformView {
private let _view: CheckoutContainerView
private weak var paymentViewController: UIViewController?
private var checkout: Checkout?
private var uiMode: String?

private func deinitCheckout() {
guard let pvc = paymentViewController,
Expand Down Expand Up @@ -126,6 +127,10 @@ public class CheckoutPlatformView: NSObject, FlutterPlatformView {
@MainActor
func createNativeView(arguments: CheckoutArguments) {
debugPrint("createNativeView")

// Store uiMode from theme for applying to view controller
self.uiMode = arguments.theme?.uiMode

let theme = getCheckoutTheme(
arguments.theme, showPaymentDetails: arguments.showPaymentDetails)
let formsOfPayment =
Expand Down Expand Up @@ -183,8 +188,11 @@ public class CheckoutPlatformView: NSObject, FlutterPlatformView {

func tryAttachController() {
guard let pvc = self.paymentViewController else { return }

if let parentVC = UIApplication.shared.delegate?.window??.rootViewController as? FlutterViewController {
// Apply uiMode to override system appearance if specified
applyUserInterfaceStyle(to: pvc)

parentVC.addChild(pvc)
_view.addCheckoutView(pvc.view)
pvc.didMove(toParent: parentVC)
Expand All @@ -196,6 +204,23 @@ public class CheckoutPlatformView: NSObject, FlutterPlatformView {
}
}
}

private func applyUserInterfaceStyle(to viewController: UIViewController) {
guard let mode = uiMode?.lowercased() else { return }

let style: UIUserInterfaceStyle
switch mode {
case "light":
style = .light
case "dark":
style = .dark
default:
return // Don't override if not specified or "auto"
}

viewController.overrideUserInterfaceStyle = style
viewController.view.overrideUserInterfaceStyle = style
}

private func getApiTransactionDetails(_ transactionDetails: String) throws
-> TransactionDetailsResponse?
Expand Down