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:
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
@@ -45,7 +45,7 @@ class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomCh
moderators: [],
users: [],
bindings: .init()),
imageProvider: mediaProvider)
mediaProvider: mediaProvider)
roomProxy.membersPublisher
.receive(on: DispatchQueue.main)
@@ -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)
@@ -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)
}
@@ -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))
}
@@ -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)
}