ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +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/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)