Merge pull request #1576 from planetary-social/add-mention-button

Add mention button to note composer

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Release Notes
 - Disable autocorrect on NoteComposer when running on macOS. [#1460](https://github.com/planetary-social/nos/issues/1460)
+- Add @ button to the Note Composer. [#1561](https://github.com/planetary-social/nos/issues/1561)
 
 ### Internal Changes
 - Show WebP images without link preview overlay. Currently behind the “Enable new media display” feature flag. [#1488](https://github.com/planetary-social/nos/issues/1488)

Nos/Assets/Assets.xcassets/attach-media-button.imageset/Contents.json

@@ -1,52 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "add_images--light.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "add_images--dark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "attach-media-button.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Nos/Assets/Assets.xcassets/disappearing-messages.imageset/Contents.json

@@ -1,52 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "disappearing--light.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "disappearing--dark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "disappearing-messages.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

Nos/Assets/Assets.xcassets/mention.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "mention.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Nos/Controller/NoteEditorController.swift

@@ -26,8 +26,8 @@ import UIKit
     }
 
     /// Whether the user has entered any text.
-    var isEmpty: Bool = true
-    
+    var isEmpty = true
+
     /// The attributed text the user has entered.
     var text: AttributedString? {
         if let textView {
@@ -71,6 +71,10 @@ import UIKit
         attributedString.replaceCharacters(in: range, with: appendedAttributedString)
         textView.attributedText = attributedString
         textView.selectedRange.location += appendedAttributedString.length
+
+        ///  Check if `@` was appended and show the mentionsAutoComplete list.
+        guard text == "@" else { return }
+        showMentionsAutocomplete = true
     }
 
     /// Appends the given URL and adds the default link styling attributes. Will append a space before the link 

Nos/Views/NoteComposer/ComposerActionBar.swift

@@ -100,6 +100,7 @@ struct ComposerActionBar: View {
             if !showPreview {
                 attachMediaView
                 expirationTimeView
+                mentionButton
             }
             Spacer()
             previewToggle
@@ -160,6 +161,17 @@ struct ComposerActionBar: View {
         }
     }
 
+    /// Inserts a mention (`@`) symbol into the text editor.
+    private var mentionButton: some View {
+        Button {
+            editingController.append(text: "@")
+        } label: {
+            Image.mention
+                .foregroundColor(.secondaryTxt)
+                .frame(minWidth: 44, minHeight: 44)
+        }
+    }
+
     /// Uploads an image at the given URL to a file storage service.
     /// - Parameter imageURL: File URL of the image the user wants to upload.
     private func uploadImage(