mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Automatically try reloading failed images on network changes (#3170)
* 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:
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user