diff --git a/Mlem/App/Views/Pages/CommentEditor/CommentEditorView.swift b/Mlem/App/Views/Pages/CommentEditor/CommentEditorView.swift index 2fe39ed4c..c008e2b8b 100644 --- a/Mlem/App/Views/Pages/CommentEditor/CommentEditorView.swift +++ b/Mlem/App/Views/Pages/CommentEditor/CommentEditorView.swift @@ -157,10 +157,12 @@ struct CommentEditorView: View { ) .padding(.vertical, Constants.main.standardSpacing) .background(palette.secondaryGroupedBackground, in: .rect(cornerRadius: Constants.main.standardSpacing)) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) .padding(.horizontal, Constants.main.standardSpacing) contextView .padding(Constants.main.standardSpacing) .background(palette.secondaryGroupedBackground, in: .rect(cornerRadius: Constants.main.standardSpacing)) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) .padding(.horizontal, Constants.main.standardSpacing) } .animation(.easeOut(duration: 0.2), value: resolutionState == .notFound) diff --git a/Mlem/App/Views/Pages/Community/CommunityView.swift b/Mlem/App/Views/Pages/Community/CommunityView.swift index 216bcc278..d8c5ba3ac 100644 --- a/Mlem/App/Views/Pages/Community/CommunityView.swift +++ b/Mlem/App/Views/Pages/Community/CommunityView.swift @@ -146,6 +146,7 @@ struct CommunityView: View { Markdown(description, configuration: .default) .padding(Constants.main.standardSpacing) .background(palette.secondaryGroupedBackground, in: .rect(cornerRadius: Constants.main.standardSpacing)) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } .padding([.horizontal, .bottom], Constants.main.standardSpacing) diff --git a/Mlem/App/Views/Pages/Instance/FediseerOpinionListView.swift b/Mlem/App/Views/Pages/Instance/FediseerOpinionListView.swift index 1d32bd590..697a84943 100644 --- a/Mlem/App/Views/Pages/Instance/FediseerOpinionListView.swift +++ b/Mlem/App/Views/Pages/Instance/FediseerOpinionListView.swift @@ -24,8 +24,6 @@ struct FediseerOpinionListView: View { ForEach(items, id: \.domain) { opinion in FediseerOpinionView(opinion: opinion) - .background(palette.secondaryGroupedBackground) - .cornerRadius(Constants.main.standardSpacing) } } .padding(16) diff --git a/Mlem/App/Views/Pages/Instance/FediseerOpinionView.swift b/Mlem/App/Views/Pages/Instance/FediseerOpinionView.swift index 69e96e379..119e614ec 100644 --- a/Mlem/App/Views/Pages/Instance/FediseerOpinionView.swift +++ b/Mlem/App/Views/Pages/Instance/FediseerOpinionView.swift @@ -45,6 +45,9 @@ struct FediseerOpinionView: View { .frame(maxWidth: .infinity) .padding(.vertical, 10) .font(.callout) + .background(palette.secondaryGroupedBackground) + .cornerRadius(Constants.main.standardSpacing) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } @ViewBuilder diff --git a/Mlem/App/Views/Pages/Instance/InstanceSafetyView.swift b/Mlem/App/Views/Pages/Instance/InstanceSafetyView.swift index 5b9fd0410..9765c4bef 100644 --- a/Mlem/App/Views/Pages/Instance/InstanceSafetyView.swift +++ b/Mlem/App/Views/Pages/Instance/InstanceSafetyView.swift @@ -104,7 +104,7 @@ struct InstanceSafetyView: View { destination: items.count > 5 ? destination : nil ) ForEach(items.prefix(5), id: \.domain) { item in - section { FediseerOpinionView(opinion: item) } + FediseerOpinionView(opinion: item) .padding(.bottom, 9) } } @@ -121,6 +121,7 @@ struct InstanceSafetyView: View { .frame(maxWidth: .infinity) .background(palette.secondaryGroupedBackground) .cornerRadius(Constants.main.standardSpacing) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } diff --git a/Mlem/App/Views/Pages/Instance/InstanceUptimeView.swift b/Mlem/App/Views/Pages/Instance/InstanceUptimeView.swift index 8aec2bf04..a27d4b81a 100644 --- a/Mlem/App/Views/Pages/Instance/InstanceUptimeView.swift +++ b/Mlem/App/Views/Pages/Instance/InstanceUptimeView.swift @@ -90,10 +90,7 @@ struct InstanceUptimeView: View { .padding(.leading, 12) .frame(maxWidth: .infinity, alignment: .leading) .padding(.vertical, 10) - .background( - RoundedRectangle(cornerRadius: Constants.main.standardSpacing) - .fill(palette.secondaryGroupedBackground) - ) + .background(palette.secondaryGroupedBackground, in: .rect(cornerRadius: Constants.main.standardSpacing)) } .buttonStyle(EmptyButtonStyle()) @@ -218,6 +215,7 @@ struct InstanceUptimeView: View { .frame(maxWidth: .infinity) .background(palette.secondaryGroupedBackground) .cornerRadius(Constants.main.standardSpacing) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } diff --git a/Mlem/App/Views/Pages/Instance/InstanceView.swift b/Mlem/App/Views/Pages/Instance/InstanceView.swift index 7f679c516..d248d6605 100644 --- a/Mlem/App/Views/Pages/Instance/InstanceView.swift +++ b/Mlem/App/Views/Pages/Instance/InstanceView.swift @@ -104,6 +104,7 @@ struct InstanceView: View { Markdown(description, configuration: .default) .padding(Constants.main.standardSpacing) .background(palette.secondaryGroupedBackground, in: .rect(cornerRadius: Constants.main.standardSpacing)) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) .padding([.horizontal, .bottom], Constants.main.standardSpacing) } case .details: diff --git a/Mlem/App/Views/Root/Tabs/Settings/SortingSettingsView.swift b/Mlem/App/Views/Root/Tabs/Settings/SortingSettingsView.swift index fa5558aed..2ebcf65e4 100644 --- a/Mlem/App/Views/Root/Tabs/Settings/SortingSettingsView.swift +++ b/Mlem/App/Views/Root/Tabs/Settings/SortingSettingsView.swift @@ -9,6 +9,8 @@ import MlemMiddleware import SwiftUI struct SortingSettingsView: View { + @Environment(Palette.self) var palette + @Setting(\.defaultPostSort) var defaultPostSort @Setting(\.fallbackPostSort) var fallbackPostSort @Setting(\.commentSort) var commentSort @@ -20,6 +22,7 @@ struct SortingSettingsView: View { Text("Posts") Spacer() FeedSortPicker(sort: $defaultPostSort) + .foregroundStyle(palette.accent) .frame(minHeight: 50) .buttonStyle(.bordered) } @@ -28,6 +31,7 @@ struct SortingSettingsView: View { Text("Fallback") Spacer() FeedSortPicker(sort: $fallbackPostSort, filters: [.alwaysAvailable]) + .foregroundStyle(palette.accent) .frame(minHeight: 50) .buttonStyle(.bordered) } @@ -50,6 +54,7 @@ struct SortingSettingsView: View { } } } + .foregroundStyle(palette.accent) .frame(minHeight: 50) .buttonStyle(.bordered) } diff --git a/Mlem/App/Views/Shared/FooterLinkView.swift b/Mlem/App/Views/Shared/FooterLinkView.swift index 2c20a8ada..1b4f61505 100644 --- a/Mlem/App/Views/Shared/FooterLinkView.swift +++ b/Mlem/App/Views/Shared/FooterLinkView.swift @@ -12,13 +12,15 @@ struct FooterLinkView: View { let title: String let subtitle: String? - + var body: some View { VStack(alignment: .leading, spacing: 5) { Text(title) .frame(maxWidth: .infinity, alignment: .leading) .font(.subheadline) .fontWeight(.semibold) + .multilineTextAlignment(.leading) + .lineLimit(2) if let subtitle { Text(subtitle) diff --git a/Mlem/App/Views/Shared/Form/FormSection.swift b/Mlem/App/Views/Shared/Form/FormSection.swift index aba2fea05..ea8932148 100644 --- a/Mlem/App/Views/Shared/Form/FormSection.swift +++ b/Mlem/App/Views/Shared/Form/FormSection.swift @@ -20,6 +20,7 @@ struct FormSection: View { content .frame(maxWidth: .infinity) .background(palette.secondaryGroupedBackground) - .clipShape(.rect(cornerRadius: 10)) + .clipShape(.rect(cornerRadius: Constants.main.standardSpacing)) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } diff --git a/Mlem/App/Views/Shared/Palette Components/Form.swift b/Mlem/App/Views/Shared/Palette Components/Form.swift index 91484c857..307522101 100644 --- a/Mlem/App/Views/Shared/Palette Components/Form.swift +++ b/Mlem/App/Views/Shared/Palette Components/Form.swift @@ -22,9 +22,9 @@ struct Form: View { .tint(palette.accent) .buttonStyle(PaletteButton()) } - .listStyle(InsetListStyle()) + .listStyle(.insetGrouped) .scrollContentBackground(.hidden) .background(palette.groupedBackground) - .shadow(color: palette.primary.opacity(palette.bordered ? 0.2 : 0.0), radius: 5) + .shadow(color: palette.primary.opacity(palette.bordered ? 0.4 : 0.0), radius: 1) } } diff --git a/Mlem/App/Views/Shared/Search/Results/CommunityListRow.swift b/Mlem/App/Views/Shared/Search/Results/CommunityListRow.swift index dd8d42c3a..4a41ac935 100644 --- a/Mlem/App/Views/Shared/Search/Results/CommunityListRow.swift +++ b/Mlem/App/Views/Shared/Search/Results/CommunityListRow.swift @@ -50,5 +50,6 @@ struct CommunityListRow: View { .contentShape(.contextMenuPreview, .rect(cornerRadius: Constants.main.standardSpacing)) .contextMenu { community.menuActions(navigation: navigation) } .quickSwipes(community.swipeActions(behavior: .standard)) + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } diff --git a/Mlem/App/Views/Shared/Search/Results/InstanceListRow.swift b/Mlem/App/Views/Shared/Search/Results/InstanceListRow.swift index 70d98e34a..6ef5e4a26 100644 --- a/Mlem/App/Views/Shared/Search/Results/InstanceListRow.swift +++ b/Mlem/App/Views/Shared/Search/Results/InstanceListRow.swift @@ -59,5 +59,6 @@ struct InstanceListRow: View { .contextMenu { instanceStub?.menuActions(allowExternalBlocking: true) ?? [] } + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } diff --git a/Mlem/App/Views/Shared/Search/Results/PersonListRow.swift b/Mlem/App/Views/Shared/Search/Results/PersonListRow.swift index 7d260ddb7..8b6ef5d74 100644 --- a/Mlem/App/Views/Shared/Search/Results/PersonListRow.swift +++ b/Mlem/App/Views/Shared/Search/Results/PersonListRow.swift @@ -49,5 +49,6 @@ struct PersonListRow: View { .background(palette.secondaryGroupedBackground, in: .rect(cornerRadius: Constants.main.standardSpacing)) .contentShape(.contextMenuPreview, .rect(cornerRadius: Constants.main.standardSpacing)) .contextMenu { person.menuActions(navigation: navigation) } + .paletteBorder(cornerRadius: Constants.main.standardSpacing) } } diff --git a/Mlem/App/Views/Shared/Search/SearchResultsView.swift b/Mlem/App/Views/Shared/Search/SearchResultsView.swift index 1e4644050..01d5a1f29 100644 --- a/Mlem/App/Views/Shared/Search/SearchResultsView.swift +++ b/Mlem/App/Views/Shared/Search/SearchResultsView.swift @@ -23,7 +23,6 @@ struct SearchResultsView: View { var body: some View { ForEach(results) { item in content(item) - .paletteBorder(cornerRadius: Constants.main.standardSpacing) .padding(.horizontal, Constants.main.standardSpacing) .padding(.bottom, Constants.main.halfSpacing) }