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

Use the room heroes when computing a DM avatar. (#2900)

Browse Source 
* Use room heroes for DM avatar content ID.

* Use RoomAvatar.heroes for the DM Details stack.
This commit is contained in:
Doug
2024-06-19 11:27:10 +01:00
committed by GitHub
parent 17d96b0f4b
commit 834260c144
55 changed files with 524 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
+1 -1
View File
@@ -144,7 +144,7 @@ enum RoomScreenComposerAction {
struct RoomScreenViewState: BindableState {
var roomID: String
var roomTitle = ""
var roomAvatarURL: URL?
var roomAvatar: RoomAvatar
var members: [String: RoomMemberState] = [:]
var typingMembers: [String] = []
var showLoading = false
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+5 -5
View File
@@ -80,9 +80,9 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
appSettings: appSettings,
analyticsService: analyticsService)
super.init(initialViewState: RoomScreenViewState(roomID: timelineController.roomID,
super.init(initialViewState: RoomScreenViewState(roomID: roomProxy.id,
roomTitle: roomProxy.roomTitle,
roomAvatarURL: roomProxy.avatarURL,
roomAvatar: roomProxy.avatar,
timelineStyle: appSettings.timelineStyle,
isEncryptedOneToOneRoom: roomProxy.isEncryptedOneToOneRoom,
timelineViewState: TimelineViewState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }),
@@ -389,9 +389,9 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
.throttle(for: .seconds(1), scheduler: DispatchQueue.main, latest: true)
.sink { [weak self] _ in
guard let self else { return }
self.state.roomTitle = roomProxy.roomTitle
self.state.roomAvatarURL = roomProxy.avatarURL
self.state.hasOngoingCall = roomProxy.hasOngoingCall
state.roomTitle = roomProxy.roomTitle
state.roomAvatar = roomProxy.avatar
state.hasOngoingCall = roomProxy.hasOngoingCall
}
.store(in: &cancellables)
ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
+15 -16
View File
@@ -15,19 +15,18 @@
//
import Combine
import Foundation
import Compound
import SwiftUI
struct RoomHeaderView: View {
let roomID: String
let roomName: String
let avatarURL: URL?
let roomAvatar: RoomAvatar
let imageProvider: ImageProviderProtocol?
var body: some View {
HStack(spacing: 12) {
roomAvatar
avatarImage
.accessibilityHidden(true)
Text(roomName)
.font(.compound.bodyLGSemibold)
@@ -37,28 +36,28 @@ struct RoomHeaderView: View {
.frame(maxWidth: .infinity, alignment: .leading)
}
private var roomAvatar: some View {
LoadableAvatarImage(url: avatarURL,
name: roomName,
contentID: roomID,
avatarSize: .room(on: .timeline),
imageProvider: imageProvider)
private var avatarImage: some View {
RoomAvatarImage(avatar: roomAvatar,
avatarSize: .room(on: .timeline),
imageProvider: imageProvider)
.accessibilityIdentifier(A11yIdentifiers.roomScreen.avatar)
}
}
struct RoomHeaderView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
RoomHeaderView(roomID: "1",
roomName: "Some Room name",
avatarURL: URL.picturesDirectory,
RoomHeaderView(roomName: "Some Room name",
roomAvatar: .room(id: "1",
name: "Some Room Name",
avatarURL: URL.picturesDirectory),
imageProvider: MockMediaProvider())
.previewLayout(.sizeThatFits)
.padding()
RoomHeaderView(roomID: "1",
roomName: "Some Room name",
avatarURL: nil,
RoomHeaderView(roomName: "Some Room name",
roomAvatar: .room(id: "1",
name: "Some Room Name",
avatarURL: nil),
imageProvider: MockMediaProvider())
.previewLayout(.sizeThatFits)
.padding()
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+5 -4
View File
@@ -137,9 +137,8 @@ struct RoomScreen: View {
// .principal + .primaryAction works better than .navigation leading + trailing
// as the latter disables interaction in the action button for rooms with long names
ToolbarItem(placement: .principal) {
RoomHeaderView(roomID: context.viewState.roomID,
roomName: context.viewState.roomTitle,
avatarURL: context.viewState.roomAvatarURL,
RoomHeaderView(roomName: context.viewState.roomTitle,
roomAvatar: context.viewState.roomAvatar,
imageProvider: context.imageProvider)
// Using a button stops it from getting truncated in the navigation bar
.onTapGesture {
@@ -184,7 +183,9 @@ struct RoomScreen: View {
// MARK: - Previews
struct RoomScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(name: "Preview room", hasOngoingCall: true)),
static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(id: "stable_id",
name: "Preview room",
hasOngoingCall: true)),
timelineController: MockRoomTimelineController(),
mediaProvider: MockMediaProvider(),
mediaPlayerProvider: MediaPlayerProviderMock(),
ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineView.swift
+2 -1
View File
@@ -84,7 +84,8 @@ struct TimelineView: UIViewControllerRepresentable {
// MARK: - Previews
struct TimelineView_Previews: PreviewProvider, TestablePreview {
static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(name: "Preview room")),
static let viewModel = RoomScreenViewModel(roomProxy: RoomProxyMock(.init(id: "stable_id",
name: "Preview room")),
timelineController: MockRoomTimelineController(),
mediaProvider: MockMediaProvider(),
mediaPlayerProvider: MediaPlayerProviderMock(),