From 39bab0bb08c0fbe1a3deeeb5178e97ac15242bcd Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Mon, 5 Dec 2022 13:44:24 -0600
Subject: [PATCH] Switch to System font to fix emoji rendering
---
src/view/com/post-thread/PostThreadItem.tsx | 2 +-
src/view/com/post/Post.tsx | 2 +-
src/view/com/posts/FeedItem.tsx | 2 +-
src/view/com/util/RichText.tsx | 10 ----------
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
index d08ca3e4..fcfaba9d 100644
--- a/src/view/com/post-thread/PostThreadItem.tsx
+++ b/src/view/com/post-thread/PostThreadItem.tsx
@@ -356,7 +356,7 @@ const styles = StyleSheet.create({
maxWidth: 240,
},
postText: {
- fontFamily: 'Helvetica Neue',
+ fontFamily: 'System',
fontSize: 16,
lineHeight: 20.8, // 1.3 of 16px
},
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index 736b4015..2996991e 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -206,7 +206,7 @@ const styles = StyleSheet.create({
paddingBottom: 8,
},
postText: {
- fontFamily: 'Helvetica Neue',
+ fontFamily: 'System',
fontSize: 16,
lineHeight: 20.8, // 1.3 of 16px
},
diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx
index 4d50531b..19df5a74 100644
--- a/src/view/com/posts/FeedItem.tsx
+++ b/src/view/com/posts/FeedItem.tsx
@@ -249,7 +249,7 @@ const styles = StyleSheet.create({
minHeight: 36,
},
postText: {
- fontFamily: 'Helvetica Neue',
+ fontFamily: 'System',
fontSize: 16,
lineHeight: 20.8, // 1.3 of 16px
},
diff --git a/src/view/com/util/RichText.tsx b/src/view/com/util/RichText.tsx
index 3f0e9908..835a3515 100644
--- a/src/view/com/util/RichText.tsx
+++ b/src/view/com/util/RichText.tsx
@@ -98,13 +98,3 @@ function* toSegments(text: string, entities: Entity[]) {
yield text.slice(cursor, text.length)
}
}
-
-function stripUsername(v: string): string {
- return v.trim().replace('@', '')
-}
-
-function isSameLink(a: string, b: string) {
- a = a.startsWith('http') ? a : `https://${a}`
- b = b.startsWith('http') ? b : `https://${b}`
- return a === b
-}