swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename a couple of missed isEncryptedOneToOneRoom properties. (#3804)

Browse Source
This commit is contained in:
Doug 2025-02-20 14:15:49 +00:00 committed by GitHub
parent c2e10b910a
commit 3de025cb85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX/Sources/Screens/FilePreviewScreen/TimelineMediaPreviewViewModel.swift
View File

@ -144,7 +144,7 @@ class TimelineMediaPreviewViewModel: TimelineMediaPreviewViewModelType {
canCurrentUserRedactOthers: timelineContext.viewState.canCurrentUserRedactOthers, canCurrentUserRedactOthers: timelineContext.viewState.canCurrentUserRedactOthers,
canCurrentUserPin: timelineContext.viewState.canCurrentUserPin, canCurrentUserPin: timelineContext.viewState.canCurrentUserPin,
pinnedEventIDs: timelineContext.viewState.pinnedEventIDs, pinnedEventIDs: timelineContext.viewState.pinnedEventIDs,
isDM: timelineContext.viewState.isEncryptedOneToOneRoom, isDM: timelineContext.viewState.isDirectOneToOneRoom,
isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled, isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled,
timelineKind: timelineContext.viewState.timelineKind, timelineKind: timelineContext.viewState.timelineKind,
emojiProvider: timelineContext.viewState.emojiProvider) emojiProvider: timelineContext.viewState.emojiProvider)

2
ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift
View File

@ -35,7 +35,7 @@ struct PinnedEventsTimelineScreen: View {
canCurrentUserRedactOthers: timelineContext.viewState.canCurrentUserRedactOthers, canCurrentUserRedactOthers: timelineContext.viewState.canCurrentUserRedactOthers,
canCurrentUserPin: timelineContext.viewState.canCurrentUserPin, canCurrentUserPin: timelineContext.viewState.canCurrentUserPin,
pinnedEventIDs: timelineContext.viewState.pinnedEventIDs, pinnedEventIDs: timelineContext.viewState.pinnedEventIDs,
isDM: timelineContext.viewState.isEncryptedOneToOneRoom, isDM: timelineContext.viewState.isDirectOneToOneRoom,
isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled, isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled,
timelineKind: timelineContext.viewState.timelineKind, timelineKind: timelineContext.viewState.timelineKind,
emojiProvider: timelineContext.viewState.emojiProvider) emojiProvider: timelineContext.viewState.emojiProvider)

2
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
View File

@ -73,7 +73,7 @@ struct RoomScreen: View {
canCurrentUserRedactOthers: timelineContext.viewState.canCurrentUserRedactOthers, canCurrentUserRedactOthers: timelineContext.viewState.canCurrentUserRedactOthers,
canCurrentUserPin: timelineContext.viewState.canCurrentUserPin, canCurrentUserPin: timelineContext.viewState.canCurrentUserPin,
pinnedEventIDs: timelineContext.viewState.pinnedEventIDs, pinnedEventIDs: timelineContext.viewState.pinnedEventIDs,
isDM: timelineContext.viewState.isEncryptedOneToOneRoom, isDM: timelineContext.viewState.isDirectOneToOneRoom,
isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled, isViewSourceEnabled: timelineContext.viewState.isViewSourceEnabled,
timelineKind: timelineContext.viewState.timelineKind, timelineKind: timelineContext.viewState.timelineKind,
emojiProvider: timelineContext.viewState.emojiProvider) emojiProvider: timelineContext.viewState.emojiProvider)

2
ElementX/Sources/Screens/Timeline/TimelineModels.swift
View File

@ -92,7 +92,7 @@ struct TimelineViewState: BindableState {
var typingMembers: [String] = [] var typingMembers: [String] = []
var showLoading = false var showLoading = false
var showReadReceipts = false var showReadReceipts = false
var isEncryptedOneToOneRoom = false var isDirectOneToOneRoom = false
var timelineState: TimelineState // check the doc before changing this var timelineState: TimelineState // check the doc before changing this
var ownUserID: String var ownUserID: String

2
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
View File

@ -84,7 +84,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
super.init(initialViewState: TimelineViewState(timelineKind: timelineController.timelineKind, super.init(initialViewState: TimelineViewState(timelineKind: timelineController.timelineKind,
roomID: roomProxy.id, roomID: roomProxy.id,
isEncryptedOneToOneRoom: roomProxy.isDirectOneToOneRoom, isDirectOneToOneRoom: roomProxy.isDirectOneToOneRoom,
timelineState: TimelineState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }), timelineState: TimelineState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }),
ownUserID: roomProxy.ownUserID, ownUserID: roomProxy.ownUserID,
isViewSourceEnabled: appSettings.viewSourceEnabled, isViewSourceEnabled: appSettings.viewSourceEnabled,

10
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
View File

@ -17,7 +17,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
let adjustedDeliveryStatus: TimelineItemDeliveryStatus? let adjustedDeliveryStatus: TimelineItemDeliveryStatus?
@ViewBuilder let content: () -> Content @ViewBuilder let content: () -> Content
private var isEncryptedOneToOneRoom: Bool { context.viewState.isEncryptedOneToOneRoom } private var isDirectOneToOneRoom: Bool { context.viewState.isDirectOneToOneRoom }
private var isFocussed: Bool { focussedEventID != nil && timelineItem.id.eventID == focussedEventID } private var isFocussed: Bool { focussedEventID != nil && timelineItem.id.eventID == focussedEventID }
private var isPinned: Bool { private var isPinned: Bool {
guard context.viewState.timelineKind != .pinned, guard context.viewState.timelineKind != .pinned,
@ -33,14 +33,14 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
private let bubbleHorizontalPadding: CGFloat = 8 private let bubbleHorizontalPadding: CGFloat = 8
/// Additional padding applied to outgoing bubbles when the avatar is shown /// Additional padding applied to outgoing bubbles when the avatar is shown
private var bubbleAvatarPadding: CGFloat { private var bubbleAvatarPadding: CGFloat {
guard !timelineItem.isOutgoing, !isEncryptedOneToOneRoom else { return 0 } guard !timelineItem.isOutgoing, !isDirectOneToOneRoom else { return 0 }
return 8 return 8
} }
var body: some View { var body: some View {
ZStack(alignment: .trailingFirstTextBaseline) { ZStack(alignment: .trailingFirstTextBaseline) {
VStack(alignment: alignment, spacing: -12) { VStack(alignment: alignment, spacing: -12) {
if !timelineItem.isOutgoing, !isEncryptedOneToOneRoom { if !timelineItem.isOutgoing, !isDirectOneToOneRoom {
header header
.zIndex(1) .zIndex(1)
} }
@ -147,7 +147,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
canCurrentUserRedactOthers: context.viewState.canCurrentUserRedactOthers, canCurrentUserRedactOthers: context.viewState.canCurrentUserRedactOthers,
canCurrentUserPin: context.viewState.canCurrentUserPin, canCurrentUserPin: context.viewState.canCurrentUserPin,
pinnedEventIDs: context.viewState.pinnedEventIDs, pinnedEventIDs: context.viewState.pinnedEventIDs,
isDM: context.viewState.isEncryptedOneToOneRoom, isDM: context.viewState.isDirectOneToOneRoom,
isViewSourceEnabled: context.viewState.isViewSourceEnabled, isViewSourceEnabled: context.viewState.isViewSourceEnabled,
timelineKind: context.viewState.timelineKind, timelineKind: context.viewState.timelineKind,
emojiProvider: context.viewState.emojiProvider) emojiProvider: context.viewState.emojiProvider)
@ -208,7 +208,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
} }
private var messageBubbleTopPadding: CGFloat { private var messageBubbleTopPadding: CGFloat {
guard timelineItem.isOutgoing || isEncryptedOneToOneRoom else { return 0 } guard timelineItem.isOutgoing || isDirectOneToOneRoom else { return 0 }
return timelineGroupStyle == .single || timelineGroupStyle == .first ? 8 : 0 return timelineGroupStyle == .single || timelineGroupStyle == .first ? 8 : 0
} }