Clean up code in ProfileName.name_choice

Signed-off-by: Terry Yiu <git@tyiu.xyz>
Add Unicode 16 emoji reactions for iOS 18.4+ by upgrading EmojiPicker
2025-04-11 15:05:09 -04:00 · 2025-03-29 11:40:47 -03:00
3 changed files with 9 additions and 7 deletions
--- a/damus.xcodeproj/project.pbxproj
+++ b/damus.xcodeproj/project.pbxproj
@@ -6854,7 +6854,7 @@
 			repositoryURL = "https://github.com/tyiu/EmojiPicker.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.1.1;
+				minimumVersion = 0.2.0;
 			};
 		};
 		4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
--- a/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "085cf0f645323bf77edb52886489bf77b309a0a2d2b78a54beaf8520b540d596",
+  "originHash" : "06318d35ee2e6bd681b95591e67da33a9461b48a3c652e58bd9d1a6f0d82bdac",
  "pins" : [
    {
      "identity" : "codescanner",
@@ -22,8 +22,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/tyiu/EmojiKit",
      "state" : {
-        "revision" : "05805f72d63a6d6a2d7dc7fe14abd37c1317b11a",
-        "version" : "0.1.2"
+        "revision" : "47a4b1402de26be0299dcb4d667c1faaf21a7874",
+        "version" : "0.2.0"
      }
    },
    {
@@ -31,8 +31,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/tyiu/EmojiPicker.git",
      "state" : {
-        "revision" : "0c28b4a1a6b8840cf2580bda59517f6d0a733dc8",
-        "version" : "0.1.1"
+        "revision" : "3f48903721eae223238ff0af17c22d6373d33813",
+        "version" : "0.2.0"
      }
    },
    {
--- a/damus/Views/Profile/ProfileName.swift
+++ b/damus/Views/Profile/ProfileName.swift
@@ -67,7 +67,9 @@ struct ProfileName: View {
    }
    
    func name_choice(profile: Profile?) -> String {
-        return prefix == "@" ? current_display_name(profile: profile).username.truncate(maxLength: 50) : current_display_name(profile: profile).displayName.truncate(maxLength: 50)
+        let displayName = current_display_name(profile: profile)
+        let untruncatedName = prefix == "@" ? displayName.username : displayName.displayName
+        return untruncatedName.truncate(maxLength: 50)
    }
    
    func onlyzapper(profile: Profile?) -> Bool {
Author	SHA1	Message	Date
Terry Yiu	0b85b53eda	Clean up code in ProfileName.name_choice Signed-off-by: Terry Yiu <git@tyiu.xyz>	2025-04-11 15:05:09 -04:00
Terry Yiu	b35cc33c32	Add Unicode 16 emoji reactions for iOS 18.4+ by upgrading EmojiPicker Changelog-Added: Added Unicode 16 emoji reactions for iOS 18.4+ by upgrading EmojiPicker Closes: https://github.com/damus-io/damus/issues/2915 Signed-off-by: Terry Yiu <git@tyiu.xyz>	2025-03-29 11:40:47 -03:00