UI Fixes to the channel list item (#1384)

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListItem.swift

@@ -216,7 +216,7 @@ public struct ChatChannelListItem<Factory: ViewFactory>: View {
         if let iconImage = previewAttachmentIconImage {
             Image(uiImage: iconImage)
                 .customizable()
-                .frame(maxHeight: 14)
+                .frame(height: 14)
                 .accessibilityHidden(true)
         }
     }
@@ -246,8 +246,8 @@ public struct ChatChannelListItem<Factory: ViewFactory>: View {
     private var mutedIcon: some View {
         Image(uiImage: images.muted)
             .customizable()
-            .frame(maxHeight: 12)
-            .foregroundColor(Color(colors.textSecondary))
+            .frame(height: tokens.iconSizeMd)
+            .foregroundColor(Color(colors.textTertiary))
     }
 
     private var lastMessageFailedToSend: Bool {

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift

@@ -79,7 +79,6 @@ public struct ChatChannelListView<Factory: ViewFactory>: View {
         containerView
             .sheet(isPresented: $viewModel.channelPopupShown, content: {
                 channelPopup()
-                    .modifier(PresentationDetentsModifier(sheetSizes: [.custom(280), .medium]))
             })
             .if(isIphone || !utils.messageListConfig.iPadSplitViewEnabled, transform: { view in
                 view.navigationViewStyle(.stack)

Sources/StreamChatSwiftUI/ChatChannelList/DefaultChannelActions.swift

@@ -34,8 +34,6 @@ extension ChannelAction {
             actions.append(muteAction(for: channel, chatClient: chatClient, onDismiss: onDismiss, onError: onError))
         }
 
-        actions.append(archiveAction(for: channel, chatClient: chatClient, onDismiss: onDismiss, onError: onError))
-
         if let otherMember = channel.lastActiveMembers.first(where: { $0.id != chatClient.currentUserId }) {
             let blockedIds = chatClient.currentUserController().dataStore.currentUser()?.blockedUserIds ?? []
             actions.append(
@@ -69,8 +67,6 @@ extension ChannelAction {
             actions.append(muteAction(for: channel, chatClient: chatClient, onDismiss: onDismiss, onError: onError))
         }
 
-        actions.append(archiveAction(for: channel, chatClient: chatClient, onDismiss: onDismiss, onError: onError))
-
         if channel.ownCapabilities.contains(.deleteChannel) {
             actions.append(deleteAction(for: channel, chatClient: chatClient, onDismiss: onDismiss, onError: onError))
         } else if channel.ownCapabilities.contains(.leaveChannel), let userId = chatClient.currentUserId {

Sources/StreamChatSwiftUI/ChatChannelList/MoreChannelActionsView.swift

@@ -50,12 +50,14 @@ public struct MoreChannelActionsView<Factory: ViewFactory>: View {
     }
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            channelHeader
-            actionsListView
-            Spacer()
+        ScrollView {
+            VStack(alignment: .leading, spacing: 0) {
+                channelHeader
+                actionsListView
+                Spacer()
+            }
         }
-        .background(colors.backgroundCoreApp.toColor.edgesIgnoringSafeArea(.all))
+        .background(colors.backgroundCoreElevation1.toColor.edgesIgnoringSafeArea(.all))
         .alert(isPresented: $viewModel.alertShown) {
             let title = viewModel.alertAction?.confirmationPopup?.title ?? ""
             let message = viewModel.alertAction?.confirmationPopup?.message ?? ""

Sources/StreamChatSwiftUI/ViewFactory/DefaultViewFactory.swift

@@ -31,19 +31,23 @@ extension ViewFactory {
     public func makeMoreChannelActionsView(
         options: MoreChannelActionsViewOptions
     ) -> some View {
-        MoreChannelActionsView(
+        let actions = InjectedValues[\.utils].channelListConfig.supportedMoreChannelActions(
+            SupportedMoreChannelActionsOptions(
+                channel: options.channel,
+                onDismiss: options.onDismiss,
+                onError: options.onError
+            )
+        )
+        return MoreChannelActionsView(
             factory: self,
             channel: options.channel,
-            channelActions: InjectedValues[\.utils].channelListConfig.supportedMoreChannelActions(
-                SupportedMoreChannelActionsOptions(
-                    channel: options.channel,
-                    onDismiss: options.onDismiss,
-                    onError: options.onError
-                )
-            ),
+            channelActions: actions,
             swipedChannelId: options.swipedChannelId,
             onDismiss: options.onDismiss
         )
+        .modifier(PresentationDetentsModifier(
+            sheetSizes: [.custom(actions.count > 3 ? 250 : 200), .medium])
+        )
     }
 
     public func makeChannelListItem(

StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/MessageItemView_Tests/test_imageAttachments_failedWhenMessageTextIsEmpty_snapshot.1.png

@@ -50,11 +50,10 @@ import XCTest
         // When
         let actions = makeActions(for: channel)
 
-        // Then - viewInfo, muteUser (mutesEnabled=true by default), archiveConversation
-        XCTAssertEqual(actions.count, 3)
+        // Then - viewInfo, muteUser (mutesEnabled=true by default)
+        XCTAssertEqual(actions.count, 2)
         XCTAssertEqual(actions[0].title, L10n.Alert.Actions.viewInfoTitle)
         XCTAssertEqual(actions[1].title, L10n.Alert.Actions.muteUser)
-        XCTAssertEqual(actions[2].title, L10n.Alert.Actions.archiveConversation)
     }
 
     func test_defaultActions_dmChannel_withDeleteCapability_hasDeleteAction() {
@@ -108,8 +107,8 @@ import XCTest
         // When
         let actions = makeActions(for: channel)
 
-        // Then
-        XCTAssertTrue(actions.contains(where: { $0.title == L10n.Alert.Actions.unarchiveConversation }))
+        // Then - archive action removed; neither archive nor unarchive should appear
+        XCTAssertFalse(actions.contains(where: { $0.title == L10n.Alert.Actions.unarchiveConversation }))
         XCTAssertFalse(actions.contains(where: { $0.title == L10n.Alert.Actions.archiveConversation }))
     }
 
@@ -122,11 +121,10 @@ import XCTest
         // When
         let actions = makeActions(for: channel)
 
-        // Then - viewInfo, muteChannel (mutesEnabled=true by default), archiveChannel
-        XCTAssertEqual(actions.count, 3)
+        // Then - viewInfo, muteChannel (mutesEnabled=true by default)
+        XCTAssertEqual(actions.count, 2)
         XCTAssertEqual(actions[0].title, L10n.Alert.Actions.viewInfoTitle)
         XCTAssertEqual(actions[1].title, L10n.Alert.Actions.muteChannel)
-        XCTAssertEqual(actions[2].title, L10n.Alert.Actions.archiveChannel)
     }
 
     func test_defaultActions_groupChannel_withDeleteCapability_hasDeleteAction() {