Merge branch 'develop' into v5

laevandus · laevandus · commit a40d7cb70ff2 · 2025-10-07T13:46:27.000+03:00
# Conflicts:
#	Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add participant actions in channel info view [#982](https://github.com/GetStream/stream-chat-swiftui/pull/982)
 - Add support for overriding `onImageTap` in `LinkAttachmentView` [#986](https://github.com/GetStream/stream-chat-swiftui/pull/986)
 - Add support for customizing text colors in `LinkAttachmentView` [#992](https://github.com/GetStream/stream-chat-swiftui/pull/992)
+- Expose `MediaAttachment` properties and initializer [#1000](https://github.com/GetStream/stream-chat-swiftui/pull/1000)
+- Add `ColorPalette.navigationBarGlyph` for configuring the glyph color for buttons in navigation bars [#999](https://github.com/GetStream/stream-chat-swiftui/pull/999)
+- Allow overriding `ChatChannelInfoViewModel` properties: `shouldShowLeaveConversationButton`, `canRenameChannel`, and `shouldShowAddUserButton` [#995](https://github.com/GetStream/stream-chat-swiftui/pull/995)
 
 ### 🐞 Fixed
 - Fix openChannel not working when searching or another chat shown [#975](https://github.com/GetStream/stream-chat-swiftui/pull/975)
@@ -19,6 +22,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix random scroll after marking a message unread [#989](https://github.com/GetStream/stream-chat-swiftui/pull/989)
 - Fix marking channel read when the user scrolls to the bottom after marking a message as unread [#989](https://github.com/GetStream/stream-chat-swiftui/pull/989)
 - Fix replying to unread messages marking them instantly as read [#989](https://github.com/GetStream/stream-chat-swiftui/pull/989)
+- Fix rendering of the add users button on iOS 26 [#999](https://github.com/GetStream/stream-chat-swiftui/pull/999)
+- Use `ColorPalette.navigationBarTint` for the background of the add users button [#999](https://github.com/GetStream/stream-chat-swiftui/pull/999)
+- Fix showing all the channel members in the more channel actions view [#1001](https://github.com/GetStream/stream-chat-swiftui/pull/1001)
 
 # [4.89.1](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.89.1)
 _September 23, 2025_
diff --git a/DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift b/DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift
@@ -31,7 +31,7 @@ public struct CustomChannelHeader: ToolbarContent {
                     .resizable()
                     .scaledToFit()
                     .frame(width: 24, height: 24)
-                    .foregroundColor(Color.white)
+                    .foregroundColor(Color(colors.navigationBarGlyph))
                     .padding(.all, 8)
                     .background(colors.navigationBarTintColor)
                     .clipShape(Circle())
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift
@@ -141,38 +141,7 @@ public struct ChatChannelInfoView<Factory: ViewFactory>: View, KeyboardReadable
                 }
             }
         }
-        .toolbarThemed {
-            ToolbarItem(placement: .principal) {
-                Group {
-                    if viewModel.showSingleMemberDMView {
-                        Text(viewModel.displayedParticipants.first?.chatUser.name ?? "")
-                            .font(fonts.bodyBold)
-                            .foregroundColor(Color(colors.navigationBarTitle))
-                    } else {
-                        ChannelTitleView(
-                            channel: viewModel.channel,
-                            shouldShowTypingIndicator: false
-                        )
-                        .id(viewModel.channelId)
-                    }
-                }
-            }
-
-            ToolbarItem(placement: .navigationBarTrailing) {
-                if viewModel.shouldShowAddUserButton {
-                    Button {
-                        viewModel.addUsersShown = true
-                    } label: {
-                        Image(systemName: "person.badge.plus")
-                            .customizable()
-                            .foregroundColor(Color.white)
-                            .padding(.all, 8)
-                            .background(colors.tintColor)
-                            .clipShape(Circle())
-                    }
-                }
-            }
-        }
+        .modifier(ChatChannelInfoViewHeaderViewModifier(viewModel: viewModel))
         .onReceive(keyboardWillChangePublisher) { visible in
             viewModel.keyboardShown = visible
         }
@@ -184,3 +153,61 @@ public struct ChatChannelInfoView<Factory: ViewFactory>: View, KeyboardReadable
         viewModel.addUsersShown || viewModel.selectedParticipant != nil
     }
 }
+
+struct ChatChannelInfoViewHeaderViewModifier: ViewModifier {
+    @Injected(\.colors) private var colors
+    @Injected(\.fonts) private var fonts
+    
+    let viewModel: ChatChannelInfoViewModel
+    
+    func body(content: Content) -> some View {
+        if #available(iOS 26.0, *) {
+            content
+                .toolbarThemed {
+                    toolbar(glyphSize: 24)
+                    #if compiler(>=6.2)
+                        .sharedBackgroundVisibility(.hidden)
+                    #endif
+                }
+        } else {
+            content
+                .toolbarThemed {
+                    toolbar()
+                }
+        }
+    }
+    
+    @ToolbarContentBuilder func toolbar(glyphSize: CGFloat? = nil) -> some ToolbarContent {
+        ToolbarItem(placement: .principal) {
+            Group {
+                if viewModel.showSingleMemberDMView {
+                    Text(viewModel.displayedParticipants.first?.chatUser.name ?? "")
+                        .font(fonts.bodyBold)
+                        .foregroundColor(Color(colors.navigationBarTitle))
+                } else {
+                    ChannelTitleView(
+                        channel: viewModel.channel,
+                        shouldShowTypingIndicator: false
+                    )
+                    .id(viewModel.channelId)
+                }
+            }
+        }
+
+        ToolbarItem(placement: .navigationBarTrailing) {
+            if viewModel.shouldShowAddUserButton {
+                Button {
+                    viewModel.addUsersShown = true
+                } label: {
+                    Image(systemName: "person.badge.plus")
+                        .customizable()
+                        .frame(width: glyphSize, height: glyphSize)
+                        .foregroundColor(Color(colors.navigationBarGlyph))
+                        .padding(.all, 8)
+                        .background(colors.navigationBarTintColor)
+                        .clipShape(Circle())
+                }
+            }
+        }
+    }
+}
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoViewModel.swift
@@ -36,19 +36,19 @@ import SwiftUI
     @Published public var addUsersShown = false
     @Published public var selectedParticipant: ParticipantInfo?
     
-    public var shouldShowLeaveConversationButton: Bool {
+    open var shouldShowLeaveConversationButton: Bool {
         if channel.isDirectMessageChannel {
             channel.ownCapabilities.contains(.deleteChannel)
         } else {
             channel.ownCapabilities.contains(.leaveChannel)
         }
     }
 
-    public var canRenameChannel: Bool {
+    open var canRenameChannel: Bool {
         channel.ownCapabilities.contains(.updateChannel)
     }
 
-    public var shouldShowAddUserButton: Bool {
+    open var shouldShowAddUserButton: Bool {
         if channel.isDirectMessageChannel {
             false
         } else {
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift
@@ -423,9 +423,15 @@ extension ChatMessage {
 }
 
 public struct MediaAttachment: Identifiable, Equatable {
-    let url: URL
-    let type: MediaAttachmentType
-    var uploadingState: AttachmentUploadingState?
+    public let url: URL
+    public let type: MediaAttachmentType
+    public var uploadingState: AttachmentUploadingState?
+
+    public init(url: URL, type: MediaAttachmentType, uploadingState: AttachmentUploadingState? = nil) {
+        self.url = url
+        self.type = type
+        self.uploadingState = uploadingState
+    }
 
     public var id: String {
         url.absoluteString
@@ -476,9 +482,14 @@ extension MediaAttachment {
     }
 }
 
-enum MediaAttachmentType {
-    case image
-    case video
+public struct MediaAttachmentType: RawRepresentable {
+    public let rawValue: String
+    public init(rawValue: String) {
+        self.rawValue = rawValue
+    }
+
+    public static let image = Self(rawValue: "image")
+    public static let video = Self(rawValue: "video")
 }
 
 /// Options for the gallery view.
diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/MoreChannelActionsViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannelList/MoreChannelActionsViewModel.swift
@@ -53,9 +53,7 @@ import UIKit
     ) {
         self.channelActions = channelActions
         self.channel = channel
-        members = channel.lastActiveMembers.filter { [unowned self] member in
-            member.id != chatClient.currentUserId
-        }
+        members = channel.lastActiveMembers
     }
 
     /// Returns an image for a member.
diff --git a/Sources/StreamChatSwiftUI/ColorPalette.swift b/Sources/StreamChatSwiftUI/ColorPalette.swift
@@ -8,6 +8,7 @@ import UIKit
 /// Provides the colors used throughout the SDK.
 @MainActor public struct ColorPalette {
     public init() {
+        navigationBarGlyph = .white
         navigationBarTitle = text
         navigationBarSubtitle = textLowEmphasis
         navigationBarTintColor = tintColor
@@ -104,6 +105,8 @@ import UIKit
 
     // MARK: - Navigation Bar
     
+    public var navigationBarGlyph: UIColor
+    
     public var navigationBarTitle: UIColor {
         didSet {
             StreamConcurrency.onMain { [navigationBarTitle] in
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/ChatChannelInfoView_Tests/test_chatChannelInfoView_navigationBarAppearance.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/ChatChannelInfoView_Tests/test_chatChannelInfoView_navigationBarAppearance.1.png
diff --git a/StreamChatSwiftUITests/Tests/ChatChannelList/MoreChannelActionsViewModel_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannelList/MoreChannelActionsViewModel_Tests.swift
@@ -16,19 +16,23 @@ import XCTest
         streamChat = StreamChat(chatClient: chatClient, utils: utils)
     }
 
-    func test_moreActionsVM_membersLoaded() {
+    func test_moreActionsVM_membersLoaded() throws {
         // Given
+        let currentUserId = try XCTUnwrap(streamChat?.chatClient.currentUserId)
         let memberId: String = .unique
         let viewModel = makeMoreActionsViewModel(
-            members: [.mock(id: memberId, isOnline: true)]
+            members: [
+                .mock(id: memberId, isOnline: true),
+                .mock(id: currentUserId, isOnline: true)
+            ]
         )
 
         // When
         let members = viewModel.members
 
         // Then
-        XCTAssert(members.count == 1)
-        XCTAssert(members[0].id == memberId)
+        XCTAssert(members.count == 2)
+        XCTAssert(members.map(\.id) == [memberId, currentUserId])
     }
 
     func test_moreActionsVM_chatHeaderInfo() {
diff --git a/StreamChatSwiftUITests/Tests/StreamChatTestCase.swift b/StreamChatSwiftUITests/Tests/StreamChatTestCase.swift
@@ -41,6 +41,7 @@ import XCTest
             appearance.colors.navigationBarTitle = .blue
             appearance.colors.navigationBarSubtitle = .cyan
             appearance.colors.navigationBarBackground = .yellow
+            appearance.colors.navigationBarGlyph = .green
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ import XCTest`
`41`	`41`	`appearance.colors.navigationBarTitle = .blue`
`42`	`42`	`appearance.colors.navigationBarSubtitle = .cyan`
`43`	`43`	`appearance.colors.navigationBarBackground = .yellow`
	`44`	`+ appearance.colors.navigationBarGlyph = .green`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`	`}`