diff --git a/Mastodon/In Progress New Layout and Datamodel/InlinePostPreview.swift b/Mastodon/In Progress New Layout and Datamodel/InlinePostPreview.swift index 6e8d5295b..0a2b6467f 100644 --- a/Mastodon/In Progress New Layout and Datamodel/InlinePostPreview.swift +++ b/Mastodon/In Progress New Layout and Datamodel/InlinePostPreview.swift @@ -11,6 +11,8 @@ import SwiftUI struct InlinePostPreview: View { let viewModel: Mastodon.Entity.Status.ViewModel + + @Environment(\.colorScheme) private var colorScheme var body: some View { VStack(alignment: .leading) { @@ -24,7 +26,7 @@ struct InlinePostPreview: View { .frame(maxWidth: .infinity) .background { RoundedRectangle(cornerRadius: 8) - .fill(.clear) + .fill(colorScheme == .dark ? AnyShapeStyle(.separator) : AnyShapeStyle(.clear)) .stroke(.separator) } } diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift index 4fb496036..1c59dc73d 100644 --- a/Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift +++ b/Mastodon/In Progress New Layout and Datamodel/NotificationListViewController.swift @@ -89,6 +89,8 @@ struct NotificationListView: View { } label: { } .pickerStyle(.segmented) + .padding(.horizontal) + .fixedSize() Spacer() } diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift index fe0305645..1f31042e3 100644 --- a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift +++ b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift @@ -508,6 +508,9 @@ struct NotificationRowView: View { image.resizable() .aspectRatio(contentMode: .fit) .clipShape(avatarShape) + .overlay { + avatarShape.stroke(.separator) + } }, placeholder: { avatarShape @@ -539,6 +542,7 @@ struct NotificationRowView: View { viewModel.doAvatarRowButtonAction() } .buttonStyle(.borderedProminent) + .foregroundStyle(.background) .controlSize(.small) .bold() case (.requestButton, false):