bf19e3e00b
Squashed commits: [42e45fc] Even more tweaks following code review [5dcd5be] Add swift-algoritms and switch bubbling detection to its `chunked` method [4ac70ed] Move the groupBy implementation to Collection instead of Array [6aeffc3] Tweaks following code review [0ca5ac2] Bubbles working again, grouping computed closer to the UI level [3a66030] Refactor how timeline items are built in the RoomTimelineController [57d51e9] Remove grouping from timeline items [8608950] Remove the RoomTimelineViewFactory, update the GroupRoomTimelineView [9e52e61] Add array grouping extension, unit tests and switched the timeline controller to it [7d213a1] First attempt [90bb1d7] Remove now unused `RoomTimelineController` `updatedTimelineItem` calback
77 lines
3.0 KiB
Swift
77 lines
3.0 KiB
Swift
//
|
|
// Copyright 2022 New Vector Ltd
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct EncryptedRoomTimelineView: View {
|
|
let timelineItem: EncryptedRoomTimelineItem
|
|
|
|
var body: some View {
|
|
TimelineStyler(timelineItem: timelineItem) {
|
|
Label(timelineItem.body, systemImage: "lock.shield")
|
|
.labelStyle(RoomTimelineViewLabelStyle())
|
|
}
|
|
}
|
|
}
|
|
|
|
struct RoomTimelineViewLabelStyle: LabelStyle {
|
|
@Environment(\.timelineStyle) private var timelineStyle
|
|
|
|
func makeBody(configuration: Configuration) -> some View {
|
|
HStack(alignment: .firstTextBaseline, spacing: 8) {
|
|
configuration.icon
|
|
.foregroundColor(.element.secondaryContent)
|
|
configuration.title
|
|
.font(.body)
|
|
.foregroundColor(.element.primaryContent)
|
|
}
|
|
.padding(.horizontal, timelineStyle == .bubbles ? 4 : 0)
|
|
}
|
|
}
|
|
|
|
struct EncryptedRoomTimelineView_Previews: PreviewProvider {
|
|
static let viewModel = RoomScreenViewModel.mock
|
|
|
|
static var previews: some View {
|
|
body.environmentObject(viewModel.context)
|
|
body.timelineStyle(.plain).environmentObject(viewModel.context)
|
|
}
|
|
|
|
static var body: some View {
|
|
VStack(alignment: .leading, spacing: 20.0) {
|
|
EncryptedRoomTimelineView(timelineItem: itemWith(text: "Text",
|
|
timestamp: "Now",
|
|
isOutgoing: false,
|
|
senderId: "Bob"))
|
|
|
|
EncryptedRoomTimelineView(timelineItem: itemWith(text: "Some other text",
|
|
timestamp: "Later",
|
|
isOutgoing: true,
|
|
senderId: "Anne"))
|
|
}
|
|
}
|
|
|
|
private static func itemWith(text: String, timestamp: String, isOutgoing: Bool, senderId: String) -> EncryptedRoomTimelineItem {
|
|
EncryptedRoomTimelineItem(id: UUID().uuidString,
|
|
body: text,
|
|
encryptionType: .unknown,
|
|
timestamp: timestamp,
|
|
isOutgoing: isOutgoing,
|
|
isEditable: false,
|
|
sender: .init(id: senderId))
|
|
}
|
|
}
|