Stop making previews for light & dark colour schemes.

Xcode 14 now has preview variants for this.
element-hq · Nov 25, 2022 · e171c0f · e171c0f
1 parent 00cd2ab
commit e171c0f
Show file tree

Hide file tree

Showing 31 changed files with 28 additions and 207 deletions.
diff --git a/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift b/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift
@@ -67,7 +67,7 @@ public struct ElementActionButtonStyle: ButtonStyle {
 }
 
 public struct ElementActionButtonStyle_Previews: PreviewProvider {
-    public static var states: some View {
+    public static var previews: some View {
         VStack {
             Button("Enabled") { /* preview */ }
                 .buttonStyle(ElementActionButtonStyle())
@@ -87,11 +87,4 @@ public struct ElementActionButtonStyle_Previews: PreviewProvider {
         }
         .padding()
     }
-
-    public static var previews: some View {
-        states
-            .preferredColorScheme(.light)
-        states
-            .preferredColorScheme(.dark)
-    }
 }
diff --git a/DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift b/DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift
@@ -59,7 +59,7 @@ public struct ElementCapsuleButtonStyle: ButtonStyle {
 }
 
 struct ElementCapsuleButtonStyle_Previews: PreviewProvider {
-    public static var states: some View {
+    public static var previews: some View {
         VStack {
             Button("Enabled") { /* preview */ }
                 .buttonStyle(.elementCapsuleProminent)
@@ -77,11 +77,4 @@ struct ElementCapsuleButtonStyle_Previews: PreviewProvider {
         }
         .padding()
     }
-
-    public static var previews: some View {
-        states
-            .preferredColorScheme(.light)
-        states
-            .preferredColorScheme(.dark)
-    }
 }
diff --git a/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift b/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift
@@ -66,17 +66,6 @@ public struct ElementGhostButtonStyle: ButtonStyle {
 
 public struct ElementGhostButtonStyle_Previews: PreviewProvider {
     public static var previews: some View {
-        Group {
-            states
-        }
-        .preferredColorScheme(.light)
-        Group {
-            states
-        }
-        .preferredColorScheme(.dark)
-    }
-
-    public static var states: some View {
         VStack {
             Button("Enabled") { /* preview */ }
                 .buttonStyle(ElementGhostButtonStyle())

diff --git a/DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift b/DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift
@@ -97,7 +97,7 @@ public struct BorderedInputFieldStyle: TextFieldStyle {
 }
 
 public struct BorderedInputFieldStyle_Previews: PreviewProvider {
-    public static var states: some View {
+    public static var previews: some View {
         VStack {
             TextField("Placeholder", text: .constant(""))
                 .textFieldStyle(BorderedInputFieldStyle())
@@ -115,13 +115,4 @@ public struct BorderedInputFieldStyle_Previews: PreviewProvider {
         }
         .padding()
     }
-
-    public static var previews: some View {
-        Group {
-            states
-                .preferredColorScheme(.light)
-            states
-                .preferredColorScheme(.dark)
-        }
-    }
 }
diff --git a/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift b/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift
@@ -74,7 +74,7 @@ public struct ElementTextFieldStyle: TextFieldStyle {
 
 @available(iOS 15.0, *)
 struct ElementTextFieldStyle_Previews: PreviewProvider {
-    public static var states: some View {
+    public static var previews: some View {
         VStack(spacing: 12) {
             TextField("Placeholder", text: .constant(""))
                 .textFieldStyle(.elementInput(labelText: "Label", footerText: "Footer"))
@@ -88,13 +88,4 @@ struct ElementTextFieldStyle_Previews: PreviewProvider {
         }
         .padding()
     }
-
-    public static var previews: some View {
-        Group {
-            states
-                .preferredColorScheme(.light)
-            states
-                .preferredColorScheme(.dark)
-        }
-    }
 }
diff --git a/ElementX/Sources/Other/UserNotifications/UserNotificationModalView.swift b/ElementX/Sources/Other/UserNotifications/UserNotificationModalView.swift
@@ -56,11 +56,6 @@ struct UserNotificationModalView: View {
 
 struct UserNotificationModalView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    private static var body: some View {
         VStack {
             UserNotificationModalView(notification: UserNotification(type: .modal,
                                                                      title: "Successfully logged in",

diff --git a/ElementX/Sources/Other/UserNotifications/UserNotificationToastView.swift b/ElementX/Sources/Other/UserNotifications/UserNotificationToastView.swift
@@ -48,11 +48,6 @@ struct UserNotificationToastView: View {
 
 struct UserNotificationToastView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    private static var body: some View {
         VStack {
             UserNotificationToastView(notification: UserNotification(title: "Successfully logged in",
                                                                      iconName: "checkmark"))

diff --git a/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift b/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift
@@ -140,12 +140,6 @@ struct BugReportScreen: View {
 
 struct BugReport_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         let viewModel = BugReportViewModel(bugReportService: MockBugReportService(), screenshot: Asset.Images.appLogo.image, isModallyPresented: false)
         BugReportScreen(context: viewModel.context)
             .previewInterfaceOrientation(.portrait)

diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -197,13 +197,9 @@ struct HomeScreen: View {
 
 struct HomeScreen_Previews: PreviewProvider {
     static var previews: some View {
-        body(.loading).preferredColorScheme(.light)
+        body(.loading)
             .tint(.element.accent)
-        body(.loading).preferredColorScheme(.dark)
-            .tint(.element.accent)
-        body(.loaded).preferredColorScheme(.light)
-            .tint(.element.accent)
-        body(.loaded).preferredColorScheme(.dark)
+        body(.loaded)
             .tint(.element.accent)
     }
 

diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
@@ -104,10 +104,7 @@ struct HomeScreenRoomCell: View {
 
 struct HomeScreenRoomCell_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-            .tint(.element.accent)
-        body.preferredColorScheme(.dark)
-            .tint(.element.accent)
+        body.tint(.element.accent)
     }
 
     static var body: some View {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift
@@ -131,12 +131,6 @@ private struct MessageComposerEditHeader: View {
 
 struct MessageComposer_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         VStack {
             MessageComposer(text: .constant(""),
                             focused: .constant(false),

diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
@@ -209,12 +209,6 @@ private class TextViewWithKeyDetection: UITextView {
 
 struct MessageComposerTextField_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         VStack {
             PreviewWrapper(text: "123")
             PreviewWrapper(text: "")

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
@@ -57,10 +57,8 @@ struct RoomHeaderView: View {
 
 struct RoomHeaderView_Previews: PreviewProvider {
     static var previews: some View {
-        bodyPlain.preferredColorScheme(.light)
-        bodyPlain.preferredColorScheme(.dark)
-        bodyEncrypted.preferredColorScheme(.light)
-        bodyEncrypted.preferredColorScheme(.dark)
+        bodyPlain
+        bodyEncrypted
     }
 
     @ViewBuilder

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -70,12 +70,6 @@ struct RoomScreen: View {
 
 struct RoomScreen_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         let viewModel = RoomScreenViewModel(timelineController: MockRoomTimelineController(),
                                             timelineViewFactory: RoomTimelineViewFactory(),
                                             mediaProvider: MockMediaProvider(),

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -156,12 +156,6 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
 
 struct TimelineItemBubbledStylerView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         VStack(alignment: .leading, spacing: 2) {
             ForEach(1..<MockRoomTimelineController().timelineItems.count, id: \.self) { index in
                 let item = MockRoomTimelineController().timelineItems[index]

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
@@ -73,12 +73,6 @@ struct TimelineItemPlainStylerView<Content: View>: View {
 
 struct TimelineItemPlainStylerView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         VStack(alignment: .leading) {
             ForEach(1..<MockRoomTimelineController().timelineItems.count, id: \.self) { index in
                 let item = MockRoomTimelineController().timelineItems[index]

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
@@ -37,15 +37,10 @@ struct EmoteRoomTimelineView: View {
 
 struct EmoteRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-        body.preferredColorScheme(.light)
-            .timelineStyle(.plain)
-        body.preferredColorScheme(.dark)
-            .timelineStyle(.plain)
+        body
+        body.timelineStyle(.plain)
     }
 
-    @ViewBuilder
     static var body: some View {
         VStack(alignment: .leading, spacing: 20.0) {
             EmoteRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
@@ -56,15 +56,10 @@ struct EncryptedRoomTimelineView: View {
 
 struct EncryptedRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-        body.preferredColorScheme(.light)
-            .timelineStyle(.plain)
-        body.preferredColorScheme(.dark)
-            .timelineStyle(.plain)
+        body
+        body.timelineStyle(.plain)
     }
 
-    @ViewBuilder
     static var body: some View {
         VStack(alignment: .leading, spacing: 20.0) {
             EncryptedRoomTimelineView(timelineItem: itemWith(text: "Text",

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
@@ -36,15 +36,10 @@ struct FileRoomTimelineView: View {
 
 struct FileRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-        body.preferredColorScheme(.light)
-            .timelineStyle(.plain)
-        body.preferredColorScheme(.dark)
-            .timelineStyle(.plain)
+        body
+        body.timelineStyle(.plain)
     }
-
-    @ViewBuilder
+
     static var body: some View {
         VStack(spacing: 20.0) {
             FileRoomTimelineView(timelineItem: FileRoomTimelineItem(id: UUID().uuidString,

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift
@@ -69,12 +69,8 @@ extension FormattedBodyText {
 
 struct FormattedBodyText_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-        body.preferredColorScheme(.light)
-            .timelineStyle(.plain)
-        body.preferredColorScheme(.dark)
-            .timelineStyle(.plain)
+        body
+        body.timelineStyle(.plain)
     }
 
     @ViewBuilder

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
@@ -51,15 +51,10 @@ struct ImageRoomTimelineView: View {
 
 struct ImageRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-        body.preferredColorScheme(.light)
-            .timelineStyle(.plain)
-        body.preferredColorScheme(.dark)
-            .timelineStyle(.plain)
+        body
+        body.timelineStyle(.plain)
     }
-
-    @ViewBuilder
+
     static var body: some View {
         VStack(spacing: 20.0) {
             ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString,

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
@@ -37,15 +37,10 @@ struct NoticeRoomTimelineView: View {
 
 struct NoticeRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-        body.preferredColorScheme(.light)
-            .timelineStyle(.plain)
-        body.preferredColorScheme(.dark)
-            .timelineStyle(.plain)
+        body
+        body.timelineStyle(.plain)
     }
 
-    @ViewBuilder
     static var body: some View {
         VStack(alignment: .leading, spacing: 20.0) {
             NoticeRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift
@@ -48,12 +48,6 @@ struct PlaceholderAvatarImage: View {
 
 struct PlaceholderAvatarImage_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         PlaceholderAvatarImage(text: "X", contentId: "@userid:matrix.org")
             .clipShape(Circle())
             .frame(width: 150, height: 100)

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift
@@ -33,12 +33,6 @@ struct RedactedRoomTimelineView: View {
 
 struct RedactedRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         VStack(alignment: .leading, spacing: 20.0) {
             RedactedRoomTimelineView(timelineItem: itemWith(text: ElementL10n.eventRedacted,
                                                             timestamp: "Later",

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift
@@ -32,12 +32,6 @@ struct SeparatorRoomTimelineView: View {
 
 struct SeparatorRoomTimelineView_Previews: PreviewProvider {
     static var previews: some View {
-        body.preferredColorScheme(.light)
-        body.preferredColorScheme(.dark)
-    }
-
-    @ViewBuilder
-    static var body: some View {
         let item = SeparatorRoomTimelineItem(id: UUID().uuidString, text: "This is a separator")
         SeparatorRoomTimelineView(timelineItem: item)
     }