remove plain case

removed name
element-hq · Jun 27, 2024 · 45bd554 · 45bd554
1 parent 5b58ea3
commit 45bd554
Show file tree

Hide file tree

Showing 122 changed files with 16 additions and 759 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
@@ -18,14 +18,11 @@ import Foundation
 import SwiftUI
 
 enum TimelineStyle: String, CaseIterable, Codable {
-    case plain
     case bubbles
 
     /// List row insets for a timeline
     var rowInsets: EdgeInsets {
         switch self {
-        case .plain:
-            return EdgeInsets(top: 4, leading: 20, bottom: 4, trailing: 20)
         case .bubbles:
             return EdgeInsets(top: 1, leading: 8, bottom: 1, trailing: 8)
         }
@@ -34,8 +31,6 @@ enum TimelineStyle: String, CaseIterable, Codable {
     /// Short hand for `self == .bubbles`
     var isBubbles: Bool {
         switch self {
-        case .plain:
-            return false
         case .bubbles:
             return true
         }

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
@@ -60,8 +60,6 @@ struct TimelineStyler<Content: View>: View {
     @ViewBuilder
     var mainContent: some View {
         switch style {
-        case .plain:
-            TimelineItemPlainStylerView(timelineItem: timelineItem, adjustedDeliveryStatus: adjustedDeliveryStatus, content: content)
         case .bubbles:
             TimelineItemBubbledStylerView(timelineItem: timelineItem, adjustedDeliveryStatus: adjustedDeliveryStatus, content: content)
         }
@@ -204,11 +202,6 @@ struct TimelineItemStyler_Previews: PreviewProvider, TestablePreview {
             .environmentObject(viewModel.context)
             .environment(\.timelineStyle, .bubbles)
             .previewDisplayName("Bubbles")
-
-        testView
-            .environmentObject(viewModel.context)
-            .environment(\.timelineStyle, .plain)
-            .previewDisplayName("Plain")
 
         languagesTestView
             .environmentObject(viewModel.context)

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift
@@ -51,13 +51,7 @@ struct TimelineItemStatusView: View {
                 TimelineDeliveryStatusView(deliveryStatus: .sent)
             }
         case .sendingFailed:
-            // Bubbles handle the failure internally, but plain items don't.
-            if style == .plain {
-                CompoundIcon(\.error, size: .xSmall, relativeTo: .compound.bodyMD)
-                    .foregroundColor(.compound.iconCriticalPrimary)
-                    .accessibilityLabel(L10n.commonSendingFailed)
-                    .accessibilityHint(L10n.actionTapForOptions)
-            }
+            EmptyView()
         }
     }
 

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift
@@ -40,9 +40,6 @@ struct AudioRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
@@ -37,9 +37,6 @@ struct EmoteRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
@@ -62,9 +62,6 @@ struct EncryptedRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
@@ -40,9 +40,6 @@ struct FileRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift
@@ -173,8 +173,6 @@ struct FormattedBodyText: View {
 struct FormattedBodyText_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         body
-        body
-            .environment(\.timelineStyle, .plain)
     }
 
     @ViewBuilder

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
@@ -61,9 +61,6 @@ struct ImageRoomTimelineView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         body
             .environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift
@@ -93,15 +93,6 @@ struct LocationRoomTimelineView_Previews: PreviewProvider, TestablePreview {
         }
         .environmentObject(viewModel.context)
         .previewDisplayName("Bubbles")
-
-        ScrollView {
-            VStack(spacing: 0) {
-                states
-            }
-        }
-        .environment(\.timelineStyle, .plain)
-        .environmentObject(viewModel.context)
-        .previewDisplayName("Plain")
     }
 
     @ViewBuilder

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
@@ -49,9 +49,6 @@ struct NoticeRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollRoomTimelineView.swift
@@ -77,40 +77,10 @@ struct PollRoomTimelineView_Previews: PreviewProvider, TestablePreview {
             .environment(\.timelineStyle, .bubbles)
             .environmentObject(viewModel.context)
             .previewDisplayName("Creator, disclosed, Bubble")
-
-        PollRoomTimelineView(timelineItem: .mock(poll: .disclosed(), isOutgoing: false))
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Disclosed, Plain")
-
-        PollRoomTimelineView(timelineItem: .mock(poll: .undisclosed(), isOutgoing: false))
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Undisclosed, Plain")
-
-        PollRoomTimelineView(timelineItem: .mock(poll: .endedDisclosed))
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Ended, Disclosed, Plain")
-
-        PollRoomTimelineView(timelineItem: .mock(poll: .endedUndisclosed))
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Ended, Undisclosed, Plain")
-
-        PollRoomTimelineView(timelineItem: .mock(poll: .disclosed(createdByAccountOwner: true)))
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Creator, disclosed, Plain")
 
         PollRoomTimelineView(timelineItem: .mock(poll: .emptyDisclosed, isEditable: true))
             .environment(\.timelineStyle, .bubbles)
             .environmentObject(viewModel.context)
             .previewDisplayName("Creator, no votes, Bubble")
-
-        PollRoomTimelineView(timelineItem: .mock(poll: .emptyDisclosed, isEditable: true))
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Creator, no votes, Plain")
     }
 }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/StateRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/StateRoomTimelineView.swift
@@ -33,8 +33,6 @@ struct StateRoomTimelineView: View {
 struct StateRoomTimelineView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         body
-        body
-            .environment(\.timelineStyle, .plain)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/StickerRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/StickerRoomTimelineView.swift
@@ -52,9 +52,6 @@ struct StickerRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
@@ -42,19 +42,10 @@ struct TextRoomTimelineView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         body.environmentObject(viewModel.context)
             .previewDisplayName("Bubble")
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Plain")
         body
             .environmentObject(viewModel.context)
             .environment(\.layoutDirection, .rightToLeft)
             .previewDisplayName("Bubble RTL")
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .environment(\.layoutDirection, .rightToLeft)
-            .previewDisplayName("Plain RTL")
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift
@@ -44,9 +44,6 @@ struct UnsupportedRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift
@@ -72,9 +72,6 @@ struct VideoRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         body.environmentObject(viewModel.context)
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/Settings/AvancedOptionsScreen/View/AdvancedSettingsScreen.swift b/ElementX/Sources/Screens/Settings/AvancedOptionsScreen/View/AdvancedSettingsScreen.swift
@@ -41,17 +41,6 @@ struct AdvancedSettingsScreen: View {
     }
 }
 
-private extension TimelineStyle {
-    var name: String {
-        switch self {
-        case .plain:
-            return L10n.commonModern
-        case .bubbles:
-            return L10n.commonBubbles
-        }
-    }
-}
-
 private extension AppAppearance {
     var name: String {
         switch self {

diff --git a/...es/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomTimelineView.swift b/...es/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomTimelineView.swift
@@ -86,10 +86,6 @@ struct VoiceMessageRoomTimelineView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         body.environmentObject(viewModel.context)
             .previewDisplayName("Bubble")
-        body
-            .environment(\.timelineStyle, .plain)
-            .environmentObject(viewModel.context)
-            .previewDisplayName("Plain")
     }
 
     static var body: some View {

diff --git a/...iewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPad-en-GB.2.png b/...iewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPad-en-GB.2.png
diff --git a/...ewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPad-pseudo.2.png b/...ewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPad-pseudo.2.png
diff --git a/...sts/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPhone-15-en-GB.2.png b/...sts/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPhone-15-en-GB.2.png
diff --git a/...ts/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPhone-15-pseudo.2.png b/...ts/__Snapshots__/PreviewTests/test_audioRoomTimelineView-iPhone-15-pseudo.2.png
diff --git a/...iewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPad-en-GB.2.png b/...iewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPad-en-GB.2.png
diff --git a/...ewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPad-pseudo.2.png b/...ewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPad-pseudo.2.png
diff --git a/...sts/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPhone-15-en-GB.2.png b/...sts/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPhone-15-en-GB.2.png
diff --git a/...ts/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPhone-15-pseudo.2.png b/...ts/__Snapshots__/PreviewTests/test_emoteRoomTimelineView-iPhone-15-pseudo.2.png
diff --git a/...ests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPad-en-GB.2.png b/...ests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPad-en-GB.2.png
diff --git a/...sts/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPad-pseudo.2.png b/...sts/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPad-pseudo.2.png
diff --git a/...__Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPhone-15-en-GB.2.png b/...__Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPhone-15-en-GB.2.png
diff --git a/..._Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPhone-15-pseudo.2.png b/..._Snapshots__/PreviewTests/test_encryptedRoomTimelineView-iPhone-15-pseudo.2.png
diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPad-en-GB.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPad-en-GB.2.png
diff --git a/...iewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPad-pseudo.2.png b/...iewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPad-pseudo.2.png
diff --git a/...ests/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPhone-15-en-GB.2.png b/...ests/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPhone-15-en-GB.2.png
diff --git a/...sts/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPhone-15-pseudo.2.png b/...sts/__Snapshots__/PreviewTests/test_fileRoomTimelineView-iPhone-15-pseudo.2.png
diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPad-en-GB.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPad-en-GB.2.png
diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPad-pseudo.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPad-pseudo.2.png
diff --git a/...ewTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPhone-15-en-GB.2.png b/...ewTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPhone-15-en-GB.2.png
diff --git a/...wTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPhone-15-pseudo.2.png b/...wTests/__Snapshots__/PreviewTests/test_formattedBodyText-iPhone-15-pseudo.2.png
diff --git a/...iewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPad-en-GB.2.png b/...iewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPad-en-GB.2.png
diff --git a/...ewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPad-pseudo.2.png b/...ewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPad-pseudo.2.png
diff --git a/...sts/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPhone-15-en-GB.2.png b/...sts/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPhone-15-en-GB.2.png
diff --git a/...ts/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPhone-15-pseudo.2.png b/...ts/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPhone-15-pseudo.2.png
diff --git a/...s/__Snapshots__/PreviewTests/test_locationRoomTimelineView-iPad-en-GB.Plain.png b/...s/__Snapshots__/PreviewTests/test_locationRoomTimelineView-iPad-en-GB.Plain.png
diff --git a/.../__Snapshots__/PreviewTests/test_locationRoomTimelineView-iPad-pseudo.Plain.png b/.../__Snapshots__/PreviewTests/test_locationRoomTimelineView-iPad-pseudo.Plain.png
diff --git a/...napshots__/PreviewTests/test_locationRoomTimelineView-iPhone-15-en-GB.Plain.png b/...napshots__/PreviewTests/test_locationRoomTimelineView-iPhone-15-en-GB.Plain.png
diff --git a/...apshots__/PreviewTests/test_locationRoomTimelineView-iPhone-15-pseudo.Plain.png b/...apshots__/PreviewTests/test_locationRoomTimelineView-iPhone-15-pseudo.Plain.png
diff --git a/...ewTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView-iPad-en-GB.2.png b/...ewTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView-iPad-en-GB.2.png
diff --git a/...wTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView-iPad-pseudo.2.png b/...wTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView-iPad-pseudo.2.png
diff --git a/...ts/__Snapshots__/PreviewTests/test_noticeRoomTimelineView-iPhone-15-en-GB.2.png b/...ts/__Snapshots__/PreviewTests/test_noticeRoomTimelineView-iPhone-15-en-GB.2.png