tests done!

ElementX/Sources/Application/AppSettings.swift

@@ -41,6 +41,7 @@ final class AppSettings {
         case hasShownWelcomeScreen
         case swiftUITimelineEnabled
         case voiceMessageEnabled
+        case mentionsEnabled
     }
 
     private static var suiteName: String = InfoPlistReader.main.appGroupIdentifier
@@ -248,4 +249,7 @@ final class AppSettings {
 
     @UserPreference(key: UserDefaultsKeys.voiceMessageEnabled, defaultValue: false, storageType: .userDefaults(store))
     var voiceMessageEnabled
+
+    @UserPreference(key: UserDefaultsKeys.mentionsEnabled, defaultValue: false, storageType: .userDefaults(store))
+    var mentionsEnabled
 }

ElementX/Sources/Other/Pills/MentionBuilder.swift

@@ -19,6 +19,11 @@ import UIKit
 
 extension AttributedStringBuilder: MentionBuilder {
     func handleUserMention(for attributedString: NSMutableAttributedString, in range: NSRange, url: URL, userID: String) {
+        guard ServiceLocator.shared.settings.mentionsEnabled else {
+            attributedString.addAttributes([.MatrixUserID: userID], range: range)
+            return
+        }
+
         let font = attributedString.attribute(.font, at: 0, longestEffectiveRange: nil, in: range) as? UIFont ?? UIFont.preferredFont(forTextStyle: .body)
         let attachmentData = PillTextAttachmentData(type: .user(userId: userID), font: font)
         guard let attachment = PillTextAttachment(attachmentData: attachmentData) else {

ElementX/Sources/Other/Pills/MessageText.swift

@@ -41,9 +41,9 @@ final class MessageTextView: UITextView {
     }
 
     // Required to setup the first rendering of the pill view
-    override func willMove(toWindow newWindow: UIWindow?) {
+    override func layoutSubviews() {
         invalidateTextAttachmentsDisplay(update: false)
-        super.willMove(toWindow: newWindow)
+        super.layoutSubviews()
     }
 }
 
@@ -132,7 +132,7 @@ struct MessageText_Previews: PreviewProvider, TestablePreview {
             return AttributedString()
         }
 
-        var attributedString = "Hello test test test" + AttributedString(NSAttributedString(attachment: attachment)) + " World!"
+        var attributedString = "Hello test test test " + AttributedString(NSAttributedString(attachment: attachment)) + " World!"
         attributedString
             .mergeAttributes(defaultFontContainer)
         return attributedString
@@ -166,9 +166,6 @@ struct MessageText_Previews: PreviewProvider, TestablePreview {
             .previewDisplayName("SwiftUI Default Text")
         attachmentPreview
             .previewDisplayName("Custom Attachment")
-        attachmentPreview
-            .previewDisplayName("Custom Attachment 2")
-            .snapshot(delay: 5)
         if let attributedString = attributedStringBuilder.fromHTML(htmlStringWithQuote) {
             MessageText(attributedString: attributedString)
                 .border(Color.purple)

ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift

@@ -44,16 +44,19 @@ final class PillAttachmentViewProvider: NSTextAttachmentViewProvider {
         }
 
         let viewModel: PillViewModel
-        if isXcodePreview {
+        let imageProvider: ImageProviderProtocol?
+        if isXcodePreview || Tests.isRunningTests {
             viewModel = PillViewModel.mockViewModel(type: .loadUser)
+            imageProvider = MockMediaProvider()
         } else if let roomContext = messageTextView?.roomContext {
             viewModel = PillViewModel(roomContext: roomContext, data: textAttachmentData)
+            imageProvider = Self.currentSession?.mediaProvider
         } else {
             MXLog.failure("[PillAttachmentViewProvider]: missing room context")
             return
         }
 
-        let view = PillView(imageProvider: Self.currentSession?.mediaProvider, viewModel: viewModel) { [weak self] in
+        let view = PillView(imageProvider: imageProvider, viewModel: viewModel) { [weak self] in
             self?.messageTextView?.invalidateTextAttachmentsDisplay(update: true)
         }
         let controller = UIHostingController(rootView: view)

ElementX/Sources/Other/Pills/PillView.swift

@@ -52,9 +52,6 @@ struct PillView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         loading
             .previewDisplayName("Loading")
-        loading
-            .previewDisplayName("Loading 2")
-            .snapshot(delay: 5)
         PillView(imageProvider: mockMediaProvider,
                  viewModel: PillViewModel.mockViewModel(type: .loadedUser)) { }
             .previewDisplayName("Loaded Long")

ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift

@@ -234,6 +234,7 @@ private struct PreviewBubbleModifier: ViewModifier {
             .padding(timelineStyle == .bubbles ? 8 : 0)
             .background(timelineStyle == .bubbles ? Color.compound._bgBubbleOutgoing : nil)
             .cornerRadius(timelineStyle == .bubbles ? 12 : 0)
+            .environmentObject(RoomScreenViewModel.mock.context)
     }
 }
 

ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift

@@ -50,6 +50,7 @@ protocol DeveloperOptionsProtocol: AnyObject {
     var readReceiptsEnabled: Bool { get set }
     var swiftUITimelineEnabled: Bool { get set }
     var voiceMessageEnabled: Bool { get set }
+    var mentionsEnabled: Bool { get set }
 }
 
 extension AppSettings: DeveloperOptionsProtocol { }

ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift

@@ -45,6 +45,11 @@ struct DeveloperOptionsScreen: View {
                     Text("SwiftUI Timeline")
                     Text("Resets on reboot")
                 }
+
+                Toggle(isOn: $context.mentionsEnabled) {
+                    Text("Show user mentions")
+                    Text("Requires app reboot")
+                }
             }
 
             Section("Room creation") {

ElementX/Sources/UnitTests/UnitTestsAppCoordinator.swift

@@ -29,6 +29,7 @@ class UnitTestsAppCoordinator: AppCoordinatorProtocol {
         ServiceLocator.shared.register(analytics: AnalyticsService(client: AnalyticsClientMock(),
                                                                    appSettings: ServiceLocator.shared.settings,
                                                                    bugReportService: ServiceLocator.shared.bugReportService))
+        NSTextAttachment.registerViewProviderClass(PillAttachmentViewProvider.self, forFileType: InfoPlistReader.main.pillsUTType)
     }
 
     func start() { }