Merge remote-tracking branch 'origin/main' into fix-empty-profile-feeds

planetary-social · Mar 27, 2024 · 1590ea4 · 1590ea4
2 parents 5b60a08 + 22093d0
commit 1590ea4
Show file tree

Hide file tree

Showing 75 changed files with 185 additions and 231 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Updated dark theme colors for card backgrounds, primary text, and secondary text.
 - Added a new UI for replying to messages that allows attaching images and setting an expiration date.
 - Fixed an issue where Profile pages could display little or no content.
 

diff --git a/Nos/Assets/Assets.xcassets/Colors/card-bg-bottom.colorset/Contents.json b/Nos/Assets/Assets.xcassets/Colors/card-bg-bottom.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x3A",
-          "green" : "0x17",
-          "red" : "0x23"
+          "blue" : "0x3D",
+          "green" : "0x18",
+          "red" : "0x25"
         }
       },
       "idiom" : "universal"

diff --git a/Nos/Assets/Assets.xcassets/Colors/card-bg-top.colorset/Contents.json b/Nos/Assets/Assets.xcassets/Colors/card-bg-top.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x4C",
-          "green" : "0x1E",
-          "red" : "0x2F"
+          "blue" : "0x47",
+          "green" : "0x1C",
+          "red" : "0x2B"
         }
       },
       "idiom" : "universal"

diff --git a/Nos/Assets/Assets.xcassets/Colors/primary-txt.colorset/Contents.json b/Nos/Assets/Assets.xcassets/Colors/primary-txt.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

diff --git a/Nos/Assets/Assets.xcassets/Colors/secondary-txt.colorset/Contents.json b/Nos/Assets/Assets.xcassets/Colors/secondary-txt.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xBF",
-          "green" : "0x79",
-          "red" : "0x93"
+          "blue" : "0xD8",
+          "green" : "0x88",
+          "red" : "0xA5"
         }
       },
       "idiom" : "universal"

diff --git a/Nos/Extensions/Font.swift b/Nos/Extensions/Font.swift
@@ -2,8 +2,6 @@ import SwiftUI
 
 // https://stackoverflow.com/a/74416073
 extension Font {
-    static var clarity = clarityRegular(.body)
-
     static func clarity(_ fontWeight: UIFont.Weight, textStyle: UIFont.TextStyle = .body) -> Font {
         switch fontWeight {
         case .regular:
@@ -15,16 +13,14 @@ extension Font {
         case .bold:
             clarityBold(textStyle)
         default:
-            clarity
+            clarityRegular(textStyle)
         }
     }
 
     static func clarityRegular(_ textStyle: UIFont.TextStyle) -> Font {
         .custom("ClarityCity-Regular", size: UIFont.preferredFont(forTextStyle: textStyle).pointSize)
     }
 
-    static var clarityMedium = clarityMedium(.body)
-
     static func clarityMedium(_ textStyle: UIFont.TextStyle) -> Font {
         .custom("ClarityCity-Medium", size: UIFont.preferredFont(forTextStyle: textStyle).pointSize)
     }
@@ -33,48 +29,9 @@ extension Font {
         .custom("ClarityCity-SemiBold", size: UIFont.preferredFont(forTextStyle: textStyle).pointSize)
     }
 
-    static var clarityBold = clarityBold(.body)
-
     static func clarityBold(_ textStyle: UIFont.TextStyle) -> Font {
         .custom("ClarityCity-Bold", size: UIFont.preferredFont(forTextStyle: textStyle).pointSize)
     }
-
-    static var clarityTitle = Font
-        .custom("ClarityCity-Bold", size: UIFont.preferredFont(
-            forTextStyle: .title1
-        ).pointSize)
-
-    static var clarityTitle2 = Font
-        .custom("ClarityCity-Bold", size: UIFont.preferredFont(
-            forTextStyle: .title2
-        ).pointSize)
-
-    static var clarityTitle3 = Font
-        .custom("ClarityCity-Bold", size: UIFont.preferredFont(
-            forTextStyle: .title3
-        ).pointSize)
-
-    static var clarityCaption = Font
-        .custom("ClarityCity-Regular", size: UIFont.preferredFont(
-            forTextStyle: .caption1
-        ).pointSize)
-
-    static var clarityCaption2 = Font
-        .custom("ClarityCity-Regular", size: UIFont.preferredFont(
-            forTextStyle: .caption2
-        ).pointSize)
-
-    static var claritySubheadline = clarity(.medium, textStyle: .subheadline)
-
-    static var claritySemiBoldSubheadline = Font
-        .custom("ClarityCity-SemiBold", size: UIFont.preferredFont(
-            forTextStyle: .subheadline
-        ).pointSize)
-
-    static var brand = Font
-        .custom("ClarityCity-Regular", size: UIFont.preferredFont(
-            forTextStyle: .body
-        ).pointSize)
 }
 
 extension UIFont {
@@ -83,17 +40,3 @@ extension UIFont {
         size: UIFont.preferredFont(forTextStyle: .body).pointSize
     )!
 }
-
-// swiftlint:disable identifier_name
-func PlainText(_ content: any StringProtocol) -> SwiftUI.Text {
-    SwiftUI.Text(content)
-}
-
-func PlainText(_ localizedStringResource: LocalizedStringResource) -> SwiftUI.Text {
-    SwiftUI.Text(localizedStringResource)
-}
-
-func Text(_ content: any StringProtocol) -> SwiftUI.Text {
-    .init(content).font(.brand)
-}
-// swiftlint:enable identifier_name
diff --git a/Nos/Views/AboutView.swift b/Nos/Views/AboutView.swift
@@ -10,7 +10,7 @@ struct AboutView: View {
                     .frame(width: 235.45, height: 67.1)
                     .padding(.top, 155)
                     .padding(.bottom, 10)
-                PlainText(.localizable.onboardingTitle)
+                Text(.localizable.onboardingTitle)
                     .font(.custom("ClarityCity-Bold", size: 25.21))
                     .fontWeight(.heavy)
                     .foregroundStyle(

diff --git a/Nos/Views/ActionBanner.swift b/Nos/Views/ActionBanner.swift
@@ -26,7 +26,7 @@ struct ActionBanner: View {
             VStack {
                 HStack {
                     Text(messageText)
-                        .font(.clarityBold)
+                        .font(.clarity(.bold))
                         .foregroundStyle(Color.white)
                         .lineSpacing(3)
                         .padding(.top, 8)
@@ -37,7 +37,7 @@ struct ActionBanner: View {
                 HStack {
                     ActionButton(
                         title: buttonText,
-                        font: .claritySemiBoldSubheadline,
+                        font: .clarity(.semibold, textStyle: .subheadline),
                         image: buttonImage,
                         textColor: .actionBannerButtonTxt,
                         depthEffectColor: .actionBannerButtonEffect,

diff --git a/Nos/Views/ActionButton.swift b/Nos/Views/ActionButton.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct ActionButton: View {
 
     var title: LocalizedStringResource
-    var font: Font = .clarityBold
+    var font: Font = .clarity(.bold)
     var image: Image?
     var textColor = Color.white
     var depthEffectColor = Color(hex: "#A04651")
@@ -30,7 +30,7 @@ struct ActionButton: View {
         }, label: {
             HStack {
                 image
-                PlainText(title)
+                Text(title)
                     .font(font)
                     .transition(.opacity)
                     .font(.headline)
@@ -131,7 +131,7 @@ struct ActionButton_Previews: PreviewProvider {
 
             ActionButton(
                 title: .localizable.edit,
-                font: .clarityMedium,
+                font: .clarity(.medium),
                 image: Image.editProfile, 
                 textColor: Color(hex: "#f26141"),
                 depthEffectColor: Color(hex: "#f8d4b6"),

diff --git a/Nos/Views/AuthorCard.swift b/Nos/Views/AuthorCard.swift
@@ -22,7 +22,7 @@ struct AuthorCard: View {
                         .padding(.trailing, 12)
                     VStack(alignment: .leading, spacing: 6) {
                         HStack {
-                            PlainText(author.safeName)
+                            Text(author.safeName)
                                 .lineLimit(1)
                                 .font(.title3)
                                 .fontWeight(.bold)
@@ -43,9 +43,9 @@ struct AuthorCard: View {
                         }
 
                         if let bio = author.about {
-                            PlainText(bio)
+                            Text(bio)
                                 .foregroundColor(.secondaryTxt)
-                                .font(.claritySubheadline)
+                                .font(.clarity(.medium, textStyle: .subheadline))
                                 .multilineTextAlignment(.leading)
                                 .lineSpacing(5)
                                 .lineLimit(2)

diff --git a/Nos/Views/AuthorLabel.swift b/Nos/Views/AuthorLabel.swift
@@ -22,7 +22,7 @@ struct AuthorLabel: View {
     var body: some View {
         HStack {
             AvatarView(imageUrl: author.profilePhotoURL, size: 24)
-            SwiftUI.Text(attributedAuthor)
+            Text(attributedAuthor)
                 .lineLimit(1)
                 .font(.clarity(.medium))
                 .multilineTextAlignment(.leading)

diff --git a/Nos/Views/AuthorStoryView.swift b/Nos/Views/AuthorStoryView.swift
@@ -115,12 +115,12 @@ struct AuthorStoryView: View {
                                 .frame(width: 25, height: 25)
                             Text(expirationTime)
                                 .lineLimit(1)
-                                .font(.body)
+                                .font(.clarity(.medium))
                                 .foregroundColor(.secondaryTxt)
                         } else if let elapsedTime = selectedNote?.createdAt?.distanceString() {
                             Text(elapsedTime)
                                 .lineLimit(1)
-                                .font(.body)
+                                .font(.clarity(.medium))
                                 .foregroundColor(.secondaryTxt)
                         }
                         Spacer()

diff --git a/Nos/Views/BigActionButton.swift b/Nos/Views/BigActionButton.swift
@@ -16,8 +16,8 @@ struct BigActionButton: View {
                 disabled = false
             }
         }, label: {
-            PlainText(title)
-                .font(.clarityBold)
+            Text(title)
+                .font(.clarity(.bold))
                 .transition(.opacity)
                 .font(.headline)
         })

diff --git a/Nos/Views/BioView.swift b/Nos/Views/BioView.swift
@@ -44,7 +44,7 @@ struct BioView: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 6) {
-            SwiftUI.Text(parsedBio)
+            Text(parsedBio)
                 .font(font)
                 .foregroundColor(.primaryTxt)
                 .tint(.accent)
@@ -63,7 +63,7 @@ struct BioView: View {
                     }
                 }
                 .background {
-                    SwiftUI.Text(parsedBio)
+                    Text(parsedBio)
                         .font(font)
                         .lineSpacing(lineSpacing)
                         .padding(EdgeInsets(top: 0, leading: 18, bottom: 0, trailing: 18))
@@ -89,8 +89,8 @@ struct BioView: View {
                     Button {
                         showingBio = true
                     } label: {
-                        PlainText(String(localized: .localizable.readMore).uppercased())
-                            .font(.clarityCaption)
+                        Text(String(localized: .localizable.readMore).uppercased())
+                            .font(.clarity(.regular, textStyle: .caption1))
                             .foregroundColor(.secondaryTxt)
                             .padding(EdgeInsets(top: 4, leading: 6, bottom: 4, trailing: 6))
                             .background(Color.hashtagBg)
@@ -103,6 +103,7 @@ struct BioView: View {
         }
         .placeholder(when: isLoading) {
             Text(String.loremIpsum(1))
+                .font(.clarity(.regular))
                 .lineSpacing(lineSpacing)
                 .lineLimit(5)
                 .padding(EdgeInsets(top: 0, leading: 18, bottom: 0, trailing: 18))

diff --git a/Nos/Views/CardButtonStyle.swift b/Nos/Views/CardButtonStyle.swift
@@ -44,7 +44,7 @@ extension View {
         Button {
         } label: { 
             VStack {
-                PlainText("hello world")
+                Text("hello world")
                     .padding()
             }
             .background(Color.cardBgTop.cornerRadius(18))

diff --git a/Nos/Views/CompactNoteView.swift b/Nos/Views/CompactNoteView.swift
@@ -77,11 +77,11 @@ struct CompactNoteView: View {
         Group {
             switch note.attributedContent {
             case .loading:
-                SwiftUI.Text(note.content ?? "")
+                Text(note.content ?? "")
                     .font(.clarity(.regular))
                     .redacted(reason: .placeholder)
             case .loaded(let attributedString):
-                SwiftUI.Text(attributedString)
+                Text(attributedString)
             }
         }
     }
@@ -133,7 +133,7 @@ struct CompactNoteView: View {
                             isTextTruncated = false
                         }
                     } label: {
-                        PlainText(String(localized: .localizable.readMore).uppercased())
+                        Text(String(localized: .localizable.readMore).uppercased())
                             .font(.caption)
                             .foregroundColor(.secondaryTxt)
                             .padding(EdgeInsets(top: 4, leading: 6, bottom: 4, trailing: 6))

diff --git a/Nos/Views/Components/WizardNavigationStack.swift b/Nos/Views/Components/WizardNavigationStack.swift
@@ -23,7 +23,7 @@ struct WizardNavigationStack<Root>: View where Root: View {
 #Preview {
     Color.clear.sheet(isPresented: .constant(true)) {
         WizardNavigationStack {
-            PlainText("Hello")
+            Text("Hello")
         }
     }
 }
diff --git a/Nos/Views/Components/WizardSheetBadgeText.swift b/Nos/Views/Components/WizardSheetBadgeText.swift
@@ -13,7 +13,7 @@ struct WizardSheetBadgeText: View {
     }
 
     var body: some View {
-        SwiftUI.Text(String(localized: localizedStringResource).uppercased())
+        Text(String(localized: localizedStringResource).uppercased())
             .padding(.horizontal, 6)
             .padding(.vertical, 5)
             .font(.clarity(.bold, textStyle: .footnote))

diff --git a/Nos/Views/Components/WizardSheetDescriptionText.swift b/Nos/Views/Components/WizardSheetDescriptionText.swift
@@ -12,12 +12,12 @@ struct WizardSheetDescriptionText: View {
         case plainText(LocalizedStringResource)
         case markdown(AttributedString)
 
-        var text: SwiftUI.Text {
+        var text: Text {
             switch self {
             case .plainText(let localizedStringResource):
-                return SwiftUI.Text(localizedStringResource)
+                return Text(localizedStringResource)
             case .markdown(let attributedString):
-                return SwiftUI.Text(attributedString)
+                return Text(attributedString)
             }
         }
     }

diff --git a/Nos/Views/Components/WizardSheetTitleText.swift b/Nos/Views/Components/WizardSheetTitleText.swift
@@ -13,7 +13,7 @@ struct WizardSheetTitleText: View {
     }
 
     var body: some View {
-        SwiftUI.Text(localizedStringResource)
+        Text(localizedStringResource)
             .font(.clarity(.bold, textStyle: .title1))
             .foregroundStyle(Color.primaryTxt)
     }

diff --git a/Nos/Views/Components/WizardSheetVStack.swift b/Nos/Views/Components/WizardSheetVStack.swift
@@ -57,7 +57,7 @@ struct WizardSheetVStack<Content>: View where Content: View {
 #Preview {
     WizardSheetVStack {
         Spacer(minLength: 40)
-        PlainText("Hello")
+        Text("Hello")
         Spacer()
     }
 }
diff --git a/Nos/Views/DiscoverView.swift b/Nos/Views/DiscoverView.swift
@@ -104,7 +104,7 @@ struct DiscoverView: View {
             .searchable(
                 text: $searchController.query, 
                 placement: .toolbar, 
-                prompt: PlainText(.localizable.searchBar)
+                prompt: Text(.localizable.searchBar)
             )
             .autocorrectionDisabled()
             .onSubmit(of: .search) {