* just added the isThreaded property to message based events * done but I should add a bunch of tests for images and videos and locations * handling for image and videos, but locations might need to be double checked * code improvement * better tests and removed code that is not used, we need to fix first the appearence of replies * bubble style is solved, we now need plain style * also added plain style * better handling for bubble style * rounded corner only for bubbles in location * fix for wrong aspect ratio in replies * all changes done * better testing * swift format * changelog * PR comments and rebase. * Simplify corner radius on location timeline view. --------- Co-authored-by: Doug <douglase@element.io>
83 lines
3.8 KiB
Swift
83 lines
3.8 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 Foundation
|
|
import SwiftUI
|
|
|
|
struct TextRoomTimelineView: View, TextBasedRoomTimelineViewProtocol {
|
|
let timelineItem: TextRoomTimelineItem
|
|
@Environment(\.timelineStyle) var timelineStyle
|
|
|
|
var body: some View {
|
|
TimelineStyler(timelineItem: timelineItem) {
|
|
if let attributedString = timelineItem.content.formattedBody {
|
|
FormattedBodyText(attributedString: attributedString,
|
|
additionalWhitespacesCount: timelineItem.additionalWhitespaces(timelineStyle: timelineStyle),
|
|
boostEmojiSize: true)
|
|
} else {
|
|
FormattedBodyText(text: timelineItem.body,
|
|
additionalWhitespacesCount: timelineItem.additionalWhitespaces(timelineStyle: timelineStyle),
|
|
boostEmojiSize: true)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
struct TextRoomTimelineView_Previews: PreviewProvider {
|
|
static let viewModel = RoomScreenViewModel.mock
|
|
|
|
static var previews: some View {
|
|
body.environmentObject(viewModel.context)
|
|
body
|
|
.environment(\.timelineStyle, .plain)
|
|
.environmentObject(viewModel.context)
|
|
}
|
|
|
|
static var body: some View {
|
|
VStack(alignment: .leading, spacing: 20.0) {
|
|
TextRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
|
|
timestamp: "Now",
|
|
isOutgoing: false,
|
|
senderId: "Bob"))
|
|
|
|
TextRoomTimelineView(timelineItem: itemWith(text: "Some other text",
|
|
timestamp: "Later",
|
|
isOutgoing: true,
|
|
senderId: "Anne"))
|
|
|
|
TextRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
|
|
timestamp: "Now",
|
|
isOutgoing: false,
|
|
senderId: "Bob"))
|
|
|
|
TextRoomTimelineView(timelineItem: itemWith(text: "Some other text",
|
|
timestamp: "Later",
|
|
isOutgoing: true,
|
|
senderId: "Anne"))
|
|
}
|
|
}
|
|
|
|
private static func itemWith(text: String, timestamp: String, isOutgoing: Bool, senderId: String) -> TextRoomTimelineItem {
|
|
TextRoomTimelineItem(id: .random,
|
|
timestamp: timestamp,
|
|
isOutgoing: isOutgoing,
|
|
isEditable: isOutgoing,
|
|
isThreaded: false,
|
|
sender: .init(id: senderId),
|
|
content: .init(body: text))
|
|
}
|
|
}
|