Fix presentation on iOS 12

brave · Feb 24, 2021 · dc636a4 · dc636a4
1 parent c33750a
commit dc636a4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/Client/Extensions/AppearanceExtensions.swift b/Client/Extensions/AppearanceExtensions.swift
@@ -18,6 +18,7 @@ extension Theme {
         UIToolbar.appearance().barTintColor = colors.footer
 
         UINavigationBar.appearance().tintColor = colors.accent
+        UINavigationBar.appearance().largeTitleTextAttributes = [.foregroundColor: colors.tints.home]
         UINavigationBar.appearance().appearanceBarTintColor = colors.header
 
         UISwitch.appearance().appearanceOnTintColor = colors.accent

diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -1822,6 +1822,12 @@ class BrowserViewController: UIViewController {
                             sourcesAdded: nil
                         )
                         let container = UINavigationController(rootViewController: controller)
+                        let idiom = UIDevice.current.userInterfaceIdiom
+                        if #available(iOS 13.0, *) {
+                            container.modalPresentationStyle = idiom == .phone ? .pageSheet : .formSheet
+                        } else {
+                            container.modalPresentationStyle = idiom == .phone ? .fullScreen : .formSheet
+                        }
                         self.present(container, animated: true)
                     }
                     activities.append(addToBraveToday)
@@ -1873,6 +1879,12 @@ class BrowserViewController: UIViewController {
                             sourcesAdded: nil
                         )
                         let container = UINavigationController(rootViewController: controller)
+                        let idiom = UIDevice.current.userInterfaceIdiom
+                        if #available(iOS 13.0, *) {
+                            container.modalPresentationStyle = idiom == .phone ? .pageSheet : .formSheet
+                        } else {
+                            container.modalPresentationStyle = idiom == .phone ? .fullScreen : .formSheet
+                        }
                         self.present(container, animated: true)
                     }
                     activities.append(addToBraveToday)

diff --git a/Client/Frontend/Settings/Brave Today/BraveTodaySettingsViewController.swift b/Client/Frontend/Settings/Brave Today/BraveTodaySettingsViewController.swift
@@ -75,6 +75,12 @@ class BraveTodaySettingsViewController: TableViewController {
                             self?.reloadSections()
                         }
                         let container = UINavigationController(rootViewController: controller)
+                        let idiom = UIDevice.current.userInterfaceIdiom
+                        if #available(iOS 13.0, *) {
+                            container.modalPresentationStyle = idiom == .phone ? .pageSheet : .formSheet
+                        } else {
+                            container.modalPresentationStyle = idiom == .phone ? .fullScreen : .formSheet
+                        }
                         self.present(container, animated: true)
                     }, image: nil, accessory: .disclosureIndicator)
                 ]