Skip to content

Fix animation glitch on 'this is the beginning of...' virtual event #4130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix animation glitch on 'this is the beginning of...' virtual event #4130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78ee6b0
fix animation glitch on 'this is the beginning of...' virtual event
ara4n May 18, 2025
743d3c0
Merge branch 'develop' into matthew/fix-start-room-glitch
Velin92 May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ElementX/Sources/Screens/Timeline/View/TimelineItemViews/TimelineStartRoomTimelineView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct TimelineStartRoomTimelineView: View {

struct TimelineStartRoomTimelineView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
let item = TimelineStartRoomTimelineItem(name: "Alice and Bob")
let item = TimelineStartRoomTimelineItem(id: .virtual(uniqueID: .init("Start")), name: "Alice and Bob")
TimelineStartRoomTimelineView(timelineItem: item)
}
}
2 changes: 1 addition & 1 deletion ElementX/Sources/Services/Timeline/TimelineController/TimelineController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ class TimelineController: TimelineControllerProtocol {
case .readMarker:
return ReadMarkerRoomTimelineItem(id: .virtual(uniqueID: uniqueID))
case .timelineStart:
return isDM ? nil : TimelineStartRoomTimelineItem(name: roomDisplayName)
return isDM ? nil : TimelineStartRoomTimelineItem(id: .virtual(uniqueID: uniqueID), name: roomDisplayName)
}
case .unknown:
return nil
Expand Down
2 changes: 1 addition & 1 deletion ...Sources/Services/Timeline/TimelineItems/Items/Virtual/TimelineStartRoomTimelineItem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
import Foundation

struct TimelineStartRoomTimelineItem: DecorationTimelineItemProtocol, Equatable {
let id: TimelineItemIdentifier = .virtual(uniqueID: .init(UUID().uuidString))
let id: TimelineItemIdentifier
Copy link
Member

@Velin92 Velin92 May 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the only thing needed is to do TimelineItemIdentifier = .virtual(uniqueID: .init("TimelineStart")) or just "Start" and the rest should come by itself quite easily without any other change in any other file.

let name: String?
}
Loading