ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SwiftLint rule to enforce stack spacing. (#2080)

Browse Source 
Xcode 15 changes the default behaviour and given we're always working from designs, we shouldn't rely on it for our layout.
This commit is contained in:
Doug
2023-11-14 12:38:38 +00:00
committed by GitHub
parent 752ad66397
commit 2c1e61a1bc
123 changed files with 289 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/View/Style/LongPressWithFeedback.swift
+1 -1
View File
@@ -72,7 +72,7 @@ struct LongPressWithFeedback_Previews: PreviewProvider, TestablePreview {
var body: some View {
NavigationStack {
ScrollView {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 8) {
mockBubble("This is a message from somebody with a couple of lines of text.")
.longPressWithFeedback { isPresentingSheet = true }
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemAccessibilityModifier.swift
+1 -1
View File
@@ -33,7 +33,7 @@ private struct TimelineItemAccessibilityModifier: ViewModifier {
case let timelineItem as EventBasedTimelineItemProtocol:
content
.accessibilityRepresentation {
VStack {
VStack(spacing: 8) {
Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
content
}
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
+2 -2
View File
@@ -49,7 +49,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
}
VStack(alignment: alignment, spacing: 0) {
HStack {
HStack(spacing: 0) {
if timelineItem.isOutgoing {
Spacer()
}
@@ -520,7 +520,7 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
}
static var replies: some View {
VStack {
VStack(spacing: 0) {
RoomTimelineItemView(viewState: .init(item: TextRoomTimelineItem(id: .init(timelineID: ""),
timestamp: "10:42",
isOutgoing: true,
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
+8 -11
View File
@@ -27,16 +27,12 @@ struct TimelineItemPlainStylerView<Content: View>: View {
@State private var showItemActionMenu = false
var body: some View {
VStack(alignment: .trailing) {
VStack(alignment: .trailing, spacing: 0) {
VStack(alignment: .leading, spacing: 4) {
header
VStack(alignment: .leading, spacing: 4) {
HStack(alignment: .firstTextBaseline) {
contentWithReply
Spacer()
}
contentWithReply
supplementaryViews
}
}
@@ -47,7 +43,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
@ViewBuilder
var contentWithReply: some View {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 8) {
if let messageTimelineItem = timelineItem as? EventBasedMessageTimelineItemProtocol {
if messageTimelineItem.isThreaded {
ThreadDecorator()
@@ -98,8 +94,8 @@ struct TimelineItemPlainStylerView<Content: View>: View {
@ViewBuilder
private var header: some View {
if shouldShowSenderDetails {
HStack {
HStack {
HStack(spacing: 8) {
HStack(spacing: 8) {
TimelineSenderAvatarView(timelineItem: timelineItem)
Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
.font(.subheadline)
@@ -123,7 +119,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
@ViewBuilder
private var supplementaryViews: some View {
VStack {
VStack(spacing: 4) {
if timelineItem.properties.isEdited {
Text(L10n.commonEditedSuffix)
.font(.compound.bodySM)
@@ -251,8 +247,9 @@ struct TimelineItemPlainStylerView_Previews: PreviewProvider, TestablePreview {
}
}
.environment(\.timelineStyle, .plain)
.previewLayout(.sizeThatFits)
.environmentObject(viewModel.context)
.previewLayout(.sizeThatFits)
threads
.padding()
.environment(\.timelineStyle, .plain)
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
+2 -2
View File
@@ -145,7 +145,7 @@ struct TimelineItemStyler_Previews: PreviewProvider, TestablePreview {
content: .init(body: "באמת‏! -- house!"))
static var testView: some View {
VStack {
VStack(spacing: 0) {
TextRoomTimelineView(timelineItem: base)
TextRoomTimelineView(timelineItem: sentNonLast)
TextRoomTimelineView(timelineItem: sentLast)
@@ -156,7 +156,7 @@ struct TimelineItemStyler_Previews: PreviewProvider, TestablePreview {
}
static var languagesTestView: some View {
VStack {
VStack(spacing: 0) {
TextRoomTimelineView(timelineItem: ltrString)
TextRoomTimelineView(timelineItem: rtlString)
TextRoomTimelineView(timelineItem: ltrStringThatContainsRtl)
ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift
+4 -4
View File
@@ -67,7 +67,7 @@ struct ReactionsSummaryView: View {
TabView(selection: $selectedReactionKey) {
ForEach(reactions, id: \.self) { reaction in
ScrollView {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 8) {
ForEach(reaction.senders, id: \.self) { sender in
ReactionSummarySenderView(sender: sender, member: members[sender.senderID], imageProvider: imageProvider)
.padding(.horizontal, 16)
@@ -122,15 +122,15 @@ private struct ReactionSummarySenderView: View {
}
var body: some View {
HStack {
HStack(spacing: 8) {
LoadableAvatarImage(url: member?.avatarURL,
name: displayName,
contentID: sender.senderID,
avatarSize: .user(on: .timeline),
imageProvider: imageProvider)
VStack(alignment: .leading) {
HStack {
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 8) {
Text(displayName)
.font(.compound.bodyMDSemibold)
.frame(maxWidth: .infinity, alignment: .leading)
ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
+1 -1
View File
@@ -42,7 +42,7 @@ struct TimelineDeliveryStatusView: View {
struct TimelineDeliveryStatusView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack {
VStack(spacing: 8) {
TimelineDeliveryStatusView(deliveryStatus: .sending)
TimelineDeliveryStatusView(deliveryStatus: .sent)
}
ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
+1 -1
View File
@@ -205,7 +205,7 @@ struct TimelineReactionAddMoreButtonLabel: View {
struct TimelineReactionViewPreviewsContainer: View {
var body: some View {
VStack {
VStack(spacing: 8) {
TimelineReactionsView(context: RoomScreenViewModel.mock.context,
itemID: .init(timelineID: "1"),
reactions: [AggregatedReaction.mockReactionWithLongText,
ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift
+1 -1
View File
@@ -92,7 +92,7 @@ struct TimelineReadReceiptsView_Previews: PreviewProvider, TestablePreview {
}
static var previews: some View {
VStack {
VStack(spacing: 8) {
TimelineReadReceiptsView(timelineItem: mockTimelineItem(with: singleReceipt))
.environmentObject(viewModel.context)
TimelineReadReceiptsView(timelineItem: mockTimelineItem(with: doubleReceipt))
ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift
+1 -1
View File
@@ -119,7 +119,7 @@ struct SwipeRightAction_Previews: PreviewProvider, TestablePreview {
var body: some View {
NavigationStack {
ScrollView {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 2) {
mockBubble("This is a message from somebody with a couple of lines of text.")
.swipeRightAction {
Image(systemName: "flame")
ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift
+1 -1
View File
@@ -22,7 +22,7 @@ struct AudioRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
HStack {
HStack(spacing: 8) {
Image(systemName: "waveform")
.foregroundColor(.compound.iconPrimary)
FormattedBodyText(text: timelineItem.content.body)
ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift
+1 -1
View File
@@ -34,7 +34,7 @@ struct CollapsibleRoomTimelineView: View {
isExpanded.toggle()
}
} label: {
HStack(alignment: .center) {
HStack(alignment: .center, spacing: 8) {
Text(L10n.roomTimelineStateChanges(timelineItem.items.count))
Text(Image(systemName: "chevron.forward"))
.rotationEffect(.degrees(isExpanded ? 90 : 0))
ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedHistoryRoomTimelineView.swift
+1 -1
View File
@@ -60,7 +60,7 @@ private struct EncryptedHistoryLabelStyle: LabelStyle {
struct EncryptedHistoryRoomTimelineView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack {
VStack(spacing: 8) {
EncryptedHistoryRoomTimelineView(timelineItem: .init(id: .random, isSessionVerified: true))
EncryptedHistoryRoomTimelineView(timelineItem: .init(id: .random, isSessionVerified: false))
}
ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
+1 -1
View File
@@ -22,7 +22,7 @@ struct FileRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
HStack {
HStack(spacing: 8) {
Image(systemName: "doc.text.fill")
.foregroundColor(.compound.iconPrimary)
FormattedBodyText(text: timelineItem.content.body)
ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift
+2 -2
View File
@@ -87,7 +87,7 @@ struct LocationRoomTimelineView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
ScrollView {
VStack {
VStack(spacing: 8) {
states
.padding(.horizontal)
}
@@ -96,7 +96,7 @@ struct LocationRoomTimelineView_Previews: PreviewProvider, TestablePreview {
.previewDisplayName("Bubbles")
ScrollView {
VStack {
VStack(spacing: 0) {
states
.padding(.horizontal)
}
ElementX/Sources/Screens/RoomScreen/View/Timeline/PollOptionView.swift
+2 -2
View File
@@ -26,7 +26,7 @@ struct PollOptionView: View {
FormRowAccessory(kind: .multipleSelection(isSelected: pollOption.isSelected))
VStack(spacing: 10) {
HStack(alignment: .lastTextBaseline) {
HStack(alignment: .lastTextBaseline, spacing: 8) {
Text(pollOption.text)
.font(isFinalWinningOption ? .compound.bodyLGSemibold : .compound.bodyLG)
.multilineTextAlignment(.leading)
@@ -82,7 +82,7 @@ private struct PollProgressView: View {
struct PollOptionView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack {
VStack(spacing: 8) {
Group {
PollOptionView(pollOption: .init(id: "1",
text: "Italian 🇮🇹",
ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift
+1 -1
View File
@@ -22,7 +22,7 @@ struct UnsupportedRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
Label {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 0) {
Text("\(timelineItem.body): \(timelineItem.eventType)")
.fixedSize(horizontal: false, vertical: true)
ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift
+3 -4
View File
@@ -24,7 +24,7 @@ struct TimelineItemDebugView: View {
var body: some View {
NavigationStack {
ScrollView {
VStack {
VStack(spacing: 8) {
TimelineItemInfoDisclosureGroup(title: "Model", text: info.model, isInitiallyExpanded: true)
if let originalJSONInfo = info.originalJSON {
@@ -83,10 +83,9 @@ struct TimelineItemDebugView: View {
@ViewBuilder
var disclosureGroupContent: some View {
VStack(alignment: .leading) {
Spacer()
VStack(alignment: .leading, spacing: 0) {
Divider()
.padding(.vertical, 8)
Text(text)
.font(.compound.bodyXS.monospaced())
ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
+7 -9
View File
@@ -142,7 +142,7 @@ public struct TimelineItemMenu: View {
private let feedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
public var body: some View {
VStack {
VStack(spacing: 8) {
header
.frame(idealWidth: 300.0)
@@ -187,7 +187,7 @@ public struct TimelineItemMenu: View {
Spacer(minLength: 8.0)
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 0) {
Text(item.sender.displayName ?? item.sender.id)
.font(.compound.bodySMSemibold)
.foregroundColor(.compound.textPrimary)
@@ -211,7 +211,7 @@ public struct TimelineItemMenu: View {
}
private var reactionsSection: some View {
HStack(alignment: .center) {
HStack(alignment: .center, spacing: 8) {
reactionButton(for: "👍️")
reactionButton(for: "👎️")
reactionButton(for: "🔥")
@@ -286,12 +286,10 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview {
static let viewModel = RoomScreenViewModel.mock
static var previews: some View {
VStack {
if let item = RoomTimelineItemFixtures.singleMessageChunk.first as? EventBasedTimelineItemProtocol,
let actions = TimelineItemMenuActions(actions: [.copy, .edit, .reply(isThread: false), .redact], debugActions: [.viewSource]) {
TimelineItemMenu(item: item, actions: actions)
}
if let item = RoomTimelineItemFixtures.singleMessageChunk.first as? EventBasedTimelineItemProtocol,
let actions = TimelineItemMenuActions(actions: [.copy, .edit, .reply(isThread: false), .redact], debugActions: [.viewSource]) {
TimelineItemMenu(item: item, actions: actions)
.environmentObject(viewModel.context)
}
.environmentObject(viewModel.context)
}
}