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

Automatically try reloading failed images on network changes (#3170)

Browse Source 
* Add the networkMonitor to the NSE and delete the old MockMediaLoader

* Generate a MediaLoaderMock through AutoMockable and use it in the MediaProviderTests

* Implement an ImageProvider mechanism that automatically tries reloading images when connectivity is established again and use it for LoadableImages

* Merge the ImageProvider protocol back into the MediaProvider

* Address PR review comments

* Provide a default sdk client request configuration

* Address tasks not automatically cancelling themselves when views get deallocated
This commit is contained in:
Stefan Ceriu
2024-08-15 18:20:19 +03:00
committed by GitHub
parent cf35056c78
commit f89c3e54b4
92 changed files with 618 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
+1 -1
View File
@@ -666,7 +666,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
private func presentRoomDirectorySearch() {
let coordinator = RoomDirectorySearchScreenCoordinator(parameters: .init(clientProxy: userSession.clientProxy,
imageProvider: userSession.mediaProvider,
mediaProvider: userSession.mediaProvider,
userIndicatorController: ServiceLocator.shared.userIndicatorController))
coordinator.actionsPublisher.sink { [weak self] action in
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+225
View File
@@ -5816,6 +5816,231 @@ class KeychainControllerMock: KeychainControllerProtocol {
removePINCodeBiometricStateClosure?()
}
}
class MediaLoaderMock: MediaLoaderProtocol {
//MARK: - loadMediaContentForSource
var loadMediaContentForSourceThrowableError: Error?
var loadMediaContentForSourceUnderlyingCallsCount = 0
var loadMediaContentForSourceCallsCount: Int {
get {
if Thread.isMainThread {
return loadMediaContentForSourceUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = loadMediaContentForSourceUnderlyingCallsCount
}
return returnValue!
}
}
set {
if Thread.isMainThread {
loadMediaContentForSourceUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
loadMediaContentForSourceUnderlyingCallsCount = newValue
}
}
}
}
var loadMediaContentForSourceCalled: Bool {
return loadMediaContentForSourceCallsCount > 0
}
var loadMediaContentForSourceReceivedSource: MediaSourceProxy?
var loadMediaContentForSourceReceivedInvocations: [MediaSourceProxy] = []
var loadMediaContentForSourceUnderlyingReturnValue: Data!
var loadMediaContentForSourceReturnValue: Data! {
get {
if Thread.isMainThread {
return loadMediaContentForSourceUnderlyingReturnValue
} else {
var returnValue: Data? = nil
DispatchQueue.main.sync {
returnValue = loadMediaContentForSourceUnderlyingReturnValue
}
return returnValue!
}
}
set {
if Thread.isMainThread {
loadMediaContentForSourceUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
loadMediaContentForSourceUnderlyingReturnValue = newValue
}
}
}
}
var loadMediaContentForSourceClosure: ((MediaSourceProxy) async throws -> Data)?
func loadMediaContentForSource(_ source: MediaSourceProxy) async throws -> Data {
if let error = loadMediaContentForSourceThrowableError {
throw error
}
loadMediaContentForSourceCallsCount += 1
loadMediaContentForSourceReceivedSource = source
DispatchQueue.main.async {
self.loadMediaContentForSourceReceivedInvocations.append(source)
}
if let loadMediaContentForSourceClosure = loadMediaContentForSourceClosure {
return try await loadMediaContentForSourceClosure(source)
} else {
return loadMediaContentForSourceReturnValue
}
}
//MARK: - loadMediaThumbnailForSource
var loadMediaThumbnailForSourceWidthHeightThrowableError: Error?
var loadMediaThumbnailForSourceWidthHeightUnderlyingCallsCount = 0
var loadMediaThumbnailForSourceWidthHeightCallsCount: Int {
get {
if Thread.isMainThread {
return loadMediaThumbnailForSourceWidthHeightUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = loadMediaThumbnailForSourceWidthHeightUnderlyingCallsCount
}
return returnValue!
}
}
set {
if Thread.isMainThread {
loadMediaThumbnailForSourceWidthHeightUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
loadMediaThumbnailForSourceWidthHeightUnderlyingCallsCount = newValue
}
}
}
}
var loadMediaThumbnailForSourceWidthHeightCalled: Bool {
return loadMediaThumbnailForSourceWidthHeightCallsCount > 0
}
var loadMediaThumbnailForSourceWidthHeightReceivedArguments: (source: MediaSourceProxy, width: UInt, height: UInt)?
var loadMediaThumbnailForSourceWidthHeightReceivedInvocations: [(source: MediaSourceProxy, width: UInt, height: UInt)] = []
var loadMediaThumbnailForSourceWidthHeightUnderlyingReturnValue: Data!
var loadMediaThumbnailForSourceWidthHeightReturnValue: Data! {
get {
if Thread.isMainThread {
return loadMediaThumbnailForSourceWidthHeightUnderlyingReturnValue
} else {
var returnValue: Data? = nil
DispatchQueue.main.sync {
returnValue = loadMediaThumbnailForSourceWidthHeightUnderlyingReturnValue
}
return returnValue!
}
}
set {
if Thread.isMainThread {
loadMediaThumbnailForSourceWidthHeightUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
loadMediaThumbnailForSourceWidthHeightUnderlyingReturnValue = newValue
}
}
}
}
var loadMediaThumbnailForSourceWidthHeightClosure: ((MediaSourceProxy, UInt, UInt) async throws -> Data)?
func loadMediaThumbnailForSource(_ source: MediaSourceProxy, width: UInt, height: UInt) async throws -> Data {
if let error = loadMediaThumbnailForSourceWidthHeightThrowableError {
throw error
}
loadMediaThumbnailForSourceWidthHeightCallsCount += 1
loadMediaThumbnailForSourceWidthHeightReceivedArguments = (source: source, width: width, height: height)
DispatchQueue.main.async {
self.loadMediaThumbnailForSourceWidthHeightReceivedInvocations.append((source: source, width: width, height: height))
}
if let loadMediaThumbnailForSourceWidthHeightClosure = loadMediaThumbnailForSourceWidthHeightClosure {
return try await loadMediaThumbnailForSourceWidthHeightClosure(source, width, height)
} else {
return loadMediaThumbnailForSourceWidthHeightReturnValue
}
}
//MARK: - loadMediaFileForSource
var loadMediaFileForSourceBodyThrowableError: Error?
var loadMediaFileForSourceBodyUnderlyingCallsCount = 0
var loadMediaFileForSourceBodyCallsCount: Int {
get {
if Thread.isMainThread {
return loadMediaFileForSourceBodyUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = loadMediaFileForSourceBodyUnderlyingCallsCount
}
return returnValue!
}
}
set {
if Thread.isMainThread {
loadMediaFileForSourceBodyUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
loadMediaFileForSourceBodyUnderlyingCallsCount = newValue
}
}
}
}
var loadMediaFileForSourceBodyCalled: Bool {
return loadMediaFileForSourceBodyCallsCount > 0
}
var loadMediaFileForSourceBodyReceivedArguments: (source: MediaSourceProxy, body: String?)?
var loadMediaFileForSourceBodyReceivedInvocations: [(source: MediaSourceProxy, body: String?)] = []
var loadMediaFileForSourceBodyUnderlyingReturnValue: MediaFileHandleProxy!
var loadMediaFileForSourceBodyReturnValue: MediaFileHandleProxy! {
get {
if Thread.isMainThread {
return loadMediaFileForSourceBodyUnderlyingReturnValue
} else {
var returnValue: MediaFileHandleProxy? = nil
DispatchQueue.main.sync {
returnValue = loadMediaFileForSourceBodyUnderlyingReturnValue
}
return returnValue!
}
}
set {
if Thread.isMainThread {
loadMediaFileForSourceBodyUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
loadMediaFileForSourceBodyUnderlyingReturnValue = newValue
}
}
}
}
var loadMediaFileForSourceBodyClosure: ((MediaSourceProxy, String?) async throws -> MediaFileHandleProxy)?
func loadMediaFileForSource(_ source: MediaSourceProxy, body: String?) async throws -> MediaFileHandleProxy {
if let error = loadMediaFileForSourceBodyThrowableError {
throw error
}
loadMediaFileForSourceBodyCallsCount += 1
loadMediaFileForSourceBodyReceivedArguments = (source: source, body: body)
DispatchQueue.main.async {
self.loadMediaFileForSourceBodyReceivedInvocations.append((source: source, body: body))
}
if let loadMediaFileForSourceBodyClosure = loadMediaFileForSourceBodyClosure {
return try await loadMediaFileForSourceBodyClosure(source, body)
} else {
return loadMediaFileForSourceBodyReturnValue
}
}
}
class MediaPlayerMock: MediaPlayerProtocol {
var mediaSource: MediaSourceProxy?
var duration: TimeInterval {
ElementX/Sources/Other/Extensions/ClientBuilder.swift
+1
View File
@@ -29,6 +29,7 @@ extension ClientBuilder {
.slidingSyncProxy(slidingSyncProxy: slidingSyncProxy?.absoluteString)
.enableCrossProcessRefreshLock(processId: InfoPlistReader.main.bundleIdentifier, sessionDelegate: sessionDelegate)
.userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent())
.requestConfig(config: .init(retryLimit: 0, timeout: 15000, maxConcurrentRequests: nil, retryTimeout: nil))
builder = switch slidingSync {
case .restored: builder
ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
+4 -4
View File
@@ -51,20 +51,20 @@ final class PillAttachmentViewProvider: NSTextAttachmentViewProvider, NSSecureCo
}
let context: PillContext
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
if ProcessInfo.isXcodePreview || ProcessInfo.isRunningTests {
// The mock viewModel simulates the loading logic for testing purposes
context = PillContext.mock(type: .loadUser(isOwn: false))
imageProvider = MockMediaProvider()
mediaProvider = MockMediaProvider()
} else if let timelineContext = delegate?.timelineContext {
context = PillContext(timelineContext: timelineContext, data: pillData)
imageProvider = timelineContext.imageProvider
mediaProvider = timelineContext.mediaProvider
} else {
MXLog.failure("[PillAttachmentViewProvider]: missing room context")
return
}
let view = PillView(imageProvider: imageProvider, context: context) { [weak self] in
let view = PillView(mediaProvider: mediaProvider, context: context) { [weak self] in
self?.delegate?.invalidateTextAttachmentsDisplay()
}
let controller = UIHostingController(rootView: view)
ElementX/Sources/Other/Pills/PillView.swift
+6 -6
View File
@@ -17,7 +17,7 @@
import SwiftUI
struct PillView: View {
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
@ObservedObject var context: PillContext
/// callback triggerd by changes in the display text
let didChangeText: () -> Void
@@ -49,23 +49,23 @@ struct PillView_Previews: PreviewProvider, TestablePreview {
static let mockMediaProvider = MockMediaProvider()
static var previews: some View {
PillView(imageProvider: mockMediaProvider,
PillView(mediaProvider: mockMediaProvider,
context: PillContext.mock(type: .loadUser(isOwn: false))) { }
.frame(maxWidth: PillConstants.mockMaxWidth)
.previewDisplayName("Loading")
PillView(imageProvider: mockMediaProvider,
PillView(mediaProvider: mockMediaProvider,
context: PillContext.mock(type: .loadUser(isOwn: true))) { }
.frame(maxWidth: PillConstants.mockMaxWidth)
.previewDisplayName("Loading Own")
PillView(imageProvider: mockMediaProvider,
PillView(mediaProvider: mockMediaProvider,
context: PillContext.mock(type: .loadedUser(isOwn: false))) { }
.frame(maxWidth: PillConstants.mockMaxWidth)
.previewDisplayName("Loaded Long")
PillView(imageProvider: mockMediaProvider,
PillView(mediaProvider: mockMediaProvider,
context: PillContext.mock(type: .loadedUser(isOwn: true))) { }
.frame(maxWidth: PillConstants.mockMaxWidth)
.previewDisplayName("Loaded Long Own")
PillView(imageProvider: mockMediaProvider,
PillView(mediaProvider: mockMediaProvider,
context: PillContext.mock(type: .allUsers)) { }
.frame(maxWidth: PillConstants.mockMaxWidth)
.previewDisplayName("All Users")
ElementX/Sources/Other/SwiftUI/ViewModel/StateStoreViewModel.swift
+5 -5
View File
@@ -38,8 +38,8 @@ class StateStoreViewModel<State: BindableState, ViewAction> {
set { context.viewState = newValue }
}
init(initialViewState: State, imageProvider: ImageProviderProtocol? = nil) {
context = Context(initialViewState: initialViewState, imageProvider: imageProvider)
init(initialViewState: State, mediaProvider: MediaProviderProtocol? = nil) {
context = Context(initialViewState: initialViewState, mediaProvider: mediaProvider)
context.viewModel = self
}
@@ -73,7 +73,7 @@ class StateStoreViewModel<State: BindableState, ViewAction> {
/// An optional image loading service so that views can manage themselves
/// Intentionally non-generic so that it doesn't grow uncontrollably
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
/// Set-able/Bindable access to the bindable state.
subscript<T>(dynamicMember keyPath: WritableKeyPath<State.BindStateType, T>) -> T {
@@ -87,9 +87,9 @@ class StateStoreViewModel<State: BindableState, ViewAction> {
viewModel?.process(viewAction: viewAction)
}
fileprivate init(initialViewState: State, imageProvider: ImageProviderProtocol?) {
fileprivate init(initialViewState: State, mediaProvider: MediaProviderProtocol?) {
self.viewState = initialViewState
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
}
}
}
ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
+15 -15
View File
@@ -33,13 +33,13 @@ struct AvatarHeaderView<Footer: View>: View {
private let badges: [Badge]
private let avatarSize: AvatarSize
private let imageProvider: ImageProviderProtocol?
private let mediaProvider: MediaProviderProtocol?
private var onAvatarTap: (() -> Void)?
@ViewBuilder private var footer: () -> Footer
init(room: RoomDetails,
avatarSize: AvatarSize,
imageProvider: ImageProviderProtocol? = nil,
mediaProvider: MediaProviderProtocol? = nil,
onAvatarTap: (() -> Void)? = nil,
@ViewBuilder footer: @escaping () -> Footer) {
avatarInfo = .room(room.avatar)
@@ -47,7 +47,7 @@ struct AvatarHeaderView<Footer: View>: View {
subtitle = room.canonicalAlias
self.avatarSize = avatarSize
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
self.onAvatarTap = onAvatarTap
self.footer = footer
@@ -61,7 +61,7 @@ struct AvatarHeaderView<Footer: View>: View {
init(accountOwner: RoomMemberDetails,
dmRecipient: RoomMemberDetails,
imageProvider: ImageProviderProtocol? = nil,
mediaProvider: MediaProviderProtocol? = nil,
onAvatarTap: (() -> Void)? = nil,
@ViewBuilder footer: @escaping () -> Footer) {
let dmRecipientProfile = UserProfileProxy(member: dmRecipient)
@@ -70,7 +70,7 @@ struct AvatarHeaderView<Footer: View>: View {
subtitle = dmRecipientProfile.displayName == nil ? nil : dmRecipientProfile.userID
avatarSize = .user(on: .dmDetails)
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
self.onAvatarTap = onAvatarTap
self.footer = footer
// In EL-X a DM is by definition always encrypted
@@ -79,21 +79,21 @@ struct AvatarHeaderView<Footer: View>: View {
init(member: RoomMemberDetails,
avatarSize: AvatarSize,
imageProvider: ImageProviderProtocol? = nil,
mediaProvider: MediaProviderProtocol? = nil,
onAvatarTap: (() -> Void)? = nil,
@ViewBuilder footer: @escaping () -> Footer) {
let profile = UserProfileProxy(member: member)
self.init(user: profile,
avatarSize: avatarSize,
imageProvider: imageProvider,
mediaProvider: mediaProvider,
onAvatarTap: onAvatarTap,
footer: footer)
}
init(user: UserProfileProxy,
avatarSize: AvatarSize,
imageProvider: ImageProviderProtocol? = nil,
mediaProvider: MediaProviderProtocol? = nil,
onAvatarTap: (() -> Void)? = nil,
@ViewBuilder footer: @escaping () -> Footer) {
avatarInfo = .user(user)
@@ -101,7 +101,7 @@ struct AvatarHeaderView<Footer: View>: View {
subtitle = user.displayName == nil ? nil : user.userID
self.avatarSize = avatarSize
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
self.onAvatarTap = onAvatarTap
self.footer = footer
badges = []
@@ -136,13 +136,13 @@ struct AvatarHeaderView<Footer: View>: View {
case .room(let roomAvatar):
RoomAvatarImage(avatar: roomAvatar,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
case .user(let userProfile):
LoadableAvatarImage(url: userProfile.avatarURL,
name: userProfile.displayName,
contentID: userProfile.userID,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
}
}
@@ -199,7 +199,7 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
isEncrypted: true,
isPublic: true),
avatarSize: .room(on: .details),
imageProvider: MockMediaProvider()) {
mediaProvider: MockMediaProvider()) {
HStack(spacing: 32) {
ShareLink(item: "test") {
Image(systemName: "square.and.arrow.up")
@@ -213,7 +213,7 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
Form {
AvatarHeaderView(accountOwner: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockMe), dmRecipient: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockAlice),
imageProvider: MockMediaProvider()) {
mediaProvider: MockMediaProvider()) {
HStack(spacing: 32) {
ShareLink(item: "test") {
Image(systemName: "square.and.arrow.up")
@@ -228,11 +228,11 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
VStack(spacing: 16) {
AvatarHeaderView(member: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockAlice),
avatarSize: .room(on: .details),
imageProvider: MockMediaProvider()) { Text("") }
mediaProvider: MockMediaProvider()) { Text("") }
AvatarHeaderView(member: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockBanned[3]),
avatarSize: .room(on: .details),
imageProvider: MockMediaProvider()) { Text("") }
mediaProvider: MockMediaProvider()) { Text("") }
}
.padding()
.background(Color.compound.bgSubtleSecondaryLevel0)
ElementX/Sources/Other/SwiftUI/Views/LoadableAvatarImage.swift
+4 -4
View File
@@ -21,16 +21,16 @@ struct LoadableAvatarImage: View {
private let name: String?
private let contentID: String?
private let avatarSize: AvatarSize
private let imageProvider: ImageProviderProtocol?
private let mediaProvider: MediaProviderProtocol?
@ScaledMetric private var frameSize: CGFloat
init(url: URL?, name: String?, contentID: String?, avatarSize: AvatarSize, imageProvider: ImageProviderProtocol?) {
init(url: URL?, name: String?, contentID: String?, avatarSize: AvatarSize, mediaProvider: MediaProviderProtocol?) {
self.url = url
self.name = name
self.contentID = contentID
self.avatarSize = avatarSize
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
_frameSize = ScaledMetric(wrappedValue: avatarSize.value)
}
@@ -48,7 +48,7 @@ struct LoadableAvatarImage: View {
LoadableImage(url: url,
mediaType: .avatar,
size: avatarSize.scaledSize,
imageProvider: imageProvider) { image in
mediaProvider: mediaProvider) { image in
image
.scaledToFill()
} placeholder: {
ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift
+43 -24
View File
@@ -14,6 +14,7 @@
// limitations under the License.
//
import Combine
import Kingfisher
import SwiftUI
@@ -28,7 +29,7 @@ struct LoadableImage<TransformerView: View, PlaceholderView: View>: View {
private let mediaType: LoadableImageMediaType
private let blurhash: String?
private let size: CGSize?
private let imageProvider: ImageProviderProtocol?
private let mediaProvider: MediaProviderProtocol?
private let transformer: (AnyView) -> TransformerView
private let placeholder: () -> PlaceholderView
@@ -44,14 +45,14 @@ struct LoadableImage<TransformerView: View, PlaceholderView: View>: View {
mediaType: LoadableImageMediaType = .generic,
blurhash: String? = nil,
size: CGSize? = nil,
imageProvider: ImageProviderProtocol?,
mediaProvider: MediaProviderProtocol?,
transformer: @escaping (AnyView) -> TransformerView = { $0 },
placeholder: @escaping () -> PlaceholderView) {
self.mediaSource = mediaSource
self.mediaType = mediaType
self.blurhash = blurhash
self.size = size
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
self.transformer = transformer
self.placeholder = placeholder
}
@@ -60,14 +61,14 @@ struct LoadableImage<TransformerView: View, PlaceholderView: View>: View {
mediaType: LoadableImageMediaType = .generic,
blurhash: String? = nil,
size: CGSize? = nil,
imageProvider: ImageProviderProtocol?,
mediaProvider: MediaProviderProtocol?,
transformer: @escaping (AnyView) -> TransformerView = { $0 },
placeholder: @escaping () -> PlaceholderView) {
self.init(mediaSource: MediaSourceProxy(url: url, mimeType: nil),
mediaType: mediaType,
blurhash: blurhash,
size: size,
imageProvider: imageProvider,
mediaProvider: mediaProvider,
transformer: transformer,
placeholder: placeholder)
}
@@ -77,7 +78,7 @@ struct LoadableImage<TransformerView: View, PlaceholderView: View>: View {
mediaType: mediaType,
blurhash: blurhash,
size: size,
imageProvider: imageProvider,
mediaProvider: mediaProvider,
transformer: transformer,
placeholder: placeholder)
// Binds the lifecycle of the LoadableImage to the associated URL.
@@ -99,28 +100,20 @@ private struct LoadableImageContent<TransformerView: View, PlaceholderView: View
mediaType: LoadableImageMediaType,
blurhash: String? = nil,
size: CGSize? = nil,
imageProvider: ImageProviderProtocol?,
mediaProvider: MediaProviderProtocol?,
transformer: @escaping (AnyView) -> TransformerView,
placeholder: @escaping () -> PlaceholderView) {
assert(imageProvider != nil, "Missing image provider, make sure one has been supplied to the view model.")
assert(mediaProvider != nil, "Missing image provider, make sure one has been supplied to the view model.")
self.mediaSource = mediaSource
self.mediaType = mediaType
self.blurhash = blurhash
self.transformer = transformer
self.placeholder = placeholder
_contentLoader = StateObject(wrappedValue: ContentLoader(mediaSource: mediaSource, size: size, imageProvider: imageProvider))
_contentLoader = StateObject(wrappedValue: ContentLoader(mediaSource: mediaSource, size: size, mediaProvider: mediaProvider))
}
var body: some View {
let _ = Task {
guard contentLoader.content == nil else {
return
}
await contentLoader.load()
}
ZStack {
switch contentLoader.content {
case .image(let image):
@@ -140,6 +133,20 @@ private struct LoadableImageContent<TransformerView: View, PlaceholderView: View
}
}
.animation(mediaType == .avatar ? .noAnimation : .elementDefault, value: contentLoader.content)
.task(id: mediaSource) {
guard contentLoader.content == nil else {
return
}
await contentLoader.load()
}
.onDisappear {
guard contentLoader.content == nil else {
return
}
contentLoader.cancel()
}
}
// MARK: - ImageDataProvider
@@ -163,9 +170,10 @@ private class ContentLoader: ObservableObject {
case gifData(Data)
}
private let imageProvider: ImageProviderProtocol?
private let mediaProvider: MediaProviderProtocol?
private let mediaSource: MediaSourceProxy
private let size: CGSize?
private var imageLoadingCancellable: AnyCancellable?
@Published private var cachedContent: Content?
@@ -175,36 +183,47 @@ private class ContentLoader: ObservableObject {
}
if isGIF {
if let image = imageProvider?.imageFromSource(mediaSource),
if let image = mediaProvider?.imageFromSource(mediaSource),
let data = image.kf.data(format: .GIF) {
return .gifData(data)
}
} else if let image = imageProvider?.imageFromSource(mediaSource, size: size) {
} else if let image = mediaProvider?.imageFromSource(mediaSource, size: size) {
return .image(image)
}
return cachedContent
}
init(mediaSource: MediaSourceProxy, size: CGSize?, imageProvider: ImageProviderProtocol?) {
init(mediaSource: MediaSourceProxy, size: CGSize?, mediaProvider: MediaProviderProtocol?) {
self.mediaSource = mediaSource
self.size = size
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
}
@MainActor
func load() async {
if isGIF {
if case let .success(data) = await imageProvider?.loadImageDataFromSource(mediaSource) {
if case let .success(data) = await mediaProvider?.loadImageDataFromSource(mediaSource) {
cachedContent = .gifData(data)
}
} else {
if case let .success(image) = await imageProvider?.loadImageFromSource(mediaSource, size: size) {
guard let task = mediaProvider?.loadImageRetryingOnReconnection(mediaSource, size: size) else {
MXLog.error("Failed loading image, invalid reconnection retry task.")
return
}
imageLoadingCancellable = task.asCancellable()
if let image = try? await task.value {
cachedContent = .image(image)
}
}
}
func cancel() {
imageLoadingCancellable?.cancel()
}
private var isGIF: Bool {
mediaSource.mimeType == "image/gif"
}
ElementX/Sources/Other/SwiftUI/Views/OverridableAvatarImage.swift
+4 -4
View File
@@ -22,17 +22,17 @@ struct OverridableAvatarImage: View {
private let name: String?
private let contentID: String?
private let avatarSize: AvatarSize
private let imageProvider: ImageProviderProtocol?
private let mediaProvider: MediaProviderProtocol?
@ScaledMetric private var frameSize: CGFloat
init(overrideURL: URL?, url: URL?, name: String?, contentID: String?, avatarSize: AvatarSize, imageProvider: ImageProviderProtocol?) {
init(overrideURL: URL?, url: URL?, name: String?, contentID: String?, avatarSize: AvatarSize, mediaProvider: MediaProviderProtocol?) {
self.overrideURL = overrideURL
self.url = url
self.name = name
self.contentID = contentID
self.avatarSize = avatarSize
self.imageProvider = imageProvider
self.mediaProvider = mediaProvider
_frameSize = ScaledMetric(wrappedValue: avatarSize.value)
}
@@ -53,7 +53,7 @@ struct OverridableAvatarImage: View {
name: name,
contentID: contentID,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
}
}
}
ElementX/Sources/Other/SwiftUI/Views/RoomAvatarImage.swift
+10 -10
View File
@@ -32,7 +32,7 @@ struct RoomAvatarImage: View {
let avatar: RoomAvatar
let avatarSize: AvatarSize
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
var body: some View {
switch avatar {
@@ -41,7 +41,7 @@ struct RoomAvatarImage: View {
name: name,
contentID: id,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
case .heroes(let users):
// We will expand upon this with more stack sizes in the future.
if users.count == 0 {
@@ -54,14 +54,14 @@ struct RoomAvatarImage: View {
name: users[0].displayName,
contentID: users[0].userID,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.scaledFrame(size: clusterSize, alignment: .topTrailing)
LoadableAvatarImage(url: users[1].avatarURL,
name: users[1].displayName,
contentID: users[1].userID,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.mask {
Rectangle()
.fill(Color.white)
@@ -83,7 +83,7 @@ struct RoomAvatarImage: View {
name: users[0].displayName,
contentID: users[0].userID,
avatarSize: avatarSize,
imageProvider: imageProvider)
mediaProvider: mediaProvider)
}
}
}
@@ -96,30 +96,30 @@ struct RoomAvatarImage_Previews: PreviewProvider, TestablePreview {
name: "Room",
avatarURL: nil),
avatarSize: .room(on: .home),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomAvatarImage(avatar: .room(id: "!2:server.com",
name: "Room",
avatarURL: .picturesDirectory),
avatarSize: .room(on: .home),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomAvatarImage(avatar: .heroes([.init(userID: "@user:server.com",
displayName: "User",
avatarURL: nil)]),
avatarSize: .room(on: .home),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomAvatarImage(avatar: .heroes([.init(userID: "@user:server.com",
displayName: "User",
avatarURL: .picturesDirectory)]),
avatarSize: .room(on: .home),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomAvatarImage(avatar: .heroes([.init(userID: "@alice:server.com", displayName: "Alice", avatarURL: nil),
.init(userID: "@bob:server.net", displayName: "Bob", avatarURL: nil)]),
avatarSize: .room(on: .home),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
}
}
}
ElementX/Sources/Other/SwiftUI/Views/RoomInviterLabel.swift
+6 -6
View File
@@ -48,7 +48,7 @@ struct RoomInviterDetails: Equatable {
struct RoomInviterLabel: View {
let inviter: RoomInviterDetails
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
var body: some View {
HStack(alignment: .firstTextBaseline, spacing: 8) {
@@ -56,7 +56,7 @@ struct RoomInviterLabel: View {
name: inviter.displayName,
contentID: inviter.id,
avatarSize: .custom(16),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.alignmentGuide(.firstTextBaseline) { $0[.bottom] * 0.8 }
.accessibilityHidden(true)
@@ -71,13 +71,13 @@ struct RoomInviterLabel_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack(spacing: 10) {
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockAlice),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockDan),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockNoName),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockCharlie),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
.foregroundStyle(.compound.textPrimary)
}
.font(.compound.bodyMD)
ElementX/Sources/Other/SwiftUI/Views/UserProfileListRow.swift
+7 -7
View File
@@ -21,7 +21,7 @@ import SwiftUI
struct UserProfileListRow: View {
let user: UserProfileProxy
let membership: MembershipState?
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let kind: ListRow<LoadableAvatarImage, EmptyView, EmptyView, Bool>.Kind<EmptyView, Bool>
@@ -52,7 +52,7 @@ struct UserProfileListRow: View {
name: user.displayName,
contentID: user.userID,
avatarSize: .user(on: .startChat),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
}
}
@@ -74,21 +74,21 @@ struct UserProfileCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
Form {
UserProfileListRow(user: .mockAlice, membership: nil, imageProvider: MockMediaProvider(),
UserProfileListRow(user: .mockAlice, membership: nil, mediaProvider: MockMediaProvider(),
kind: .multiSelection(isSelected: true, action: action))
UserProfileListRow(user: .mockBob, membership: nil, imageProvider: MockMediaProvider(),
UserProfileListRow(user: .mockBob, membership: nil, mediaProvider: MockMediaProvider(),
kind: .multiSelection(isSelected: false, action: action))
UserProfileListRow(user: .mockCharlie, membership: .join, imageProvider: MockMediaProvider(),
UserProfileListRow(user: .mockCharlie, membership: .join, mediaProvider: MockMediaProvider(),
kind: .multiSelection(isSelected: true, action: action))
.disabled(true)
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: .join, imageProvider: MockMediaProvider(),
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: .join, mediaProvider: MockMediaProvider(),
kind: .multiSelection(isSelected: false, action: action))
.disabled(true)
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: nil, imageProvider: MockMediaProvider(),
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: nil, mediaProvider: MockMediaProvider(),
kind: .multiSelection(isSelected: false, action: action))
}
.compoundList()
ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModel.swift
+1 -1
View File
@@ -35,7 +35,7 @@ class BlockedUsersScreenViewModel: BlockedUsersScreenViewModelType, BlockedUsers
let ignoredUsers = clientProxy.ignoredUsersPublisher.value?.map { UserProfileProxy(userID: $0) }
super.init(initialViewState: BlockedUsersScreenViewState(blockedUsers: ignoredUsers ?? []),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
showLoadingIndicator()
ElementX/Sources/Screens/BlockedUsersScreen/View/BlockedUsersScreen.swift
+1 -1
View File
@@ -54,7 +54,7 @@ struct BlockedUsersScreen: View {
name: user.displayName,
contentID: user.userID,
avatarSize: .user(on: .blockedUsers),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.accessibilityHidden(true)
}
}
ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift
+1 -1
View File
@@ -45,7 +45,7 @@ class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol
let bindings = CreateRoomViewStateBindings(roomName: parameters.name, roomTopic: parameters.topic, isRoomPrivate: parameters.isRoomPrivate)
super.init(initialViewState: CreateRoomViewState(selectedUsers: selectedUsers.value, bindings: bindings), imageProvider: userSession.mediaProvider)
super.init(initialViewState: CreateRoomViewState(selectedUsers: selectedUsers.value, bindings: bindings), mediaProvider: userSession.mediaProvider)
createRoomParameters
.map(\.avatarImageMedia)
ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
+1 -1
View File
@@ -130,7 +130,7 @@ struct CreateRoomScreen: View {
ScrollView(.horizontal, showsIndicators: false) {
LazyHStack(spacing: 16) {
ForEach(context.viewState.selectedUsers, id: \.userID) { user in
InviteUsersScreenSelectedItem(user: user, imageProvider: context.imageProvider) {
InviteUsersScreenSelectedItem(user: user, mediaProvider: context.mediaProvider) {
context.send(viewAction: .deselectUser(user))
}
.frame(width: invitedUserCellWidth)
ElementX/Sources/Screens/GlobalSearchScreen/GlobalSearchScreenCoordinator.swift
+1 -1
View File
@@ -41,7 +41,7 @@ class GlobalSearchScreenCoordinator: CoordinatorProtocol {
init(parameters: GlobalSearchScreenCoordinatorParameters) {
viewModel = GlobalSearchScreenViewModel(roomSummaryProvider: parameters.roomSummaryProvider,
imageProvider: parameters.mediaProvider)
mediaProvider: parameters.mediaProvider)
viewModel.actions
.sink { [weak self] action in
ElementX/Sources/Screens/GlobalSearchScreen/GlobalSearchScreenViewModel.swift
+2 -2
View File
@@ -28,11 +28,11 @@ class GlobalSearchScreenViewModel: GlobalSearchScreenViewModelType, GlobalSearch
}
init(roomSummaryProvider: RoomSummaryProviderProtocol,
imageProvider: ImageProviderProtocol) {
mediaProvider: MediaProviderProtocol) {
self.roomSummaryProvider = roomSummaryProvider
super.init(initialViewState: GlobalSearchScreenViewState(bindings: .init(searchQuery: "")),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
roomSummaryProvider.roomListPublisher
.receive(on: DispatchQueue.main)
ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreen.swift
+1 -1
View File
@@ -214,7 +214,7 @@ private class GlobalSearchTextField: UITextField {
struct GlobalSearchScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = GlobalSearchScreenViewModel(roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
static var previews: some View {
NavigationStack {
ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreenCell.swift
+2 -2
View File
@@ -37,7 +37,7 @@ struct GlobalSearchScreenListRow: View {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.avatar,
avatarSize: .room(on: .messageForwarding),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
.accessibilityHidden(true)
}
@@ -46,7 +46,7 @@ struct GlobalSearchScreenListRow: View {
struct GlobalSearchScreenListRow_Previews: PreviewProvider, TestablePreview {
static let viewModel = GlobalSearchScreenViewModel(roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
static var previews: some View {
List {
ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+1 -1
View File
@@ -51,7 +51,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
roomSummaryProvider = userSession.clientProxy.roomSummaryProvider
super.init(initialViewState: .init(userID: userSession.clientProxy.userID),
imageProvider: userSession.mediaProvider)
mediaProvider: userSession.mediaProvider)
userSession.clientProxy.userAvatarURLPublisher
.receive(on: DispatchQueue.main)
ElementX/Sources/Screens/HomeScreen/View/BloomView.swift
+1 -1
View File
@@ -38,6 +38,6 @@ struct BloomView: View {
name: context.viewState.userDisplayName,
contentID: context.viewState.userID,
avatarSize: .custom(256),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
}
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+1 -1
View File
@@ -148,7 +148,7 @@ struct HomeScreen: View {
name: context.viewState.userDisplayName,
contentID: context.viewState.userID,
avatarSize: .user(on: .home),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
.overlayBadge(10, isBadged: context.viewState.requiresExtraAccountSetup)
.compositingGroup()
ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
+2 -2
View File
@@ -30,7 +30,7 @@ struct HomeScreenInviteCell: View {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.avatar,
avatarSize: .custom(52),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
.accessibilityHidden(true)
}
@@ -79,7 +79,7 @@ struct HomeScreenInviteCell: View {
@ViewBuilder
private var inviterView: some View {
if let inviter = room.inviter, !room.isDirect {
RoomInviterLabel(inviter: inviter, imageProvider: context.imageProvider)
RoomInviterLabel(inviter: inviter, mediaProvider: context.mediaProvider)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textPlaceholder)
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
+1 -1
View File
@@ -59,7 +59,7 @@ struct HomeScreenRoomCell: View {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.avatar,
avatarSize: .room(on: .home),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
.accessibilityHidden(true)
}
ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenViewModel.swift
+1 -1
View File
@@ -42,7 +42,7 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
self.userDiscoveryService = userDiscoveryService
self.userIndicatorController = userIndicatorController
super.init(initialViewState: InviteUsersScreenViewState(selectedUsers: selectedUsers.value, isCreatingRoom: roomType.isCreatingRoom), imageProvider: mediaProvider)
super.init(initialViewState: InviteUsersScreenViewState(selectedUsers: selectedUsers.value, isCreatingRoom: roomType.isCreatingRoom), mediaProvider: mediaProvider)
setupSubscriptions(selectedUsers: selectedUsers)
fetchMembersIfNeeded()
ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift
+2 -2
View File
@@ -88,7 +88,7 @@ struct InviteUsersScreen: View {
ForEach(context.viewState.usersSection.users, id: \.userID) { user in
UserProfileListRow(user: user,
membership: context.viewState.membershipState(user),
imageProvider: context.imageProvider,
mediaProvider: context.mediaProvider,
kind: .multiSelection(isSelected: context.viewState.isUserSelected(user)) {
context.send(viewAction: .toggleUser(user))
})
@@ -113,7 +113,7 @@ struct InviteUsersScreen: View {
ScrollViewReader { scrollView in
HStack(spacing: 16) {
ForEach(context.viewState.selectedUsers, id: \.userID) { user in
InviteUsersScreenSelectedItem(user: user, imageProvider: context.imageProvider) {
InviteUsersScreenSelectedItem(user: user, mediaProvider: context.mediaProvider) {
deselect(user)
}
.frame(width: cellWidth)
ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreenSelectedItem.swift
+3 -3
View File
@@ -18,7 +18,7 @@ import SwiftUI
struct InviteUsersScreenSelectedItem: View {
let user: UserProfileProxy
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let dismissAction: () -> Void
var body: some View {
@@ -39,7 +39,7 @@ struct InviteUsersScreenSelectedItem: View {
name: user.displayName,
contentID: user.userID,
avatarSize: .user(on: .inviteUsers),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.overlay(alignment: .topTrailing) {
Button(action: dismissAction) {
Image(systemName: "xmark.circle.fill")
@@ -59,7 +59,7 @@ struct InviteUsersScreenSelectedItem_Previews: PreviewProvider, TestablePreview
ScrollView(.horizontal) {
HStack(spacing: 28) {
ForEach(people, id: \.userID) { user in
InviteUsersScreenSelectedItem(user: user, imageProvider: MockMediaProvider(), dismissAction: { })
InviteUsersScreenSelectedItem(user: user, mediaProvider: MockMediaProvider(), dismissAction: { })
.frame(width: 72)
}
}
ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift
+1 -1
View File
@@ -46,7 +46,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
self.clientProxy = clientProxy
self.userIndicatorController = userIndicatorController
super.init(initialViewState: JoinRoomScreenViewState(roomID: roomID), imageProvider: mediaProvider)
super.init(initialViewState: JoinRoomScreenViewState(roomID: roomID), mediaProvider: mediaProvider)
Task {
await loadRoomDetails()
ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
+2 -2
View File
@@ -42,7 +42,7 @@ struct JoinRoomScreen: View {
VStack(spacing: 16) {
RoomAvatarImage(avatar: context.viewState.avatar,
avatarSize: .room(on: .joinRoom),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
VStack(spacing: 8) {
@@ -63,7 +63,7 @@ struct JoinRoomScreen: View {
}
if let inviter = context.viewState.roomDetails?.inviter {
RoomInviterLabel(inviter: inviter, imageProvider: context.imageProvider)
RoomInviterLabel(inviter: inviter, mediaProvider: context.mediaProvider)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
}
ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift
+1 -1
View File
@@ -41,7 +41,7 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me
self.roomSummaryProvider = roomSummaryProvider
self.userIndicatorController = userIndicatorController
super.init(initialViewState: MessageForwardingScreenViewState(), imageProvider: mediaProvider)
super.init(initialViewState: MessageForwardingScreenViewState(), mediaProvider: mediaProvider)
roomSummaryProvider.roomListPublisher
.receive(on: DispatchQueue.main)
ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift
+1 -1
View File
@@ -90,7 +90,7 @@ private struct MessageForwardingListRow: View {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.avatar,
avatarSize: .room(on: .messageForwarding),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
.accessibilityHidden(true)
}
ElementX/Sources/Screens/RoomChangeRolesScreen/RoomChangeRolesScreenViewModel.swift
+1 -1
View File
@@ -45,7 +45,7 @@ class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomCh
moderators: [],
users: [],
bindings: .init()),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
roomProxy.membersPublisher
.receive(on: DispatchQueue.main)
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift
+1 -1
View File
@@ -74,7 +74,7 @@ struct RoomChangeRolesScreen: View {
ScrollViewReader { scrollView in
HStack(spacing: 16) {
ForEach(context.viewState.membersWithRole, id: \.id) { member in
RoomChangeRolesScreenSelectedItem(member: member, imageProvider: context.imageProvider) {
RoomChangeRolesScreenSelectedItem(member: member, mediaProvider: context.mediaProvider) {
context.send(viewAction: .demoteMember(member))
}
.frame(width: cellWidth)
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenRow.swift
+8 -8
View File
@@ -20,7 +20,7 @@ import SwiftUI
struct RoomChangeRolesScreenRow: View {
let member: RoomMemberDetails
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let isSelected: Bool
let action: () -> Void
@@ -38,7 +38,7 @@ struct RoomChangeRolesScreenRow: View {
name: member.name,
contentID: member.id,
avatarSize: .user(on: .startChat),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
}
}
@@ -48,34 +48,34 @@ struct RoomChangeRolesScreenRow_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
Form {
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockAlice),
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
isSelected: true,
action: action)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockBob),
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
isSelected: false,
action: action)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockInvited),
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
isSelected: false,
action: action)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockCharlie),
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
isSelected: true,
action: action)
.disabled(true)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@someone:matrix.org", membership: .join))),
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
isSelected: false,
action: action)
.disabled(true)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@someone:matrix.org", membership: .join))),
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
isSelected: false,
action: action)
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSection.swift
+1 -1
View File
@@ -29,7 +29,7 @@ struct RoomChangeRolesScreenSection: View {
Section {
ForEach(members, id: \.id) { member in
RoomChangeRolesScreenRow(member: member,
imageProvider: context.imageProvider,
mediaProvider: context.mediaProvider,
isSelected: isMemberSelected(member)) {
context.send(viewAction: .toggleMember(member))
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift
+3 -3
View File
@@ -18,7 +18,7 @@ import SwiftUI
struct RoomChangeRolesScreenSelectedItem: View {
let member: RoomMemberDetails
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let dismissAction: () -> Void
var body: some View {
@@ -39,7 +39,7 @@ struct RoomChangeRolesScreenSelectedItem: View {
name: member.name,
contentID: member.id,
avatarSize: .user(on: .inviteUsers),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.overlay(alignment: .topTrailing) {
if member.role != .administrator {
Button(action: dismissAction) {
@@ -69,7 +69,7 @@ struct RoomChangeRolesScreenSelectedItem_Previews: PreviewProvider, TestablePrev
HStack(spacing: 12) {
ForEach(members, id: \.id) { member in
RoomChangeRolesScreenSelectedItem(member: member,
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
dismissAction: { })
.frame(width: 72)
}
ElementX/Sources/Screens/RoomDetailsEditScreen/RoomDetailsEditScreenViewModel.swift
+1 -1
View File
@@ -44,7 +44,7 @@ class RoomDetailsEditScreenViewModel: RoomDetailsEditScreenViewModelType, RoomDe
initialName: roomName ?? "",
initialTopic: roomTopic ?? "",
avatarURL: roomAvatar,
bindings: .init(name: roomName ?? "", topic: roomTopic ?? "")), imageProvider: mediaProvider)
bindings: .init(name: roomName ?? "", topic: roomTopic ?? "")), mediaProvider: mediaProvider)
Task {
// Can't use async let because the mocks aren't thread safe when calling the same method 🤦‍♂️
ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
+1 -1
View File
@@ -68,7 +68,7 @@ struct RoomDetailsEditScreen: View {
name: context.viewState.initialName,
contentID: context.viewState.roomID,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.overlay(alignment: .bottomTrailing) {
if context.viewState.canEditAvatar {
avatarOverlayIcon
ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift
+1 -1
View File
@@ -82,7 +82,7 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
joinedMembersCount: roomProxy.joinedMembersCount,
notificationSettingsState: .loading,
bindings: .init()),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
appSettings.$pinningEnabled
.weakAssign(to: \.state.isPinningEnabled, on: self)
ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
+2 -2
View File
@@ -74,7 +74,7 @@ struct RoomDetailsScreen: View {
private var normalRoomHeaderSection: some View {
AvatarHeaderView(room: context.viewState.details,
avatarSize: .room(on: .details),
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
context.send(viewAction: .displayAvatar)
} footer: {
if !context.viewState.shortcuts.isEmpty {
@@ -87,7 +87,7 @@ struct RoomDetailsScreen: View {
private func dmHeaderSection(accountOwner: RoomMemberDetails, recipient: RoomMemberDetails) -> some View {
AvatarHeaderView(accountOwner: accountOwner,
dmRecipient: recipient,
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
context.send(viewAction: .displayAvatar)
} footer: {
if !context.viewState.shortcuts.isEmpty {
ElementX/Sources/Screens/RoomDirectorySearchScreen/RoomDirectorySearchScreenCoordinator.swift
+2 -2
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct RoomDirectorySearchScreenCoordinatorParameters {
let clientProxy: ClientProxyProtocol
let imageProvider: ImageProviderProtocol
let mediaProvider: MediaProviderProtocol
let userIndicatorController: UserIndicatorControllerProtocol
}
@@ -42,7 +42,7 @@ final class RoomDirectorySearchScreenCoordinator: CoordinatorProtocol {
init(parameters: RoomDirectorySearchScreenCoordinatorParameters) {
viewModel = RoomDirectorySearchScreenViewModel(clientProxy: parameters.clientProxy,
userIndicatorController: parameters.userIndicatorController,
imageProvider: parameters.imageProvider)
mediaProvider: parameters.mediaProvider)
}
func start() {
ElementX/Sources/Screens/RoomDirectorySearchScreen/RoomDirectorySearchScreenViewModel.swift
+2 -2
View File
@@ -30,11 +30,11 @@ class RoomDirectorySearchScreenViewModel: RoomDirectorySearchScreenViewModelType
init(clientProxy: ClientProxyProtocol,
userIndicatorController: UserIndicatorControllerProtocol,
imageProvider: ImageProviderProtocol) {
mediaProvider: MediaProviderProtocol) {
roomDirectorySearchProxy = clientProxy.roomDirectorySearchProxy()
self.userIndicatorController = userIndicatorController
super.init(initialViewState: RoomDirectorySearchScreenViewState(), imageProvider: imageProvider)
super.init(initialViewState: RoomDirectorySearchScreenViewState(), mediaProvider: mediaProvider)
state.rooms = roomDirectorySearchProxy.resultsPublisher.value
ElementX/Sources/Screens/RoomDirectorySearchScreen/View/RoomDirectoryCell.swift
+10 -10
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct RoomDirectorySearchCell: View {
let result: RoomDirectorySearchResult
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let joinAction: () -> Void
private var description: String? {
@@ -46,7 +46,7 @@ struct RoomDirectorySearchCell: View {
private var avatar: some View {
RoomAvatarImage(avatar: result.avatar,
avatarSize: .room(on: .roomDirectorySearch),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.accessibilityHidden(true)
}
}
@@ -64,7 +64,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title",
avatarURL: nil),
canBeJoined: true),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_2:matrix.org",
alias: "#test:example.com",
@@ -74,7 +74,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: true),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_3:example.com",
alias: "#test_no_topic:example.com",
@@ -84,7 +84,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title no topic",
avatarURL: nil),
canBeJoined: true),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_4:example.com",
alias: "#test_no_topic:example.com",
@@ -94,7 +94,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: true),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_5:example.com",
alias: nil,
@@ -104,7 +104,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title no alias",
avatarURL: nil),
canBeJoined: false),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_6:example.com",
alias: nil,
@@ -114,7 +114,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title no alias",
avatarURL: nil),
canBeJoined: false),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_7:example.com",
alias: nil,
@@ -124,7 +124,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: false),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_8:example.com",
alias: nil,
name: nil,
@@ -133,7 +133,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: false),
imageProvider: MockMediaProvider()) { }
mediaProvider: MockMediaProvider()) { }
}
.compoundList()
}
ElementX/Sources/Screens/RoomDirectorySearchScreen/View/RoomDirectorySearchScreen.swift
+2 -2
View File
@@ -25,7 +25,7 @@ struct RoomDirectorySearchScreen: View {
List {
Section {
ForEach(context.viewState.rooms) { room in
RoomDirectorySearchCell(result: room, imageProvider: context.imageProvider) {
RoomDirectorySearchCell(result: room, mediaProvider: context.mediaProvider) {
context.send(viewAction: .select(room: room))
}
}
@@ -102,7 +102,7 @@ struct RoomDirectorySearchScreen_Previews: PreviewProvider, TestablePreview {
return RoomDirectorySearchScreenViewModel(clientProxy: clientProxy,
userIndicatorController: UserIndicatorControllerMock(),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
}()
static var previews: some View {
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift
+1 -1
View File
@@ -48,7 +48,7 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
let initialViewState = RoomMemberDetailsScreenViewState(userID: userID, bindings: .init())
super.init(initialViewState: initialViewState, imageProvider: mediaProvider)
super.init(initialViewState: initialViewState, mediaProvider: mediaProvider)
showMemberLoadingIndicator()
Task {
ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
+2 -2
View File
@@ -75,7 +75,7 @@ struct RoomMemberDetailsScreen: View {
if let memberDetails = context.viewState.memberDetails {
AvatarHeaderView(member: memberDetails,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
context.send(viewAction: .displayAvatar)
} footer: {
otherUserFooter
@@ -83,7 +83,7 @@ struct RoomMemberDetailsScreen: View {
} else {
AvatarHeaderView(user: UserProfileProxy(userID: context.viewState.userID),
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider,
mediaProvider: context.mediaProvider,
footer: { })
}
}
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModel.swift
+1 -1
View File
@@ -43,7 +43,7 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
super.init(initialViewState: .init(joinedMembersCount: roomProxy.joinedMembersCount,
bindings: .init(mode: initialMode)),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
setupMembers()
}
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListManageMemberSheet.swift
+1 -1
View File
@@ -29,7 +29,7 @@ struct RoomMembersListManageMemberSheet: View {
Form {
AvatarHeaderView(member: member,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
EmptyView()
}
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
+1 -1
View File
@@ -29,7 +29,7 @@ struct RoomMembersListScreenMemberCell: View {
name: avatarName,
contentID: member.id,
avatarSize: .user(on: .roomDetails),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.accessibilityHidden(true)
HStack(alignment: .firstTextBaseline, spacing: 4) {
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
+1 -1
View File
@@ -67,7 +67,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
super.init(initialViewState: ComposerToolbarViewState(audioPlayerState: .init(id: .recorderPreview, duration: 0),
audioRecorderState: .init(),
bindings: .init()),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
context.$viewState
.map(\.composerMode)
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/CompletionSuggestionView.swift
+5 -5
View File
@@ -17,7 +17,7 @@
import SwiftUI
struct CompletionSuggestionView: View {
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let items: [SuggestionItem]
var showBackgroundShadow = true
let onTap: (SuggestionItem) -> Void
@@ -41,7 +41,7 @@ struct CompletionSuggestionView: View {
EmptyView()
} else {
ZStack {
MentionSuggestionItemView(imageProvider: nil, item: .init(id: "", displayName: nil, avatarURL: nil, range: .init()))
MentionSuggestionItemView(mediaProvider: nil, item: .init(id: "", displayName: nil, avatarURL: nil, range: .init()))
.readFrame($prototypeListItemFrame)
.hidden()
if showBackgroundShadow {
@@ -63,7 +63,7 @@ struct CompletionSuggestionView: View {
} label: {
switch item {
case .user(let mention), .allUsers(let mention):
MentionSuggestionItemView(imageProvider: imageProvider, item: mention)
MentionSuggestionItemView(mediaProvider: mediaProvider, item: mention)
}
}
.modifier(ListItemPaddingModifier(isFirst: items.first?.id == item.id))
@@ -125,12 +125,12 @@ struct CompletionSuggestion_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
// Putting them is VStack allows the preview to work properly in tests
VStack(spacing: 8) {
CompletionSuggestionView(imageProvider: MockMediaProvider(),
CompletionSuggestionView(mediaProvider: MockMediaProvider(),
items: [.user(item: MentionSuggestionItem(id: "@user_mention_1:matrix.org", displayName: "User 1", avatarURL: nil, range: .init())),
.user(item: MentionSuggestionItem(id: "@user_mention_2:matrix.org", displayName: "User 2", avatarURL: URL.documentsDirectory, range: .init()))]) { _ in }
}
VStack(spacing: 8) {
CompletionSuggestionView(imageProvider: MockMediaProvider(),
CompletionSuggestionView(mediaProvider: MockMediaProvider(),
items: multipleItems) { _ in }
}
}
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/ComposerToolbar.swift
+1 -1
View File
@@ -57,7 +57,7 @@ struct ComposerToolbar: View {
}
private var suggestionView: some View {
CompletionSuggestionView(imageProvider: context.imageProvider,
CompletionSuggestionView(mediaProvider: context.mediaProvider,
items: context.viewState.suggestions,
showBackgroundShadow: !context.composerExpanded) { suggestion in
context.send(viewAction: .selectedSuggestion(suggestion))
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MentionSuggestionItemView.swift
+4 -4
View File
@@ -17,7 +17,7 @@
import SwiftUI
struct MentionSuggestionItemView: View {
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
let item: MentionSuggestionItem
var body: some View {
@@ -26,7 +26,7 @@ struct MentionSuggestionItemView: View {
name: item.displayName,
contentID: item.id,
avatarSize: .user(on: .suggestions),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
VStack(alignment: .leading, spacing: 0) {
Text(item.displayName ?? item.id)
.font(.compound.bodyLG)
@@ -47,7 +47,7 @@ struct MentionSuggestionItemView_Previews: PreviewProvider, TestablePreview {
static let mockMediaProvider = MockMediaProvider()
static var previews: some View {
MentionSuggestionItemView(imageProvider: mockMediaProvider, item: .init(id: "test", displayName: "Test", avatarURL: URL.documentsDirectory, range: .init()))
MentionSuggestionItemView(imageProvider: mockMediaProvider, item: .init(id: "test2", displayName: nil, avatarURL: nil, range: .init()))
MentionSuggestionItemView(mediaProvider: mockMediaProvider, item: .init(id: "test", displayName: "Test", avatarURL: URL.documentsDirectory, range: .init()))
MentionSuggestionItemView(mediaProvider: mockMediaProvider, item: .init(id: "test2", displayName: nil, avatarURL: nil, range: .init()))
}
}
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+1 -1
View File
@@ -66,7 +66,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
roomAvatar: roomProxy.avatar,
hasOngoingCall: roomProxy.hasOngoingCall,
bindings: .init()),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
setupSubscriptions()
}
ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
+4 -4
View File
@@ -22,7 +22,7 @@ struct RoomHeaderView: View {
let roomName: String
let roomAvatar: RoomAvatar
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
var body: some View {
HStack(spacing: 12) {
@@ -39,7 +39,7 @@ struct RoomHeaderView: View {
private var avatarImage: some View {
RoomAvatarImage(avatar: roomAvatar,
avatarSize: .room(on: .timeline),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
.accessibilityIdentifier(A11yIdentifiers.roomScreen.avatar)
}
}
@@ -50,7 +50,7 @@ struct RoomHeaderView_Previews: PreviewProvider, TestablePreview {
roomAvatar: .room(id: "1",
name: "Some Room Name",
avatarURL: URL.picturesDirectory),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
.previewLayout(.sizeThatFits)
.padding()
@@ -58,7 +58,7 @@ struct RoomHeaderView_Previews: PreviewProvider, TestablePreview {
roomAvatar: .room(id: "1",
name: "Some Room Name",
avatarURL: nil),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
.previewLayout(.sizeThatFits)
.padding()
}
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+2 -2
View File
@@ -82,7 +82,7 @@ struct RoomScreen: View {
}
}
.sheet(item: $timelineContext.reactionSummaryInfo) {
ReactionsSummaryView(reactions: $0.reactions, members: timelineContext.viewState.members, imageProvider: timelineContext.imageProvider, selectedReactionKey: $0.selectedKey)
ReactionsSummaryView(reactions: $0.reactions, members: timelineContext.viewState.members, mediaProvider: timelineContext.mediaProvider, selectedReactionKey: $0.selectedKey)
.edgesIgnoringSafeArea([.bottom])
}
.sheet(item: $timelineContext.readReceiptsSummaryInfo) {
@@ -165,7 +165,7 @@ struct RoomScreen: View {
ToolbarItem(placement: .principal) {
RoomHeaderView(roomName: roomContext.viewState.roomTitle,
roomAvatar: roomContext.viewState.roomAvatar,
imageProvider: roomContext.imageProvider)
mediaProvider: roomContext.mediaProvider)
// Using a button stops it from getting truncated in the navigation bar
.contentShape(.rect)
.onTapGesture {
ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/NotificationSettingsEditScreenViewModel.swift
+1 -1
View File
@@ -44,7 +44,7 @@ class NotificationSettingsEditScreenViewModel: NotificationSettingsEditScreenVie
super.init(initialViewState: NotificationSettingsEditScreenViewState(bindings: bindings,
strings: NotificationSettingsEditScreenStrings(chatType: chatType)),
imageProvider: userSession.mediaProvider)
mediaProvider: userSession.mediaProvider)
setupNotificationSettingsSubscription()
setupRoomSummaryProviderSubscription()
ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/View/NotificationSettingsEditScreenRoomCell.swift
+1 -1
View File
@@ -41,7 +41,7 @@ struct NotificationSettingsEditScreenRoomCell: View {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.avatar,
avatarSize: .room(on: .notificationSettings),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
.accessibilityHidden(true)
}
ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift
+1 -1
View File
@@ -30,7 +30,7 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
super.init(initialViewState: .init(deviceID: userSession.clientProxy.deviceID,
userID: userSession.clientProxy.userID,
showDeveloperOptions: AppSettings.isDevelopmentBuild),
imageProvider: userSession.mediaProvider)
mediaProvider: userSession.mediaProvider)
userSession.clientProxy.userAvatarURLPublisher
.receive(on: DispatchQueue.main)
ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+1 -1
View File
@@ -56,7 +56,7 @@ struct SettingsScreen: View {
name: context.viewState.userDisplayName,
contentID: context.viewState.userID,
avatarSize: .user(on: .settings),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.accessibilityHidden(true)
VStack(alignment: .leading, spacing: 2) {
ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenViewModel.swift
+1 -1
View File
@@ -36,7 +36,7 @@ class UserDetailsEditScreenViewModel: UserDetailsEditScreenViewModelType, UserDe
self.userIndicatorController = userIndicatorController
super.init(initialViewState: UserDetailsEditScreenViewState(userID: clientProxy.userID,
bindings: .init()), imageProvider: mediaProvider)
bindings: .init()), mediaProvider: mediaProvider)
clientProxy.userAvatarURLPublisher
.receive(on: DispatchQueue.main)
ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
+1 -1
View File
@@ -64,7 +64,7 @@ struct UserDetailsEditScreen: View {
name: context.viewState.currentDisplayName,
contentID: context.viewState.userID,
avatarSize: .user(on: .editUserDetails),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.overlay(alignment: .bottomTrailing) {
avatarOverlayIcon
}
ElementX/Sources/Screens/StartChatScreen/StartChatScreenViewModel.swift
+1 -1
View File
@@ -41,7 +41,7 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
self.userIndicatorController = userIndicatorController
self.userDiscoveryService = userDiscoveryService
super.init(initialViewState: StartChatScreenViewState(userID: userSession.clientProxy.userID), imageProvider: userSession.mediaProvider)
super.init(initialViewState: StartChatScreenViewState(userID: userSession.clientProxy.userID), mediaProvider: userSession.mediaProvider)
setupBindings()
ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
+1 -1
View File
@@ -90,7 +90,7 @@ struct StartChatScreen: View {
ForEach(context.viewState.usersSection.users, id: \.userID) { user in
UserProfileListRow(user: user,
membership: nil,
imageProvider: context.imageProvider,
mediaProvider: context.mediaProvider,
kind: .button {
context.send(viewAction: .selectUser(user))
})
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
+1 -1
View File
@@ -86,7 +86,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
ownUserID: roomProxy.ownUserID,
isViewSourceEnabled: appSettings.viewSourceEnabled,
bindings: .init(reactionsCollapsed: [:])),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
if focussedEventID != nil {
// The timeline controller will start loading a detached timeline.
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenu.swift
+1 -1
View File
@@ -70,7 +70,7 @@ struct TimelineItemMenu: View {
name: item.sender.displayName,
contentID: item.sender.id,
avatarSize: .user(on: .timeline),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.accessibilityHidden(true)
Spacer(minLength: 8.0)
ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptCell.swift
+5 -5
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct ReadReceiptCell: View {
let readReceipt: ReadReceipt
let memberState: RoomMemberState?
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
private var title: String {
memberState?.displayName ?? readReceipt.userID
@@ -38,7 +38,7 @@ struct ReadReceiptCell: View {
name: memberState?.displayName,
contentID: readReceipt.userID,
avatarSize: .user(on: .readReceiptSheet),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 12) {
Text(title)
@@ -70,18 +70,18 @@ struct ReadReceiptCell_Previews: PreviewProvider, TestablePreview {
formattedTimestamp: "10:00"),
memberState: .init(displayName: "Test",
avatarURL: nil),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
.previewDisplayName("No Image")
ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org",
formattedTimestamp: "10:00"),
memberState: .init(displayName: "Test",
avatarURL: URL.documentsDirectory),
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
.previewDisplayName("With Image")
ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org",
formattedTimestamp: "10:00"),
memberState: nil,
imageProvider: MockMediaProvider())
mediaProvider: MockMediaProvider())
.previewDisplayName("Loading Member")
}
}
ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptsSummaryView.swift
+1 -1
View File
@@ -31,7 +31,7 @@ struct ReadReceiptsSummaryView: View {
ForEach(orderedReadReceipts) { receipt in
ReadReceiptCell(readReceipt: receipt,
memberState: context.viewState.members[receipt.userID],
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
}
}
}
ElementX/Sources/Screens/Timeline/View/Replies/TimelineReplyView.swift
+1 -1
View File
@@ -164,7 +164,7 @@ struct TimelineReplyView: View {
LoadableImage(mediaSource: mediaSource,
size: .init(width: imageContainerSize,
height: imageContainerSize),
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
Image(systemName: "photo")
.padding(4.0)
}
ElementX/Sources/Screens/Timeline/View/Supplementary/ReactionsSummaryView.swift
+5 -5
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct ReactionsSummaryView: View {
let reactions: [AggregatedReaction]
let members: [String: RoomMemberState]
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
@State var selectedReactionKey: String
@@ -64,7 +64,7 @@ struct ReactionsSummaryView: View {
ScrollView {
VStack(alignment: .leading, spacing: 8) {
ForEach(reaction.senders) { sender in
ReactionSummarySenderView(sender: sender, member: members[sender.id], imageProvider: imageProvider)
ReactionSummarySenderView(sender: sender, member: members[sender.id], mediaProvider: mediaProvider)
.padding(.horizontal, 16)
}
}
@@ -110,7 +110,7 @@ private struct ReactionSummaryButton: View {
private struct ReactionSummarySenderView: View {
var sender: ReactionSender
var member: RoomMemberState?
let imageProvider: ImageProviderProtocol?
let mediaProvider: MediaProviderProtocol?
var displayName: String {
member?.displayName ?? sender.id
@@ -122,7 +122,7 @@ private struct ReactionSummarySenderView: View {
name: displayName,
contentID: sender.id,
avatarSize: .user(on: .timeline),
imageProvider: imageProvider)
mediaProvider: mediaProvider)
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 8) {
@@ -147,7 +147,7 @@ struct ReactionsSummaryView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
ReactionsSummaryView(reactions: AggregatedReaction.mockReactions,
members: [:],
imageProvider: MockMediaProvider(),
mediaProvider: MockMediaProvider(),
selectedReactionKey: AggregatedReaction.mockReactions[0].key)
}
}
ElementX/Sources/Screens/Timeline/View/Supplementary/TimelineReadReceiptsView.swift
+1 -1
View File
@@ -31,7 +31,7 @@ struct TimelineReadReceiptsView: View {
name: context.viewState.members[receipt.userID]?.displayName,
contentID: receipt.userID,
avatarSize: .user(on: .readReceipt),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.overlay {
RoundedRectangle(cornerRadius: .infinity)
.stroke(Color.compound.bgCanvasDefault, lineWidth: 1)
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/CallNotificationRoomTimelineView.swift
+1 -1
View File
@@ -29,7 +29,7 @@ struct CallNotificationRoomTimelineView: View {
name: timelineItem.sender.displayName ?? timelineItem.sender.id,
contentID: timelineItem.sender.id,
avatarSize: .user(on: .timeline),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.accessibilityHidden(true)
VStack(alignment: .leading, spacing: 0) {
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/ImageRoomTimelineView.swift
+1 -1
View File
@@ -25,7 +25,7 @@ struct ImageRoomTimelineView: View {
TimelineStyler(timelineItem: timelineItem) {
LoadableImage(mediaSource: source,
blurhash: timelineItem.content.blurhash,
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
placeholder
}
.timelineMediaFrame(height: timelineItem.content.height,
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/StickerRoomTimelineView.swift
+1 -1
View File
@@ -25,7 +25,7 @@ struct StickerRoomTimelineView: View {
TimelineStyler(timelineItem: timelineItem) {
LoadableImage(url: timelineItem.imageURL,
blurhash: timelineItem.blurhash,
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
placeholder
}
.timelineMediaFrame(height: timelineItem.height,
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/VideoRoomTimelineView.swift
+1 -1
View File
@@ -36,7 +36,7 @@ struct VideoRoomTimelineView: View {
if let thumbnailSource = timelineItem.content.thumbnailSource {
LoadableImage(mediaSource: thumbnailSource,
blurhash: timelineItem.content.blurhash,
imageProvider: context.imageProvider) { imageView in
mediaProvider: context.mediaProvider) { imageView in
imageView
.overlay { playIcon }
} placeholder: {
ElementX/Sources/Screens/Timeline/View/TimelineSenderAvatarView.swift
+1 -1
View File
@@ -27,7 +27,7 @@ struct TimelineSenderAvatarView: View {
name: timelineItem.sender.displayName,
contentID: timelineItem.sender.id,
avatarSize: .user(on: .timeline),
imageProvider: context.imageProvider)
mediaProvider: context.mediaProvider)
.overlay {
Circle().stroke(Color.compound.bgCanvasDefault, lineWidth: 3)
}
ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift
+1 -1
View File
@@ -47,7 +47,7 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr
isPresentedModally: isPresentedModally,
bindings: .init())
super.init(initialViewState: initialViewState, imageProvider: mediaProvider)
super.init(initialViewState: initialViewState, mediaProvider: mediaProvider)
showLoadingIndicator(allowsInteraction: true)
Task {
ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift
+2 -2
View File
@@ -72,7 +72,7 @@ struct UserProfileScreen: View {
if let userProfile = context.viewState.userProfile {
AvatarHeaderView(user: userProfile,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider) {
mediaProvider: context.mediaProvider) {
context.send(viewAction: .displayAvatar)
} footer: {
otherUserFooter
@@ -80,7 +80,7 @@ struct UserProfileScreen: View {
} else {
AvatarHeaderView(user: UserProfileProxy(userID: context.viewState.userID),
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider,
mediaProvider: context.mediaProvider,
footer: { })
}
}
ElementX/Sources/Services/Media/Provider/ImageProviderProtocol.swift
-31
View File
@@ -1,31 +0,0 @@
//
// Copyright 2023 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import UIKit
protocol ImageProviderProtocol {
func imageFromSource(_ source: MediaSourceProxy?, size: CGSize?) -> UIImage?
func loadImageFromSource(_ source: MediaSourceProxy, size: CGSize?) async -> Result<UIImage, MediaProviderError>
func loadImageDataFromSource(_ source: MediaSourceProxy) async -> Result<Data, MediaProviderError>
}
extension ImageProviderProtocol {
func imageFromSource(_ source: MediaSourceProxy?) -> UIImage? {
imageFromSource(source, size: nil)
}
}
ElementX/Sources/Services/Media/Provider/MediaLoaderProtocol.swift
+1
View File
@@ -16,6 +16,7 @@
import Foundation
// sourcery: AutoMockable
protocol MediaLoaderProtocol {
func loadMediaContentForSource(_ source: MediaSourceProxy) async throws -> Data
ElementX/Sources/Services/Media/Provider/MediaProvider.swift
+44 -1
View File
@@ -14,17 +14,21 @@
// limitations under the License.
//
import Combine
import Kingfisher
import UIKit
struct MediaProvider: MediaProviderProtocol {
private let mediaLoader: MediaLoaderProtocol
private let imageCache: Kingfisher.ImageCache
private let networkMonitor: NetworkMonitorProtocol?
init(mediaLoader: MediaLoaderProtocol,
imageCache: Kingfisher.ImageCache) {
imageCache: Kingfisher.ImageCache,
networkMonitor: NetworkMonitorProtocol?) {
self.mediaLoader = mediaLoader
self.imageCache = imageCache
self.networkMonitor = networkMonitor
}
// MARK: Images
@@ -71,6 +75,45 @@ struct MediaProvider: MediaProviderProtocol {
}
}
func loadImageRetryingOnReconnection(_ source: MediaSourceProxy, size: CGSize?) -> Task<UIImage, any Error> {
guard let networkMonitor else {
fatalError("This method shouldn't be invoked without a NetworkMonitor set.")
}
return Task {
if case let .success(image) = await loadImageFromSource(source, size: size) {
return image
}
guard !Task.isCancelled else {
throw MediaProviderError.cancelled
}
for await reachability in networkMonitor.reachabilityPublisher.values {
guard !Task.isCancelled else {
throw MediaProviderError.cancelled
}
guard reachability == .reachable else {
continue
}
switch await loadImageFromSource(source, size: size) {
case .success(let image):
return image
case .failure:
// If it fails after a retry with the network available
// then something else must be wrong. Bail out.
if reachability == .reachable {
throw MediaProviderError.cancelled
}
}
}
throw MediaProviderError.cancelled
}
}
func loadImageDataFromSource(_ source: MediaSourceProxy) async -> Result<Data, MediaProviderError> {
do {
let imageData = try await mediaLoader.loadMediaContentForSource(source)
ElementX/Sources/Services/Media/Provider/MediaProviderProtocol.swift
+17 -2
View File
@@ -22,14 +22,29 @@ enum MediaProviderError: Error {
case failedRetrievingFile
case invalidImageData
case failedRetrievingThumbnail
case cancelled
}
protocol MediaProviderProtocol: ImageProviderProtocol {
func loadFileFromSource(_ source: MediaSourceProxy, body: String?) async -> Result<MediaFileHandleProxy, MediaProviderError>
protocol MediaProviderProtocol {
func imageFromSource(_ source: MediaSourceProxy?, size: CGSize?) -> UIImage?
func loadImageFromSource(_ source: MediaSourceProxy, size: CGSize?) async -> Result<UIImage, MediaProviderError>
func loadImageDataFromSource(_ source: MediaSourceProxy) async -> Result<Data, MediaProviderError>
func loadImageRetryingOnReconnection(_ source: MediaSourceProxy, size: CGSize?) -> Task<UIImage, Error>
func loadThumbnailForSource(source: MediaSourceProxy, size: CGSize) async -> Result<Data, MediaProviderError>
func loadFileFromSource(_ source: MediaSourceProxy, body: String?) async -> Result<MediaFileHandleProxy, MediaProviderError>
}
extension MediaProviderProtocol {
func imageFromSource(_ source: MediaSourceProxy?) -> UIImage? {
imageFromSource(source, size: nil)
}
func loadImageRetryingOnReconnection(_ source: MediaSourceProxy) -> Task<UIImage, Error> {
loadImageRetryingOnReconnection(source, size: nil)
}
func loadFileFromSource(_ source: MediaSourceProxy) async -> Result<MediaFileHandleProxy, MediaProviderError> {
await loadFileFromSource(source, body: nil)
}
ElementX/Sources/Services/Media/Provider/MockMediaProvider.swift
+10
View File
@@ -58,4 +58,14 @@ struct MockMediaProvider: MediaProviderProtocol {
}
return .failure(.failedRetrievingFile)
}
func loadImageRetryingOnReconnection(_ source: MediaSourceProxy, size: CGSize?) -> Task<UIImage, any Error> {
Task {
guard let image = UIImage(systemName: "photo") else {
fatalError()
}
return image
}
}
}
ElementX/Sources/Services/UserSession/UserSessionStore.swift
+2 -1
View File
@@ -111,7 +111,8 @@ class UserSessionStore: UserSessionStoreProtocol {
private func buildUserSessionWithClient(_ clientProxy: ClientProxyProtocol) -> UserSessionProtocol {
let mediaProvider = MediaProvider(mediaLoader: clientProxy,
imageCache: .onlyInMemory)
imageCache: .onlyInMemory,
networkMonitor: networkMonitor)
let voiceMessageMediaManager = VoiceMessageMediaManager(mediaProvider: mediaProvider)