Respect navigationBarTitle color in file, media and pinned messages view. Turn off applying tint color to navigation stack (#944)

Author: laevandus

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/FileAttachmentsView.swift

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

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/MediaAttachmentsView.swift

@@ -7,6 +7,8 @@ import SwiftUI
 
 /// View displaying media attachments.
 public struct MediaAttachmentsView<Factory: ViewFactory>: View {
+    @Injected(\.colors) private var colors
+    @Injected(\.fonts) private var fonts
     @Injected(\.images) private var images
 
     @StateObject private var viewModel: MediaAttachmentsViewModel
@@ -98,8 +100,15 @@ public struct MediaAttachmentsView<Factory: ViewFactory>: View {
                 }
             }
         }
-        .navigationTitle(L10n.ChatInfo.Media.title)
+        .toolbar {
+            ToolbarItem(placement: .principal) {
+                Text(L10n.ChatInfo.Media.title)
+                    .font(fonts.bodyBold)
+                    .foregroundColor(Color(colors.navigationBarTitle))
+            }
+        }
         .navigationBarBackground()
+        .navigationBarTitleDisplayMode(.inline)
     }
 }
 

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/PinnedMessagesView.swift

@@ -7,6 +7,8 @@ import SwiftUI
 
 /// View displaying pinned messages in the chat info screen.
 public struct PinnedMessagesView<Factory: ViewFactory>: View {
+    @Injected(\.colors) private var colors
+    @Injected(\.fonts) private var fonts
     @Injected(\.images) private var images
     @Injected(\.utils) private var utils
     @Injected(\.chatClient) private var chatClient
@@ -71,8 +73,15 @@ public struct PinnedMessagesView<Factory: ViewFactory>: View {
                 )
             }
         }
-        .navigationTitle(L10n.ChatInfo.PinnedMessages.title)
+        .toolbar {
+            ToolbarItem(placement: .principal) {
+                Text(L10n.ChatInfo.PinnedMessages.title)
+                    .font(fonts.bodyBold)
+                    .foregroundColor(Color(colors.navigationBarTitle))
+            }
+        }
         .navigationBarBackground()
+        .navigationBarTitleDisplayMode(.inline)
     }
 
     private func makeMessageDestination(message: ChatMessage) -> ChatChannelView<Factory> {

Sources/StreamChatSwiftUI/Utils/NavigationContainerView.swift

@@ -18,15 +18,12 @@ struct NavigationContainerView<Content: View>: View {
                         .accentColor(colors.tintColor)
                         .navigationBarBackground()
                 }
-                // Tint for back and other system buttons
-                .accentColor(colors.navigationBarTintColor)
             } else {
                 NavigationView {
                     content()
                         .accentColor(colors.tintColor)
                         .navigationBarBackground()
                 }
-                .accentColor(colors.navigationBarTintColor)
             }
         } else {
             content()

StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/FileAttachmentsView_Tests.swift

@@ -67,4 +67,24 @@ class FileAttachmentsView_Tests: StreamChatTestCase {
         // Then
         assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
     }
+    
+    func test_fileAttachmentsView_themedSnapshot() {
+        // Given
+        customizedNavigationBarAppearance()
+        let messages = ChannelInfoMockUtils.generateMessagesWithFileAttachments(count: 20)
+        let messageSearchController = ChatMessageSearchController_Mock.mock(client: chatClient)
+        messageSearchController.messages_mock = messages
+        let viewModel = FileAttachmentsViewModel(
+            channel: .mockDMChannel(),
+            messageSearchController: messageSearchController
+        )
+
+        // When
+        let view = NavigationContainerView(embedInNavigationView: true) {
+            FileAttachmentsView(viewModel: viewModel)
+        }.applyDefaultSize()
+        
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
 }

StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/MediaAttachmentsView_Tests.swift

@@ -57,4 +57,27 @@ class MediaAttachmentsView_Tests: StreamChatTestCase {
         // Then
         assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
     }
+    
+    func test_mediaAttachmentsView_themedSnapshot() {
+        // Given
+        customizedNavigationBarAppearance()
+        let messages = ChannelInfoMockUtils.generateMessagesWithAttachments(
+            withImages: 10,
+            withVideos: 5
+        )
+        let messageSearchController = ChatMessageSearchController_Mock.mock(client: chatClient)
+        messageSearchController.messages_mock = messages
+        let viewModel = MediaAttachmentsViewModel(
+            channel: .mockDMChannel(),
+            messageSearchController: messageSearchController
+        )
+
+        // When
+        let view = NavigationContainerView(embedInNavigationView: true) {
+            MediaAttachmentsView(viewModel: viewModel)
+        }.applyDefaultSize()
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
 }

StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/PinnedMessagesView_Tests.swift

@@ -113,6 +113,22 @@ class PinnedMessagesView_Tests: StreamChatTestCase {
         // Then
         AssertSnapshot(view, size: defaultScreenSize)
     }
+    
+    func test_pinnedMessagesView_themedSnapshot() {
+        // Given
+        customizedNavigationBarAppearance()
+        let channel = ChatChannel.mockDMChannel(
+            pinnedMessages: [ChannelInfoMockUtils.pinnedMessage]
+        )
+
+        // When
+        let view = NavigationContainerView(embedInNavigationView: true) {
+            PinnedMessagesView(channel: channel)
+        }.applyDefaultSize()
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
 }
 
 // Temp solution for failing tests.