ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the unused media provider from the PillView.

Browse Source
This commit is contained in:
Doug
2025-09-03 16:33:51 +01:00
committed by Doug
parent 86f978a439
commit e33631affa
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
+1 -4
View File
@@ -42,20 +42,17 @@ final class PillAttachmentViewProvider: NSTextAttachmentViewProvider, NSSecureCo
} }
let context: PillContext let context: PillContext
let mediaProvider: MediaProviderProtocol?
if ProcessInfo.isXcodePreview || ProcessInfo.isRunningTests { if ProcessInfo.isXcodePreview || ProcessInfo.isRunningTests {
// The mock viewModel simulates the loading logic for testing purposes // The mock viewModel simulates the loading logic for testing purposes
context = PillContext.mock(viewState: .mention(isOwnMention: false, displayText: "Alice"), delay: .seconds(2)) context = PillContext.mock(viewState: .mention(isOwnMention: false, displayText: "Alice"), delay: .seconds(2))
mediaProvider = MediaProviderMock(configuration: .init())
} else if let timelineContext = delegate?.timelineContext { } else if let timelineContext = delegate?.timelineContext {
context = PillContext(timelineContext: timelineContext, data: pillData) context = PillContext(timelineContext: timelineContext, data: pillData)
mediaProvider = timelineContext.mediaProvider
} else { } else {
MXLog.failure("Missing room context") MXLog.failure("Missing room context")
return return
} }
let view = PillView(mediaProvider: mediaProvider, context: context) { [weak self] in let view = PillView(context: context) { [weak self] in
self?.delegate?.invalidateTextAttachmentsDisplay() self?.delegate?.invalidateTextAttachmentsDisplay()
} }
let controller = UIHostingController(rootView: view) let controller = UIHostingController(rootView: view)
ElementX/Sources/Other/Pills/PillView.swift
+8 -17
View File
@@ -9,7 +9,6 @@ import Compound
import SwiftUI import SwiftUI
struct PillView: View { struct PillView: View {
let mediaProvider: MediaProviderProtocol?
@ObservedObject var context: PillContext @ObservedObject var context: PillContext
/// callback triggerd by changes in the display text /// callback triggerd by changes in the display text
let didChangeText: () -> Void let didChangeText: () -> Void
@@ -46,44 +45,36 @@ struct PillView_Previews: PreviewProvider, TestablePreview {
static let mockMediaProvider = MediaProviderMock(configuration: .init()) static let mockMediaProvider = MediaProviderMock(configuration: .init())
static var previews: some View { static var previews: some View {
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false,
context: PillContext.mock(viewState: .mention(isOwnMention: false,
displayText: PillUtilities.userPillDisplayText(username: "User", displayText: PillUtilities.userPillDisplayText(username: "User",
userID: "@alice:matrix.org")))) { } userID: "@alice:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("User") .previewDisplayName("User")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false,
context: PillContext.mock(viewState: .mention(isOwnMention: false,
displayText: PillUtilities.userPillDisplayText(username: "Alice but with a very long name", displayText: PillUtilities.userPillDisplayText(username: "Alice but with a very long name",
userID: "@alice:matrix.org")))) { } userID: "@alice:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("User with a long name") .previewDisplayName("User with a long name")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false,
context: PillContext.mock(viewState: .mention(isOwnMention: false,
displayText: PillUtilities.userPillDisplayText(username: nil, userID: "@alice:matrix.org")))) { } displayText: PillUtilities.userPillDisplayText(username: nil, userID: "@alice:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("User with missing name") .previewDisplayName("User with missing name")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .mention(isOwnMention: true,
context: PillContext.mock(viewState: .mention(isOwnMention: true,
displayText: PillUtilities.userPillDisplayText(username: "Alice", userID: "@alice:matrix.org")))) { } displayText: PillUtilities.userPillDisplayText(username: "Alice", userID: "@alice:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("Own user") .previewDisplayName("Own user")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .reference(displayText: PillUtilities.roomPillDisplayText(roomName: "Room",
context: PillContext.mock(viewState: .reference(displayText: PillUtilities.roomPillDisplayText(roomName: "Room",
rawRoomText: "#room:matrix.org")))) { } rawRoomText: "#room:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("Room") .previewDisplayName("Room")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .reference(displayText: PillUtilities.roomPillDisplayText(roomName: nil,
context: PillContext.mock(viewState: .reference(displayText: PillUtilities.roomPillDisplayText(roomName: nil,
rawRoomText: "#room:matrix.org")))) { } rawRoomText: "#room:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("Room without name") .previewDisplayName("Room without name")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .reference(displayText: PillUtilities.eventPillDisplayText(roomName: "Room", rawRoomText: "#room:matrix.org")))) { }
context: PillContext.mock(viewState: .reference(displayText: PillUtilities.eventPillDisplayText(roomName: "Room", rawRoomText: "#room:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("Message link") .previewDisplayName("Message link")
PillView(mediaProvider: mockMediaProvider, PillView(context: PillContext.mock(viewState: .reference(displayText: PillUtilities.eventPillDisplayText(roomName: nil, rawRoomText: "#room:matrix.org")))) { }
context: PillContext.mock(viewState: .reference(displayText: PillUtilities.eventPillDisplayText(roomName: nil, rawRoomText: "#room:matrix.org")))) { }
.frame(maxWidth: PillUtilities.mockMaxWidth) .frame(maxWidth: PillUtilities.mockMaxWidth)
.previewDisplayName("Message link without room name") .previewDisplayName("Message link without room name")
} }
ElementX/Sources/Other/Pills/PillViewOnBubblePreviews.swift
+2 -3
View File
@@ -10,7 +10,6 @@ import SwiftUI
/// A very simple mock layout of some pills within messages bubbles and the composer. /// A very simple mock layout of some pills within messages bubbles and the composer.
struct PillViewOnBubble_Previews: PreviewProvider, TestablePreview { struct PillViewOnBubble_Previews: PreviewProvider, TestablePreview {
static let mockMediaProvider = MediaProviderMock(configuration: .init())
static let mentionContext = PillContext.mock(viewState: makeViewState(isOwnMention: false)) static let mentionContext = PillContext.mock(viewState: makeViewState(isOwnMention: false))
static let ownMentionContext = PillContext.mock(viewState: makeViewState(isOwnMention: true)) static let ownMentionContext = PillContext.mock(viewState: makeViewState(isOwnMention: true))
@@ -40,8 +39,8 @@ struct PillViewOnBubble_Previews: PreviewProvider, TestablePreview {
static var mockMessage: some View { static var mockMessage: some View {
HStack(spacing: 4) { HStack(spacing: 4) {
Text("Hello").foregroundStyle(.compound.textPrimary) Text("Hello").foregroundStyle(.compound.textPrimary)
PillView(mediaProvider: mockMediaProvider, context: mentionContext) { } PillView(context: mentionContext) { }
PillView(mediaProvider: mockMediaProvider, context: ownMentionContext) { } PillView(context: ownMentionContext) { }
} }
} }