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

Stop making previews for light & dark colour schemes. (#345)

Browse Source 
Xcode 14 now has preview variants for this.
This commit is contained in:
Doug
2022-11-25 17:49:13 +00:00
committed by GitHub
parent 00cd2ab707
commit f776575c81
32 changed files with 29 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesignKit/Sources/Buttons/ElementActionButtonStyle.swift
+1 -8
View File
@@ -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)
}
}
DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift
+1 -8
View File
@@ -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)
}
}
DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift
-11
View File
@@ -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())
DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift
+1 -10
View File
@@ -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)
}
}
}
DesignKit/Sources/TextFields/ElementTextFieldStyle.swift
+1 -10
View File
@@ -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)
}
}
}
ElementX/Sources/Other/UserNotifications/UserNotificationModalView.swift
-5
View File
@@ -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",
ElementX/Sources/Other/UserNotifications/UserNotificationToastView.swift
-5
View File
@@ -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"))
ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift
-6
View File
@@ -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)
ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+2 -6
View File
@@ -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)
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
+1 -4
View File
@@ -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 {
ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift
-6
View File
@@ -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),
ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
-6
View File
@@ -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: "")
ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
+2 -4
View File
@@ -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
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
-6
View File
@@ -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(),
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
-6
View File
@@ -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]
ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
-6
View File
@@ -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]
ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
+2 -7
View File
@@ -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.",
ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
+2 -7
View File
@@ -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",
ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
+3 -8
View File
@@ -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,
ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift
+2 -6
View File
@@ -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
ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
+3 -8
View File
@@ -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,
ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
+2 -7
View File
@@ -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.",
ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift
-6
View File
@@ -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)
ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift
-6
View File
@@ -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",
ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift
-6
View File
@@ -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)
}
ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
+2 -7
View File
@@ -34,15 +34,10 @@ struct TextRoomTimelineView: View {
struct TextRoomTimelineView_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) {
TextRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift
+3 -8
View File
@@ -61,15 +61,10 @@ struct VideoRoomTimelineView: View {
struct VideoRoomTimelineView_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) {
VideoRoomTimelineView(timelineItem: VideoRoomTimelineItem(id: UUID().uuidString,
ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift
-6
View File
@@ -199,12 +199,6 @@ private struct PinnedItem: Equatable {
struct TimelineItemList_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(),
ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
-6
View File
@@ -49,12 +49,6 @@ struct TimelineView: View {
struct TimelineView_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(),
ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
-6
View File
@@ -184,12 +184,6 @@ struct SessionVerificationScreen: View {
struct SessionVerification_Previews: PreviewProvider {
static var previews: some View {
body.preferredColorScheme(.light)
body.preferredColorScheme(.dark)
}
@ViewBuilder
static var body: some View {
Group {
sessionVerificationScreen(state: .initial)
sessionVerificationScreen(state: .requestingVerification)
ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
-6
View File
@@ -239,12 +239,6 @@ extension TimelineStyle: CustomStringConvertible {
struct Settings_Previews: PreviewProvider {
static var previews: some View {
body.preferredColorScheme(.light)
body.preferredColorScheme(.dark)
}
@ViewBuilder
static var body: some View {
let userSession = MockUserSession(clientProxy: MockClientProxy(userIdentifier: "@userid:example.com"),
mediaProvider: MockMediaProvider())
let viewModel = SettingsViewModel(withUserSession: userSession)
changelog.d/pr-345.change
+1
View File
@@ -0,0 +1 @@
Stop generating previews for light and dark colour schemes now that preview variants are a thing.