From 70a2d038903b1d1348d8d0dead514dbb24a65357 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Mon, 13 Jun 2022 13:52:39 -0700 Subject: [PATCH 1/2] swiftformat line fix --- .../Services/DataService/Queries/ArticleContentQuery.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift index e1851149b..61267d8a0 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ArticleContentQuery.swift @@ -251,7 +251,7 @@ public extension DataService { } } - if item.isPDF && needsPDFDownload { + if item.isPDF, needsPDFDownload { try await fetchPDFData(slug: item.slug, pageURLString: item.pageURLString) } From 216166d778a0c4d4a412178ff3e1f716fa2e2178 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Mon, 13 Jun 2022 14:19:22 -0700 Subject: [PATCH 2/2] add padding to done button. use stack style nav for web prefs --- .../Sources/Views/FontSizeAdjustmentPopoverView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift b/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift index d7735eaea..0758baf4f 100644 --- a/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift +++ b/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift @@ -147,11 +147,12 @@ public struct WebPreferencesPopoverView: View { ToolbarItem(placement: .navigationBarTrailing) { Button( action: dismissAction, - label: { Text("Done").foregroundColor(.appGrayTextContrast) } + label: { Text("Done").foregroundColor(.appGrayTextContrast).padding() } ) } } } + .navigationViewStyle(.stack) .accentColor(.appGrayTextContrast) } }