Fix tinting navigation bar and other content differently (#953)

Author: laevandus

CHANGELOG.md

@@ -4,6 +4,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 # Upcoming
 
 ### ✅ Added
+- Add `toolbarThemed(content:)` for creating custom views with themed navigation bar [#953](https://github.com/GetStream/stream-chat-swiftui/pull/953)
+### 🐞 Fixed
+- Fix updating back button tint with `ColorPalette.navigationBarTintColor` [#953](https://github.com/GetStream/stream-chat-swiftui/pull/953)
 - Add support for downloading file attachments [#952](https://github.com/GetStream/stream-chat-swiftui/pull/952)
 
 # [4.88.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.88.0)

DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift

@@ -33,7 +33,7 @@ public struct CustomChannelHeader: ToolbarContent {
                     .frame(width: 24, height: 24)
                     .foregroundColor(Color.white)
                     .padding(.all, 8)
-                    .background(colors.tintColor)
+                    .background(colors.navigationBarTintColor)
                     .clipShape(Circle())
             }
             .accessibilityLabel(Text("New Channel"))
@@ -67,7 +67,7 @@ struct CustomChannelModifier: ChannelListHeaderViewModifier {
     func body(content: Content) -> some View {
         ZStack {
             if #available(iOS 26, *) {
-                content.toolbar {
+                content.toolbarThemed {
                     CustomChannelHeader(
                         title: title,
                         currentUserController: chatClient.currentUserController(),
@@ -79,7 +79,7 @@ struct CustomChannelModifier: ChannelListHeaderViewModifier {
                     #endif
                 }
             } else {
-                content.toolbar {
+                content.toolbarThemed {
                     CustomChannelHeader(
                         title: title,
                         currentUserController: chatClient.currentUserController(),

DemoAppSwiftUI/ChannelHeader/NewChatView.swift

@@ -96,7 +96,13 @@ struct NewChatView: View, KeyboardReadable {
                 Spacer()
             }
         }
-        .navigationTitle("New Chat")
+        .toolbarThemed {
+            ToolbarItem(placement: .principal) {
+                Text("New Chat")
+                    .font(fonts.bodyBold)
+                    .foregroundColor(Color(colors.navigationBarTitle))
+            }
+        }
         .onReceive(keyboardWillChangePublisher) { visible in
             keyboardShown = visible
         }

DemoAppSwiftUI/CreateGroupView.swift

@@ -49,7 +49,7 @@ struct CreateGroupView: View, KeyboardReadable {
             }
             .listStyle(.plain)
         }
-        .toolbar(content: {
+        .toolbarThemed(content: {
             ToolbarItem(placement: .navigationBarTrailing) {
                 NavigationLink {
                     GroupNameView(

Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/ChatChannelHeaderViewModifier.swift

@@ -77,7 +77,6 @@ public struct DefaultChatChannelHeader<Factory: ViewFactory>: ToolbarContent {
                     )
                     .offset(x: 4)
                 }
-                .accentColor(colors.navigationBarTintColor)
                 .accessibilityLabel(Text(L10n.Channel.Header.Info.title))
 
                 NavigationLink(isActive: $isActive) {
@@ -111,8 +110,7 @@ public struct DefaultChannelHeaderModifier<Factory: ViewFactory>: ChatChannelHea
     public func body(content: Content) -> some View {
         if #available(iOS 26, *) {
             content
-                .navigationBarBackground()
-                .toolbar {
+                .toolbarThemed {
                     DefaultChatChannelHeader(
                         factory: factory,
                         channel: channel,
@@ -125,8 +123,7 @@ public struct DefaultChannelHeaderModifier<Factory: ViewFactory>: ChatChannelHea
                 }
         } else {
             content
-                .navigationBarBackground()
-                .toolbar {
+                .toolbarThemed {
                     DefaultChatChannelHeader(
                         factory: factory,
                         channel: channel,

Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/MessageThreadHeaderViewModifier.swift

@@ -31,8 +31,7 @@ public struct DefaultMessageThreadHeader: ToolbarContent {
 public struct DefaultMessageThreadHeaderModifier: MessageThreadHeaderViewModifier {
     public func body(content: Content) -> some View {
         content
-            .navigationBarBackground()
-            .toolbar {
+            .toolbarThemed {
                 DefaultMessageThreadHeader()
             }
     }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift

@@ -132,8 +132,7 @@ public struct ChatChannelInfoView<Factory: ViewFactory>: View, KeyboardReadable
                 }
             }
         }
-        .navigationBarBackground()
-        .toolbar {
+        .toolbarThemed {
             ToolbarItem(placement: .principal) {
                 Group {
                     if viewModel.showSingleMemberDMView {
@@ -162,7 +161,6 @@ public struct ChatChannelInfoView<Factory: ViewFactory>: View, KeyboardReadable
                             .background(colors.tintColor)
                             .clipShape(Circle())
                     }
-                    .accentColor(colors.navigationBarTintColor)
                 }
             }
         }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/FileAttachmentsView.swift

@@ -78,14 +78,13 @@ public struct FileAttachmentsView: View {
                 }
             }
         }
-        .toolbar {
+        .toolbarThemed {
             ToolbarItem(placement: .principal) {
                 Text(L10n.ChatInfo.Files.title)
                     .font(fonts.bodyBold)
                     .foregroundColor(Color(colors.navigationBarTitle))
             }
         }
-        .navigationBarBackground()
         .navigationBarTitleDisplayMode(.inline)
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/MediaAttachmentsView.swift

@@ -100,14 +100,13 @@ public struct MediaAttachmentsView<Factory: ViewFactory>: View {
                 }
             }
         }
-        .toolbar {
+        .toolbarThemed {
             ToolbarItem(placement: .principal) {
                 Text(L10n.ChatInfo.Media.title)
                     .font(fonts.bodyBold)
                     .foregroundColor(Color(colors.navigationBarTitle))
             }
         }
-        .navigationBarBackground()
         .navigationBarTitleDisplayMode(.inline)
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/PinnedMessagesView.swift

@@ -73,14 +73,13 @@ public struct PinnedMessagesView<Factory: ViewFactory>: View {
                 )
             }
         }
-        .toolbar {
+        .toolbarThemed {
             ToolbarItem(placement: .principal) {
                 Text(L10n.ChatInfo.PinnedMessages.title)
                     .font(fonts.bodyBold)
                     .foregroundColor(Color(colors.navigationBarTitle))
             }
         }
-        .navigationBarBackground()
         .navigationBarTitleDisplayMode(.inline)
     }