mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-05 11:58:32 +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:
Stefan Ceriu
GitHub
@@ -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()
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -38,6 +38,6 @@ struct BloomView: View {
|
||||
name: context.viewState.userDisplayName,
|
||||
contentID: context.viewState.userID,
|
||||
avatarSize: .custom(256),
|
||||
imageProvider: context.imageProvider)
|
||||
mediaProvider: context.mediaProvider)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
+1
-1
@@ -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))
|
||||
}
|
||||
|
||||
+3
-3
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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 🤦♂️
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+2
-2
@@ -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() {
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
+2
-2
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
@@ -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: { })
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
|
||||
|
||||
super.init(initialViewState: .init(joinedMembersCount: roomProxy.joinedMembersCount,
|
||||
bindings: .init(mode: initialMode)),
|
||||
imageProvider: mediaProvider)
|
||||
mediaProvider: mediaProvider)
|
||||
|
||||
setupMembers()
|
||||
}
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ struct RoomMembersListManageMemberSheet: View {
|
||||
Form {
|
||||
AvatarHeaderView(member: member,
|
||||
avatarSize: .user(on: .memberDetails),
|
||||
imageProvider: context.imageProvider) {
|
||||
mediaProvider: context.mediaProvider) {
|
||||
EmptyView()
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
+5
-5
@@ -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 }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
|
||||
+4
-4
@@ -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()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
|
||||
roomAvatar: roomProxy.avatar,
|
||||
hasOngoingCall: roomProxy.hasOngoingCall,
|
||||
bindings: .init()),
|
||||
imageProvider: mediaProvider)
|
||||
mediaProvider: mediaProvider)
|
||||
|
||||
setupSubscriptions()
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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()
|
||||
|
||||
+1
-1
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
+1
-1
@@ -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
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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))
|
||||
})
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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: {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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: { })
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user