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

Naming consistency and improve conformance (a bit) (#625)

Browse Source
This commit is contained in:
Doug
2023-02-24 11:44:41 +00:00
committed by GitHub
parent a3c7c47a69
commit 21bd37c0b1
7 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+4 -4
View File
@@ -166,16 +166,16 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
if itemGroup.count == 1 {
if let firstItem = itemGroup.first {
timelineViews.append(RoomTimelineViewProvider(timelineItem: firstItem, grouping: .single))
timelineViews.append(RoomTimelineViewProvider(timelineItem: firstItem, groupStyle: .single))
}
} else {
for (index, item) in itemGroup.enumerated() {
if index == 0 {
timelineViews.append(RoomTimelineViewProvider(timelineItem: item, grouping: .first))
timelineViews.append(RoomTimelineViewProvider(timelineItem: item, groupStyle: .first))
} else if index == itemGroup.count - 1 {
timelineViews.append(RoomTimelineViewProvider(timelineItem: item, grouping: .last))
timelineViews.append(RoomTimelineViewProvider(timelineItem: item, groupStyle: .last))
} else {
timelineViews.append(RoomTimelineViewProvider(timelineItem: item, grouping: .middle))
timelineViews.append(RoomTimelineViewProvider(timelineItem: item, groupStyle: .middle))
}
}
}
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
+5 -5
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct TimelineItemBubbledStylerView<Content: View>: View {
@EnvironmentObject private var context: RoomScreenViewModel.Context
@Environment(\.timelineGroupStyle) private var timelineStyleGrouping
@Environment(\.timelineGroupStyle) private var timelineGroupStyle
let timelineItem: EventBasedTimelineItemProtocol
@ViewBuilder let content: () -> Content
@@ -125,7 +125,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
private var messageBubbleTopPadding: CGFloat {
guard timelineItem.isOutgoing else { return 0 }
return timelineStyleGrouping == .single || timelineStyleGrouping == .first ? 8 : 0
return timelineGroupStyle == .single || timelineGroupStyle == .first ? 8 : 0
}
private var shouldAvoidBubbling: Bool {
@@ -137,7 +137,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
}
private var roundedCorners: UIRectCorner {
switch timelineStyleGrouping {
switch timelineGroupStyle {
case .single:
return .allCorners
case .first:
@@ -158,7 +158,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
}
private var shouldShowSenderDetails: Bool {
timelineStyleGrouping.shouldShowSenderDetails
timelineGroupStyle.shouldShowSenderDetails
}
}
@@ -177,7 +177,7 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider {
VStack(alignment: .leading, spacing: 0) {
ForEach(1..<MockRoomTimelineController().timelineItems.count, id: \.self) { index in
let item = MockRoomTimelineController().timelineItems[index]
RoomTimelineViewProvider(timelineItem: item, grouping: .single)
RoomTimelineViewProvider(timelineItem: item, groupStyle: .single)
.padding(TimelineStyle.bubbles.rowInsets) // Insets added in the table view cells
}
}
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
+3 -3
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct TimelineItemPlainStylerView<Content: View>: View {
@EnvironmentObject private var context: RoomScreenViewModel.Context
@Environment(\.timelineGroupStyle) private var timelineStyleGrouping
@Environment(\.timelineGroupStyle) private var timelineGroupStyle
let timelineItem: EventBasedTimelineItemProtocol
@ViewBuilder let content: () -> Content
@@ -81,7 +81,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
}
private var shouldShowSenderDetails: Bool {
timelineStyleGrouping.shouldShowSenderDetails
timelineGroupStyle.shouldShowSenderDetails
}
}
@@ -92,7 +92,7 @@ struct TimelineItemPlainStylerView_Previews: PreviewProvider {
VStack(alignment: .leading, spacing: 0) {
ForEach(1..<MockRoomTimelineController().timelineItems.count, id: \.self) { index in
let item = MockRoomTimelineController().timelineItems[index]
RoomTimelineViewProvider(timelineItem: item, grouping: .single)
RoomTimelineViewProvider(timelineItem: item, groupStyle: .single)
.padding(TimelineStyle.plain.rowInsets) // Insets added in the table view cells
}
}
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
+2 -2
View File
@@ -75,7 +75,7 @@ extension View {
environment(\.timelineStyle, style)
}
func timelineStyleGrouping(_ grouping: TimelineGroupStyle) -> some View {
environment(\.timelineGroupStyle, grouping)
func timelineGroupStyle(_ groupStyle: TimelineGroupStyle) -> some View {
environment(\.timelineGroupStyle, groupStyle)
}
}
ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift
+1 -1
View File
@@ -24,7 +24,7 @@ struct CollapsibleRoomTimelineView: View {
init(timelineItem: CollapsibleTimelineItem) {
self.timelineItem = timelineItem
timelineViews = timelineItem.items.map { RoomTimelineViewProvider(timelineItem: $0, grouping: .single) }
timelineViews = timelineItem.items.map { RoomTimelineViewProvider(timelineItem: $0, groupStyle: .single) }
}
var body: some View {