diff --git a/Samples/MobileBuyIntegration/MobileBuyIntegration/Assets.xcassets/WebBrowserBarBackground.imageset/Contents.json b/Samples/MobileBuyIntegration/MobileBuyIntegration/Assets.xcassets/WebBrowserBarBackground.imageset/Contents.json deleted file mode 100644 index e404c599..00000000 --- a/Samples/MobileBuyIntegration/MobileBuyIntegration/Assets.xcassets/WebBrowserBarBackground.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "WebBrowserBarBackground.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Samples/MobileBuyIntegration/MobileBuyIntegration/Assets.xcassets/WebBrowserBarBackground.imageset/WebBrowserBarBackground.pdf b/Samples/MobileBuyIntegration/MobileBuyIntegration/Assets.xcassets/WebBrowserBarBackground.imageset/WebBrowserBarBackground.pdf deleted file mode 100644 index e4be6e47..00000000 Binary files a/Samples/MobileBuyIntegration/MobileBuyIntegration/Assets.xcassets/WebBrowserBarBackground.imageset/WebBrowserBarBackground.pdf and /dev/null differ diff --git a/Samples/MobileBuyIntegration/MobileBuyIntegration/SettingsViewController.swift b/Samples/MobileBuyIntegration/MobileBuyIntegration/SettingsViewController.swift index 0b7b28b1..87272a1e 100644 --- a/Samples/MobileBuyIntegration/MobileBuyIntegration/SettingsViewController.swift +++ b/Samples/MobileBuyIntegration/MobileBuyIntegration/SettingsViewController.swift @@ -243,8 +243,10 @@ extension Configuration.ColorScheme { var navigationBarAppearance: UINavigationBarAppearance { switch self { case .web: + UIBarButtonItem.appearance().tintColor = .white let navBarAppearance = UINavigationBarAppearance() - navBarAppearance.backgroundImage = UIImage(named: "WebBrowserBarBackground") + navBarAppearance.titleTextAttributes = [.foregroundColor: UIColor.white] + navBarAppearance.backgroundColor = UIColor(red: 0.19, green: 0.05, blue: 0.48, alpha: 1.00) return navBarAppearance default: let navBarAppearance = UINavigationBarAppearance() diff --git a/Sources/ShopifyCheckout/CheckoutViewController.swift b/Sources/ShopifyCheckout/CheckoutViewController.swift index f842013d..0f2b32ca 100644 --- a/Sources/ShopifyCheckout/CheckoutViewController.swift +++ b/Sources/ShopifyCheckout/CheckoutViewController.swift @@ -42,9 +42,19 @@ class CheckoutViewController: UIViewController, UIAdaptivePresentationController private let checkoutURL: URL - private lazy var closeBarButtonItem = UIBarButtonItem( - barButtonSystemItem: .close, target: self, action: #selector(close) - ) + private lazy var closeBarButtonItem: UIBarButtonItem = { + switch ShopifyCheckout.configuration.colorScheme { + case .web: + let closeIcon = UIImage(systemName: "xmark")? + .withConfiguration(UIImage.SymbolConfiguration(pointSize: 14, weight: .regular)) + .withTintColor(.white, renderingMode: .alwaysOriginal) + return UIBarButtonItem(image: closeIcon, style: .plain, target: self, action: #selector(close)) + default: + return UIBarButtonItem( + barButtonSystemItem: .close, target: self, action: #selector(close) + ) + } + }() // MARK: Initializers