From f1069271cc9391ff98a1a72b6b12d3dee120cca2 Mon Sep 17 00:00:00 2001 From: Itunu Raimi Date: Fri, 4 Oct 2024 16:05:51 +0100 Subject: [PATCH 1/3] update flag views to use SFPro font --- Nos/Views/Components/FlagOptionPicker.swift | 8 ++++---- Nos/Views/Moderation/FlagSuccessView.swift | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Nos/Views/Components/FlagOptionPicker.swift b/Nos/Views/Components/FlagOptionPicker.swift index 9cc0e7590..993a220c7 100644 --- a/Nos/Views/Components/FlagOptionPicker.swift +++ b/Nos/Views/Components/FlagOptionPicker.swift @@ -114,12 +114,12 @@ private struct FlagPickerRow: View { VStack(alignment: .leading, spacing: 8) { Text(flag.title) .foregroundColor(.primaryTxt) - .font(.clarity(.regular)) + .font(.body) if let description = flag.description { Text(description) .foregroundColor(.secondaryTxt) - .font(.clarity(.regular, textStyle: .footnote)) + .font(.footnote) .lineSpacing(8) .multilineTextAlignment(.leading) .fixedSize(horizontal: false, vertical: true) // this enables the text view expand as needed @@ -141,7 +141,7 @@ private struct FlagPickerRow: View { VStack { Text(text) .foregroundColor(.primaryTxt) - .font(.clarity(.regular, textStyle: .subheadline)) + .font(.subheadline) .multilineTextAlignment(.leading) .padding(EdgeInsets( top: 13, @@ -165,7 +165,7 @@ private struct HeaderView: View { Text(text) .lineSpacing(5) .foregroundColor(.primaryTxt) - .font(.clarity(.bold)) + .font(.headline) .padding(.bottom, 10) } } diff --git a/Nos/Views/Moderation/FlagSuccessView.swift b/Nos/Views/Moderation/FlagSuccessView.swift index 882414480..ba7d70b81 100644 --- a/Nos/Views/Moderation/FlagSuccessView.swift +++ b/Nos/Views/Moderation/FlagSuccessView.swift @@ -11,7 +11,7 @@ struct FlagSuccessView: View { Text(String(localized: .localizable.thanksForTag)) .foregroundColor(.primaryTxt) - .font(.clarity(.regular, textStyle: .title2)) + .font(.title2) .padding(.horizontal, 25) Text(String(localized: .localizable.keepOnHelpingUs)) @@ -19,7 +19,7 @@ struct FlagSuccessView: View { .foregroundColor(.secondaryTxt) .multilineTextAlignment(.center) .lineSpacing(6) - .font(.clarity(.regular, textStyle: .subheadline)) + .font(.body) } } } From cf9be9deedb48b3b68703bada58215584cbe88e6 Mon Sep 17 00:00:00 2001 From: Itunu Raimi Date: Fri, 4 Oct 2024 16:06:11 +0100 Subject: [PATCH 2/3] update navigation bar title to use SFPro font --- Nos/Views/Components/NosNavigationBar.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nos/Views/Components/NosNavigationBar.swift b/Nos/Views/Components/NosNavigationBar.swift index c3edd612f..8317a361d 100644 --- a/Nos/Views/Components/NosNavigationBar.swift +++ b/Nos/Views/Components/NosNavigationBar.swift @@ -10,7 +10,7 @@ struct NosNavigationBarModifier: ViewModifier { .toolbar { ToolbarItem(placement: .principal) { Text(title) - .font(.clarity(.bold, textStyle: .title3)) + .font(.title3) .foregroundColor(.primaryTxt) .tint(.primaryTxt) .allowsHitTesting(false) From a27396605dd9bd993a550e25da62d82851f22589 Mon Sep 17 00:00:00 2001 From: Itunu Raimi Date: Fri, 4 Oct 2024 16:30:20 +0100 Subject: [PATCH 3/3] add font weights --- Nos/Views/Components/FlagOptionPicker.swift | 1 + Nos/Views/Components/NosNavigationBar.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/Nos/Views/Components/FlagOptionPicker.swift b/Nos/Views/Components/FlagOptionPicker.swift index 993a220c7..cce3c3694 100644 --- a/Nos/Views/Components/FlagOptionPicker.swift +++ b/Nos/Views/Components/FlagOptionPicker.swift @@ -166,6 +166,7 @@ private struct HeaderView: View { .lineSpacing(5) .foregroundColor(.primaryTxt) .font(.headline) + .fontWeight(.semibold) .padding(.bottom, 10) } } diff --git a/Nos/Views/Components/NosNavigationBar.swift b/Nos/Views/Components/NosNavigationBar.swift index 8317a361d..fb37ffa01 100644 --- a/Nos/Views/Components/NosNavigationBar.swift +++ b/Nos/Views/Components/NosNavigationBar.swift @@ -11,6 +11,7 @@ struct NosNavigationBarModifier: ViewModifier { ToolbarItem(placement: .principal) { Text(title) .font(.title3) + .fontWeight(.bold) .foregroundColor(.primaryTxt) .tint(.primaryTxt) .allowsHitTesting(false)