Merge branch 'develop' into v5

Author: laevandus

.swiftformat

@@ -2,20 +2,66 @@
 --header "\nCopyright © {year} Stream.io Inc. All rights reserved.\n"
 --swiftversion 6.0
 
---ifdef no-indent
---disable redundantType
---disable extensionAccessControl
---disable andOperator
---disable hoistPatternLet
---disable typeSugar
-
---disable redundantGet # it removes get async throws from getters
+# Use allow-list
+--rules blankLinesAroundMark
+--rules blankLinesAtEndOfScope
+--rules blankLinesAtStartOfScope
+--rules blankLinesBetweenScopes
+--rules braces
+--rules consecutiveBlankLines
+--rules consecutiveSpaces
+--rules duplicateImports
+--rules elseOnSameLine
+--rules emptyBraces
+--rules enumNamespaces
+--rules fileHeader
+--rules indent
+--rules initCoderUnavailable
+--rules isEmpty
+--rules leadingDelimiters
+--rules linebreakAtEndOfFile
+--rules linebreaks
+--rules modifierOrder
+--rules numberFormatting
+--rules redundantBackticks
+--rules redundantBreak
+--rules redundantExtensionACL
+--rules redundantFileprivate
+--rules redundantLet
+--rules redundantLetError
+--rules redundantNilInit
+--rules redundantObjc
+--rules redundantPattern
+--rules redundantRawValues
+--rules redundantVoidReturnType
+--rules semicolons
+--rules sortedImports
+--rules spaceAroundBraces
+--rules spaceAroundBrackets
+--rules spaceAroundComments
+--rules spaceAroundGenerics
+--rules spaceAroundOperators
+--rules spaceAroundParens
+--rules spaceInsideBraces
+--rules spaceInsideBrackets
+--rules spaceInsideComments
+--rules spaceInsideGenerics
+--rules spaceInsideParens
+--rules strongOutlets
+--rules strongifiedSelf
+--rules todos
+--rules trailingCommas
+--rules trailingSpace
+--rules unusedArguments
+--rules void
+--rules wrap
+--rules wrapArguments
+--rules wrapAttributes
+--rules yodaConditions
 
-# Rules inferred from Swift Standard Library:
---disable anyObjectProtocol, wrapMultilineStatementBraces
+# Configuration for enabled rules
+--ifdef no-indent
 --indent 4
---enable isEmpty
---disable redundantParens # it generates mistakes for e.g. "if (a || b), let x = ... {}"
 --semicolons inline
 --nospaceoperators ..., ..< # what about ==, +=?
 --commas inline

.swiftlint.yml

@@ -7,7 +7,6 @@ excluded:
   - Sources/StreamChatSwiftUI/StreamNuke
 
 only_rules:
-  # Currently enabled autocorrectable rules
   - attribute_name_spacing
   - closing_brace
   - colon
@@ -19,14 +18,15 @@ only_rules:
   - empty_enum_arguments
   - empty_parameters
   - empty_parentheses_with_trailing_closure
-  - explicit_init
+  - file_name_no_space
   - joined_default_parameter
   - leading_whitespace
   - legacy_cggeometry_functions
   - legacy_constant
   - legacy_constructor
   - legacy_nsgeometry_functions
   - mark
+  - multiline_arguments
   - no_space_in_method_call
   - prefer_type_checking
   - private_over_fileprivate
@@ -50,3 +50,12 @@ only_rules:
   - unused_import
   - vertical_whitespace
   - void_return
+
+multiline_arguments:
+  only_enforce_after_first_closure_on_first_line: true
+
+trailing_whitespace:
+  ignores_empty_lines: true
+
+file_name_no_space:
+  severity: error

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### ✅ Added
 - Opens the `commandsHandler` and makes the mention methods public [#979](https://github.com/GetStream/stream-chat-swiftui/pull/979)
 - Opens `MarkdownFormatter` so that it can be customised [#978](https://github.com/GetStream/stream-chat-swiftui/pull/978)
+- 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)
 
 ### 🐞 Fixed
 - Fix openChannel not working when searching or another chat shown [#975](https://github.com/GetStream/stream-chat-swiftui/pull/975)

DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift

@@ -75,7 +75,7 @@ struct CustomChannelModifier: ChannelListHeaderViewModifier {
                         actionsPopupShown: $actionsPopupShown
                     )
                     #if compiler(>=6.2)
-                        .sharedBackgroundVisibility(.hidden)
+                    .sharedBackgroundVisibility(.hidden)
                     #endif
                 }
             } else {

DemoAppSwiftUI/CustomComposerAttachmentView.swift

@@ -52,7 +52,7 @@ class CustomAttachmentsFactory: ViewFactory {
 
     func makeAttachmentSourcePickerView(
         selected: AttachmentPickerState,
-        onPickerStateChange: @escaping @MainActor(AttachmentPickerState) -> Void
+        onPickerStateChange: @escaping @MainActor (AttachmentPickerState) -> Void
     ) -> some View {
         CustomAttachmentSourcePickerView(
             selected: selected,
@@ -62,7 +62,7 @@ class CustomAttachmentsFactory: ViewFactory {
 
     func makeCustomAttachmentView(
         addedCustomAttachments: [CustomAttachment],
-        onCustomAttachmentTap: @escaping @MainActor(CustomAttachment) -> Void
+        onCustomAttachmentTap: @escaping @MainActor (CustomAttachment) -> Void
     ) -> some View {
         CustomContactAttachmentView(
             contacts: mockContacts,
@@ -98,7 +98,7 @@ class CustomAttachmentsFactory: ViewFactory {
 
     func makeCustomAttachmentPreviewView(
         addedCustomAttachments: [CustomAttachment],
-        onCustomAttachmentTap: @escaping @MainActor(CustomAttachment) -> Void
+        onCustomAttachmentTap: @escaping @MainActor (CustomAttachment) -> Void
     ) -> some View {
         CustomContactAttachmentComposerPreview(
             addedCustomAttachments: addedCustomAttachments,

DemoAppSwiftUI/ViewFactoryExamples.swift

@@ -21,8 +21,8 @@ class DemoAppFactory: ViewFactory {
 
     func supportedMoreChannelActions(
         for channel: ChatChannel,
-        onDismiss: @escaping @MainActor() -> Void,
-        onError: @escaping @MainActor(Error) -> Void
+        onDismiss: @escaping @MainActor () -> Void,
+        onError: @escaping @MainActor (Error) -> Void
     ) -> [ChannelAction] {
         var actions = ChannelAction.defaultActions(
             for: channel,
@@ -49,11 +49,11 @@ class DemoAppFactory: ViewFactory {
         disabled: Bool,
         selectedChannel: Binding<ChannelSelectionInfo?>,
         swipedChannelId: Binding<String?>,
-        channelDestination: @escaping @MainActor(ChannelSelectionInfo) -> ChatChannelView<DemoAppFactory>,
-        onItemTap: @escaping @MainActor(ChatChannel) -> Void,
-        trailingSwipeRightButtonTapped: @escaping @MainActor(ChatChannel) -> Void,
-        trailingSwipeLeftButtonTapped: @escaping @MainActor(ChatChannel) -> Void,
-        leadingSwipeButtonTapped: @escaping @MainActor(ChatChannel) -> Void
+        channelDestination: @escaping @MainActor (ChannelSelectionInfo) -> ChatChannelView<DemoAppFactory>,
+        onItemTap: @escaping @MainActor (ChatChannel) -> Void,
+        trailingSwipeRightButtonTapped: @escaping @MainActor (ChatChannel) -> Void,
+        trailingSwipeLeftButtonTapped: @escaping @MainActor (ChatChannel) -> Void,
+        leadingSwipeButtonTapped: @escaping @MainActor (ChatChannel) -> Void
     ) -> some View {
         let listItem = DemoAppChatChannelNavigatableListItem(
             channel: channel,
@@ -83,8 +83,8 @@ class DemoAppFactory: ViewFactory {
 
     private func archiveChannelAction(
         for channel: ChatChannel,
-        onDismiss: @escaping @MainActor() -> Void,
-        onError: @escaping @MainActor(Error) -> Void
+        onDismiss: @escaping @MainActor () -> Void,
+        onError: @escaping @MainActor (Error) -> Void
     ) -> ChannelAction {
         ChannelAction(
             title: channel.isArchived ? "Unarchive Channel" : "Archive Channel",
@@ -117,8 +117,8 @@ class DemoAppFactory: ViewFactory {
 
     private func pinChannelAction(
         for channel: ChatChannel,
-        onDismiss: @escaping @MainActor() -> Void,
-        onError: @escaping @MainActor(Error) -> Void
+        onDismiss: @escaping @MainActor () -> Void,
+        onError: @escaping @MainActor (Error) -> Void
     ) -> ChannelAction {
         let pinChannel = ChannelAction(
             title: channel.isPinned ? "Unpin Channel" : "Pin Channel",
@@ -257,16 +257,16 @@ class CustomFactory: ViewFactory {
     // Example for an injected action. Uncomment to see it in action.
     func supportedMoreChannelActions(
         for channel: ChatChannel,
-        onDismiss: @escaping @MainActor() -> Void,
-        onError: @escaping @MainActor(Error) -> Void
+        onDismiss: @escaping @MainActor () -> Void,
+        onError: @escaping @MainActor (Error) -> Void
     ) -> [ChannelAction] {
         var defaultActions = ChannelAction.defaultActions(
             for: channel,
             chatClient: chatClient,
             onDismiss: onDismiss,
             onError: onError
         )
-        let freeze: @MainActor() -> Void = {
+        let freeze: @MainActor () -> Void = {
             let controller = self.chatClient.channelController(for: channel.cid)
             controller.freezeChannel { error in
                 if let error {
@@ -297,8 +297,8 @@ class CustomFactory: ViewFactory {
 
     func makeMoreChannelActionsView(
         for channel: ChatChannel,
-        onDismiss: @escaping @MainActor() -> Void,
-        onError: @escaping @MainActor(Error) -> Void
+        onDismiss: @escaping @MainActor () -> Void,
+        onError: @escaping @MainActor (Error) -> Void
     ) -> some View {
         VStack {
             Text("This is our custom view")

DemoAppSwiftUI/iMessagePocView.swift

@@ -126,7 +126,7 @@ class iMessageViewFactory: ViewFactory {
         channel: ChatChannel,
         offsetX: CGFloat,
         buttonWidth: CGFloat,
-        buttonTapped: @escaping @MainActor(ChatChannel) -> Void
+        buttonTapped: @escaping @MainActor (ChatChannel) -> Void
     ) -> some View {
         HStack {
             ActionItemButton(imageName: "pin.fill") {

Githubfile

@@ -6,6 +6,6 @@ export YEETD_VERSION='1.0'
 export SONAR_VERSION='6.2.1.4610'
 export IPSW_VERSION='3.1.592'
 export INTERFACE_ANALYZER_VERSION='1.0.7'
-export SWIFT_LINT_VERSION='0.55.1'
-export SWIFT_FORMAT_VERSION='0.47.12'
+export SWIFT_LINT_VERSION='0.59.1'
+export SWIFT_FORMAT_VERSION='0.58.2'
 export SWIFT_GEN_VERSION='6.5.1'

Sources/StreamChatSwiftUI/Appearance.swift

@@ -21,8 +21,8 @@ public class Appearance {
     }
 
     /// Provider for custom localization which is dependent on App Bundle.
-    nonisolated(unsafe)
-    public static var localizationProvider: @Sendable(_ key: String, _ table: String) -> String = { key, table in
+    public nonisolated(unsafe)
+    static var localizationProvider: @Sendable (_ key: String, _ table: String) -> String = { key, table in
         Bundle.streamChatUI.localizedString(forKey: key, value: nil, table: table)
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/ChatChannelHeaderViewModifier.swift

@@ -118,7 +118,7 @@ public struct DefaultChannelHeaderModifier<Factory: ViewFactory>: ChatChannelHea
                         isActive: $isActive
                     )
                     #if compiler(>=6.2)
-                        .sharedBackgroundVisibility(.hidden)
+                    .sharedBackgroundVisibility(.hidden)
                     #endif
                 }
         } else {