From c3b909ae6e88363f6f988724f0bc7523972aaed7 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Wed, 21 Aug 2024 16:55:09 +1000
Subject: [PATCH] fix an UI issue of navigation bar

---
 Session/Conversations/ConversationVC.swift  |  1 -
 SessionUIKit/Style Guide/ThemeManager.swift | 90 ++++++++++++++-------
 2 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 99e679d4b..cc5ce26a5 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -142,7 +142,6 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
         result.separatorStyle = .none
         result.themeBackgroundColor = .clear
         result.showsVerticalScrollIndicator = false
-        result.contentInsetAdjustmentBehavior = .never
         result.keyboardDismissMode = .interactive
         result.contentInset = UIEdgeInsets(
             top: 0,
diff --git a/SessionUIKit/Style Guide/ThemeManager.swift b/SessionUIKit/Style Guide/ThemeManager.swift
index f3897753a..766d533ef 100644
--- a/SessionUIKit/Style Guide/ThemeManager.swift	
+++ b/SessionUIKit/Style Guide/ThemeManager.swift	
@@ -150,35 +150,55 @@ public enum ThemeManager {
         ThemeManager.mainWindow?.tintColor = textPrimary
         ThemeManager.mainWindow?.rootViewController?.setNeedsStatusBarAppearanceUpdate()
         
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = ThemeManager.currentTheme.color(for: .backgroundPrimary)
-        appearance.shadowImage = ThemeManager.currentTheme.color(for: .backgroundPrimary)?.toImage()
-        appearance.titleTextAttributes = [
+        // Update the nav bars to use the right colours (we default to the 'primary' value)
+        UINavigationBar.appearance().barTintColor = ThemeManager.currentTheme.color(for: .backgroundPrimary)
+        UINavigationBar.appearance().isTranslucent = false
+        UINavigationBar.appearance().tintColor = textPrimary
+        UINavigationBar.appearance().shadowImage = ThemeManager.currentTheme.color(for: .backgroundPrimary)?.toImage()
+        UINavigationBar.appearance().titleTextAttributes = [
             NSAttributedString.Key.foregroundColor: textPrimary
         ]
-        appearance.largeTitleTextAttributes = [
+        UINavigationBar.appearance().largeTitleTextAttributes = [
             NSAttributedString.Key.foregroundColor: textPrimary
         ]
         
-        // Apply the button item appearance as well
-        let barButtonItemAppearance = UIBarButtonItemAppearance(style: .plain)
-        barButtonItemAppearance.normal.titleTextAttributes = [ .foregroundColor: textPrimary ]
-        barButtonItemAppearance.disabled.titleTextAttributes = [ .foregroundColor: textPrimary ]
-        barButtonItemAppearance.highlighted.titleTextAttributes = [ .foregroundColor: textPrimary ]
-        barButtonItemAppearance.focused.titleTextAttributes = [ .foregroundColor: textPrimary ]
-        appearance.buttonAppearance = barButtonItemAppearance
-        appearance.backButtonAppearance = barButtonItemAppearance
-        appearance.doneButtonAppearance = barButtonItemAppearance
-        
-        UINavigationBar.appearance().standardAppearance = appearance
-        UINavigationBar.appearance().scrollEdgeAppearance = appearance
+        // Update the bar button item appearance
+        UIBarButtonItem.appearance().tintColor = textPrimary
 
         // Update toolbars to use the right colours
         UIToolbar.appearance().barTintColor = ThemeManager.currentTheme.color(for: .backgroundPrimary)
         UIToolbar.appearance().isTranslucent = false
         UIToolbar.appearance().tintColor = textPrimary
         
+        // Note: Looks like there were changes to the appearance behaviour in iOS 15, unfortunately
+        // this breaks parts of the old 'UINavigationBar.appearance()' logic so we need to do everything
+        // again using the new API...
+        if #available(iOS 15.0, *) {
+            let appearance = UINavigationBarAppearance()
+            appearance.configureWithOpaqueBackground()
+            appearance.backgroundColor = ThemeManager.currentTheme.color(for: .backgroundPrimary)
+            appearance.shadowImage = ThemeManager.currentTheme.color(for: .backgroundPrimary)?.toImage()
+            appearance.titleTextAttributes = [
+                NSAttributedString.Key.foregroundColor: textPrimary
+            ]
+            appearance.largeTitleTextAttributes = [
+                NSAttributedString.Key.foregroundColor: textPrimary
+            ]
+            
+            // Apply the button item appearance as well
+            let barButtonItemAppearance = UIBarButtonItemAppearance(style: .plain)
+            barButtonItemAppearance.normal.titleTextAttributes = [ .foregroundColor: textPrimary ]
+            barButtonItemAppearance.disabled.titleTextAttributes = [ .foregroundColor: textPrimary ]
+            barButtonItemAppearance.highlighted.titleTextAttributes = [ .foregroundColor: textPrimary ]
+            barButtonItemAppearance.focused.titleTextAttributes = [ .foregroundColor: textPrimary ]
+            appearance.buttonAppearance = barButtonItemAppearance
+            appearance.backButtonAppearance = barButtonItemAppearance
+            appearance.doneButtonAppearance = barButtonItemAppearance
+            
+            UINavigationBar.appearance().standardAppearance = appearance
+            UINavigationBar.appearance().scrollEdgeAppearance = appearance
+        }
+        
         // Note: 'UINavigationBar.appearance' only affects newly created nav bars so we need
         // to force-update any current navigation bar (unfortunately the only way to do this
         // is to remove the nav controller from the view hierarchy and then re-add it)
@@ -231,20 +251,28 @@ public enum ThemeManager {
             let navigationBackground: ThemeValue = (navController.viewControllers.first as? ThemedNavigation)?.navigationBackground
         else { return }
         
-        let textPrimary: UIColor = (ThemeManager.currentTheme.color(for: .textPrimary) ?? .white)
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = ThemeManager.currentTheme.color(for: navigationBackground)
-        appearance.shadowImage = ThemeManager.currentTheme.color(for: navigationBackground)?.toImage()
-        appearance.titleTextAttributes = [
-            NSAttributedString.Key.foregroundColor: textPrimary
-        ]
-        appearance.largeTitleTextAttributes = [
-            NSAttributedString.Key.foregroundColor: textPrimary
-        ]
+        navController.navigationBar.barTintColor = ThemeManager.currentTheme.color(for: navigationBackground)
+        navController.navigationBar.shadowImage = ThemeManager.currentTheme.color(for: navigationBackground)?.toImage()
         
-        navController.navigationBar.standardAppearance = appearance
-        navController.navigationBar.scrollEdgeAppearance = appearance
+        // Note: Looks like there were changes to the appearance behaviour in iOS 15, unfortunately
+        // this breaks parts of the old 'UINavigationBar.appearance()' logic so we need to do everything
+        // again using the new API...
+        if #available(iOS 15.0, *) {
+            let textPrimary: UIColor = (ThemeManager.currentTheme.color(for: .textPrimary) ?? .white)
+            let appearance = UINavigationBarAppearance()
+            appearance.configureWithOpaqueBackground()
+            appearance.backgroundColor = ThemeManager.currentTheme.color(for: navigationBackground)
+            appearance.shadowImage = ThemeManager.currentTheme.color(for: navigationBackground)?.toImage()
+            appearance.titleTextAttributes = [
+                NSAttributedString.Key.foregroundColor: textPrimary
+            ]
+            appearance.largeTitleTextAttributes = [
+                NSAttributedString.Key.foregroundColor: textPrimary
+            ]
+            
+            navController.navigationBar.standardAppearance = appearance
+            navController.navigationBar.scrollEdgeAppearance = appearance
+        }
     }
     
     private static func retrieveNavigationController(from viewController: UIViewController) -> UINavigationController? {