diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift index 8ec84240d6..ae19db7e7a 100644 --- a/Riot/Managers/Theme/Themes/DarkTheme.swift +++ b/Riot/Managers/Theme/Themes/DarkTheme.swift @@ -117,13 +117,12 @@ class DarkTheme: NSObject, Theme { applyStyle(onNavigationBar: navigationBar, withModernScrollEdgesAppearance: false) } - // Note: We are not using UINavigationBarAppearance on iOS 13/14 because of UINavigationBar directly including UISearchBar on their titleView that cause crop issues with UINavigationController pop. func applyStyle(onNavigationBar navigationBar: UINavigationBar, withModernScrollEdgesAppearance modernScrollEdgesAppearance: Bool) { navigationBar.tintColor = tintColor // On iOS 15 use UINavigationBarAppearance to fix visual issues with the scrollEdgeAppearance style. - if #available(iOS 15.0, *) { + if #available(iOS 13.0, *) { let appearance = UINavigationBarAppearance() appearance.configureWithOpaqueBackground() diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift index f8f69f7a6d..a7832ba077 100644 --- a/Riot/Managers/Theme/Themes/DefaultTheme.swift +++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift @@ -123,13 +123,12 @@ class DefaultTheme: NSObject, Theme { applyStyle(onNavigationBar: navigationBar, withModernScrollEdgesAppearance: false) } - // Note: We are not using UINavigationBarAppearance on iOS 13/14 because of UINavigationBar directly including UISearchBar on their titleView that cause crop issues with UINavigationController pop. func applyStyle(onNavigationBar navigationBar: UINavigationBar, withModernScrollEdgesAppearance modernScrollEdgesAppearance: Bool) { navigationBar.tintColor = tintColor // On iOS 15 use UINavigationBarAppearance to fix visual issues with the scrollEdgeAppearance style. - if #available(iOS 15.0, *) { + if #available(iOS 13.0, *) { let appearance = UINavigationBarAppearance() appearance.configureWithOpaqueBackground() diff --git a/changelog.d/pr-5715.bugfix b/changelog.d/pr-5715.bugfix new file mode 100644 index 0000000000..690cd975e3 --- /dev/null +++ b/changelog.d/pr-5715.bugfix @@ -0,0 +1 @@ +Started applying navigation bar theme styles to iOS 13 and 14 too. \ No newline at end of file