ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the font style for placeholder messages (redacted/encrypted/unsupported). (#4927)

Browse Source
This commit is contained in:
Doug
2026-01-07 14:23:47 +00:00
committed by GitHub
parent 1726ee24c1
commit 0a749555a4
16 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/EncryptedRoomTimelineView.swift
+4 -3
View File
@@ -35,19 +35,20 @@ struct EncryptedRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
Label(timelineItem.body, icon: icon, iconSize: .small, relativeTo: .compound.bodyLG)
.labelStyle(RoomTimelineViewLabelStyle())
.labelStyle(RoomTimelineViewPlaceholderLabelStyle())
.font(.compound.bodyLG)
}
}
}
struct RoomTimelineViewLabelStyle: LabelStyle {
struct RoomTimelineViewPlaceholderLabelStyle: LabelStyle {
func makeBody(configuration: Configuration) -> some View {
HStack(alignment: .center, spacing: 8) {
configuration.icon
.foregroundColor(.compound.iconSecondary)
configuration.title
.foregroundColor(.compound.textPrimary)
.font(.compound.bodyLG.italic())
.foregroundColor(.compound.textSecondary)
}
.padding(.horizontal, 4)
}
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/NoticeRoomTimelineView.swift
-3
View File
@@ -14,9 +14,6 @@ struct NoticeRoomTimelineView: View, TextBasedRoomTimelineViewProtocol {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
// Don't use RoomTimelineViewLabelStyle with FormattedBodyText as the formatted text
// adds additional padding so the spacing between the icon and text is inconsistent.
// Spacing: 6 = label spacing - formatted text padding
Label {
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/RedactedRoomTimelineView.swift
+1 -2
View File
@@ -15,8 +15,7 @@ struct RedactedRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
Label(timelineItem.body, icon: \.delete, iconSize: .small, relativeTo: .compound.bodyLG)
.labelStyle(RoomTimelineViewLabelStyle())
.imageScale(.small) // Smaller icon so that the bubble remains rounded on the outside.
.labelStyle(RoomTimelineViewPlaceholderLabelStyle())
}
}
}
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/UnsupportedRoomTimelineView.swift
+8 -16
View File
@@ -14,19 +14,11 @@ struct UnsupportedRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
Label {
VStack(alignment: .leading, spacing: 0) {
Text("\(timelineItem.body): \(timelineItem.eventType)")
.fixedSize(horizontal: false, vertical: true)
Text(timelineItem.error)
.fixedSize(horizontal: false, vertical: true)
.font(.compound.bodySM)
}
} icon: {
CompoundIcon(\.warning, size: .small, relativeTo: .compound.bodyLG)
}
.labelStyle(RoomTimelineViewLabelStyle())
Label("\(timelineItem.body) (\(timelineItem.eventType)): \(timelineItem.error)",
icon: \.warning,
iconSize: .small,
relativeTo: .compound.bodyLG)
.labelStyle(RoomTimelineViewPlaceholderLabelStyle())
}
}
}
@@ -40,7 +32,7 @@ struct UnsupportedRoomTimelineView_Previews: PreviewProvider, TestablePreview {
static var body: some View {
VStack(alignment: .leading, spacing: 20.0) {
UnsupportedRoomTimelineView(timelineItem: itemWith(text: "Text",
UnsupportedRoomTimelineView(timelineItem: itemWith(text: "Unsupported",
timestamp: .mock,
isOutgoing: false,
senderId: "Bob"))
@@ -55,8 +47,8 @@ struct UnsupportedRoomTimelineView_Previews: PreviewProvider, TestablePreview {
private static func itemWith(text: String, timestamp: Date, isOutgoing: Bool, senderId: String) -> UnsupportedRoomTimelineItem {
UnsupportedRoomTimelineItem(id: .randomEvent,
body: text,
eventType: "Some Event Type",
error: "Something went wrong",
eventType: "event.type",
error: "something went wrong",
timestamp: timestamp,
isOutgoing: isOutgoing,
isEditable: false,