damus

commit df0b0e00d1d59a5d005693867319738a968a9efe
parent ce9551ce56fe362c4a86f783b0e82ae0b88cece4
Author: William Casarin <jb55@jb55.com>
Date:   Thu, 21 Jul 2022 17:54:44 -0700

multiline DM messages

Changelog-Added: Multiline DM messages
Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
damus/Views/DMChatView.swift
 | 
47
+++++++++++++++++++++++++++++++++++------------

1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/damus/Views/DMChatView.swift b/damus/Views/DMChatView.swift
@@ -48,24 +48,22 @@ struct DMChatView: View {
     }
 
     var InputField: some View {
-        TextField("New Encrypted Message", text: $message)
-            .padding([.leading, .trailing], 12)
-            .padding([.top, .bottom], 8)
-            .background {
+        TextEditor(text: $message)
+            .textEditorBackground {
                 InputBackground()
             }
-            .foregroundColor(Color.primary)
             .cornerRadius(20)
-            .padding(8)
+            .padding(16)
+            .foregroundColor(Color.primary)
     }
 
     @Environment(\.colorScheme) var colorScheme
 
-    func InputBackground() -> some View {
-        if colorScheme == .dark {
-            return Color.black.brightness(0.1)
+    func InputBackground() -> Color {
+        if colorScheme == .light {
+            return Color.init(.sRGB, red: 0.9, green: 0.9, blue: 0.9, opacity: 1.0)
         } else {
-            return Color.gray.brightness(0.35)
+            return Color.init(.sRGB, red: 0.1, green: 0.1, blue: 0.1, opacity: 1.0)
         }
     }
 
@@ -92,7 +90,21 @@ struct DMChatView: View {
                 }
             }
         }
-        .frame(height: 70)
+        .frame(height: 50 + 20 * CGFloat(text_lines))
+    }
+
+    var text_lines: Int {
+        var lines = 1
+        for c in message {
+            if lines > 4 {
+                return lines
+            }
+            if c.isNewline {
+                lines += 1
+            }
+        }
+
+        return lines
     }
 
     func send_message() {
@@ -128,7 +140,7 @@ struct DMChatView_Previews: PreviewProvider {
         let ev = NostrEvent(content: "hi", pubkey: "pubkey", kind: 1, tags: [])
 
         let model = DirectMessageModel(events: [ev])
-        
+
         DMChatView(damus_state: test_damus_state(), pubkey: "pubkey")
             .environmentObject(model)
     }
@@ -156,3 +168,14 @@ func create_dm(_ message: String, to_pk: String, keypair: Keypair) -> NostrEvent
     ev.sign(privkey: privkey)
     return ev
 }
+
+extension View {
+/// Layers the given views behind this ``TextEditor``.
+    func textEditorBackground<V>(@ViewBuilder _ content: () -> V) -> some View where V : View {
+        self
+            .onAppear {
+                UITextView.appearance().backgroundColor = .clear
+            }
+            .background(content())
+    }
+}