removed images in pills in favour of text decos

FIX

fix

ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionService.swift

@@ -81,7 +81,7 @@ final class CompletionSuggestionService: CompletionSuggestionServiceProtocol {
         
         if canMentionAllUsers,
            !roomProxy.isDirectOneToOneRoom,
-           Self.shouldIncludeMember(userID: PillConstants.atRoom, displayName: PillConstants.everyone, searchText: suggestionTrigger.text) {
+           Self.shouldIncludeMember(userID: PillUtilities.atRoom, displayName: PillUtilities.everyone, searchText: suggestionTrigger.text) {
             membersSuggestion
                 .insert(SuggestionItem(suggestionType: .allUsers(roomProxy.details.avatar), range: suggestionTrigger.range, rawSuggestionText: suggestionTrigger.text), at: 0)
         }

ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionServiceProtocol.swift

@@ -49,7 +49,7 @@ struct SuggestionItem: Identifiable, Equatable {
         case .user(let user):
             user.id
         case .allUsers:
-            PillConstants.atRoom
+            PillUtilities.atRoom
         case .room(let room):
             room.id
         }
@@ -58,7 +58,7 @@ struct SuggestionItem: Identifiable, Equatable {
     var displayName: String {
         switch suggestionType {
         case .allUsers:
-            return PillConstants.everyone
+            return PillUtilities.everyone
         case .user(let user):
             return user.displayName ?? user.id
         case .room(let room):
@@ -69,7 +69,7 @@ struct SuggestionItem: Identifiable, Equatable {
     var subtitle: String? {
         switch suggestionType {
         case .allUsers:
-            return PillConstants.atRoom
+            return PillUtilities.atRoom
         case .user(let user):
             return user.displayName == nil ? nil : user.id
         case .room(let room):

ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift

@@ -413,7 +413,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
                 // Remove the attribute so it doesn't get inherited by the new string
                 attributedString.removeAttribute(.MatrixAllUsersMention, range: range)
                 
-                attributedString.replaceCharacters(in: range, with: PillConstants.atRoom)
+                attributedString.replaceCharacters(in: range, with: PillUtilities.atRoom)
                 containsAtRoom = true
                 
                 stop.pointee = true
@@ -464,7 +464,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
             
             let attributedString: NSMutableAttributedString
             // This is the all room mention special case
-            if urlString == PillConstants.composerAtRoomURLString {
+            if urlString == PillUtilities.composerAtRoomURLString {
                 attributedString = NSMutableAttributedString(string: string, attributes: [.MatrixAllUsersMention: true])
             } else {
                 attributedString = NSMutableAttributedString(string: string, attributes: [.link: URL(string: urlString) as Any])

ElementX/Sources/Screens/Timeline/TimelineViewModel.swift

@@ -841,11 +841,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
         case let .user(id):
             let isOwnMention = id == state.ownUserID
             if let profile = state.members[id] {
-                var name = id
-                if let displayName = profile.displayName {
-                    name = "@\(displayName)"
-                }
-                pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: name)
+                pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: PillUtilities.userPillDisplayText(username: profile.displayName, userID: id))
             } else {
                 pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: id)
                 pillContext.cancellable = context.$viewState
@@ -854,49 +850,29 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
                         guard let pillContext else {
                             return
                         }
-                        
-                        var name = id
-                        if let displayName = profile.displayName {
-                            name = "@\(displayName)"
-                        }
-                        pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: name)
+                        pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: PillUtilities.userPillDisplayText(username: profile.displayName, userID: id))
                         pillContext.cancellable = nil
                     }
             }
         case .allUsers:
-            pillContext.viewState = .mention(isOwnMention: true, displayText: PillConstants.atRoom)
+            pillContext.viewState = .mention(isOwnMention: true, displayText: PillUtilities.atRoom)
         case .event(let room):
-            var pillViewState: PillViewState = .reference(avatar: .link, displayText: L10n.screenRoomEventPill(L10n.commonRoom))
-            defer {
-                pillContext.viewState = pillViewState
-            }
-            
+            let pillViewState: PillViewState
             switch room {
             case .roomAlias(let alias):
-                guard let roomSummary = clientProxy.roomSummaryForAlias(alias) else {
-                    return
-                }
-                // We always show the link image for event permalinks
-                pillViewState = .reference(avatar: .link, displayText: L10n.screenRoomEventPill(roomSummary.name))
+                let roomSummary = clientProxy.roomSummaryForAlias(alias)
+                pillViewState = .reference(displayText: PillUtilities.eventPillDisplayText(roomName: roomSummary?.name, rawRoomText: alias))
             case .roomID(let id):
-                guard let roomSummary = clientProxy.roomSummaryForIdentifier(id) else {
-                    return
-                }
-                // We always show the link image for event permalinks
-                pillViewState = .reference(avatar: .link, displayText: L10n.screenRoomEventPill(roomSummary.name))
+                let roomSummary = clientProxy.roomSummaryForIdentifier(id)
+                pillViewState = .reference(displayText: PillUtilities.eventPillDisplayText(roomName: roomSummary?.name, rawRoomText: id))
             }
+            pillContext.viewState = pillViewState
         case .roomAlias(let alias):
-            guard let roomSummary = clientProxy.roomSummaryForAlias(alias) else {
-                pillContext.viewState = .reference(avatar: .link, displayText: alias)
-                return
-            }
-            pillContext.viewState = .reference(avatar: .roomAvatar(roomSummary.avatar), displayText: roomSummary.name)
+            let roomSummary = clientProxy.roomSummaryForAlias(alias)
+            pillContext.viewState = .reference(displayText: PillUtilities.roomPillDisplayText(roomName: roomSummary?.name, rawRoomText: alias))
         case .roomID(let id):
-            guard let roomSummary = clientProxy.roomSummaryForIdentifier(id) else {
-                pillContext.viewState = .reference(avatar: .link, displayText: id)
-                return
-            }
-            pillContext.viewState = .reference(avatar: .roomAvatar(roomSummary.avatar), displayText: roomSummary.name)
+            let roomSummary = clientProxy.roomSummaryForIdentifier(id)
+            pillContext.viewState = .reference(displayText: PillUtilities.roomPillDisplayText(roomName: roomSummary?.name, rawRoomText: id))
         }
     }
     

ElementX/Sources/Screens/Timeline/View/Replies/TimelineReplyView.swift

@@ -198,7 +198,7 @@ struct TimelineReplyView: View {
                 }
                 
                 if attributes[.MatrixAllUsersMention] as? Bool == true {
-                    attributedString.replaceCharacters(in: range, with: PillConstants.atRoom)
+                    attributedString.replaceCharacters(in: range, with: PillUtilities.atRoom)
                 }
             }
             return attributedString.string