Add an extension for String to calculate its width using specific Swi…

…ftUI Font
Planetable · Dec 7, 2023 · 7c85068 · 7c85068
1 parent 78cff81
commit 7c85068
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/Planet/Helper/Extensions.swift b/Planet/Helper/Extensions.swift
@@ -101,6 +101,37 @@ extension String {
 
         return trimmedTag
     }
+
+    func width(usingFont font: Font) -> CGFloat {
+        let nsFont: NSFont
+
+        // Map SwiftUI Font to NSFont
+        switch font {
+        case .largeTitle:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 1.5, weight: .regular)
+        case .title:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 1.4, weight: .regular)
+        case .headline:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 1.2, weight: .semibold)
+        case .subheadline:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 1.1, weight: .regular)
+        case .body:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize, weight: .regular)
+        case .callout:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 1.1, weight: .regular)
+        case .footnote:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 0.9, weight: .regular)
+        case .caption:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize * 0.8, weight: .regular)
+        // Add other cases as needed
+        default:
+            nsFont = NSFont.systemFont(ofSize: NSFont.systemFontSize)
+        }
+
+        let attributes: [NSAttributedString.Key: Any] = [.font: nsFont]
+        let size = (self as NSString).size(withAttributes: attributes)
+        return size.width
+    }
 }
 
 // User Notification

diff --git a/Planet/Views/My/MyArticleItemView.swift b/Planet/Views/My/MyArticleItemView.swift
@@ -18,6 +18,7 @@ struct MyArticleItemView: View {
                         Text(article.title)
                             .font(.headline)
                             .foregroundColor(.primary)
+                            .lineLimit(1)
 
                         Spacer()
 
@@ -28,14 +29,14 @@ struct MyArticleItemView: View {
                     if let summary = article.summary, summary.count > 0 {
                         Text(summary.prefix(280))
                             .foregroundColor(.secondary)
-                        if summary.count < 40 {
+                        if String(summary.prefix(280)).width(usingFont: .body) < 160 {
                             Spacer()
                         }
                     }
                     else if article.content.count > 0 {
                         Text(article.content.prefix(280))
                             .foregroundColor(.secondary)
-                        if article.content.count < 40 {
+                        if String(article.content.prefix(280)).width(usingFont: .body) < 160 {
                             Spacer()
                         }
                     }
@@ -107,7 +108,7 @@ struct MyArticleItemView: View {
                 } else {
                     if let siteName = article.originalSiteName {
                         Section {
-                            Text("Aggregated from " + siteName)   
+                            Text("Aggregated from " + siteName)
                         }
                     }
                 }

diff --git a/Planet/versioning.xcconfig b/Planet/versioning.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 1819
+CURRENT_PROJECT_VERSION = 1820