damus

commit f236ea52e126b2d73347cafc22c0f428f00a2dca
parent 9c8391b33b98ddfd87b3b289fb78a014518d9bb5
Author: William Casarin <jb55@jb55.com>
Date:   Wed,  5 Apr 2023 10:32:32 -0700

Implement additional text truncation settings

Changelog-Added: Added text truncation settings

Diffstat:
M
damus/Models/UserSettingsStore.swift
 | 
2
+-
M
damus/Views/Notifications/EventGroupView.swift
 | 
2
+-
M
damus/Views/Notifications/NotificationItemView.swift
 | 
10
+++++++++-

3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/damus/Models/UserSettingsStore.swift b/damus/Models/UserSettingsStore.swift
@@ -276,7 +276,7 @@ class UserSettingsStore: ObservableObject {
         dm_notification = UserDefaults.standard.object(forKey: "dm_notification") as? Bool ?? true
         notification_only_from_following = UserDefaults.standard.object(forKey: "notification_only_from_following") as? Bool ?? false
         truncate_timeline_text = UserDefaults.standard.object(forKey: "truncate_timeline_text") as? Bool ?? false
-        truncate_mention_text = UserDefaults.standard.object(forKey: "truncate_mention_text") as? Bool ?? true
+        truncate_mention_text = UserDefaults.standard.object(forKey: "truncate_mention_text") as? Bool ?? false
         disable_animation = should_disable_image_animation()
         auto_translate = UserDefaults.standard.object(forKey: "auto_translate") as? Bool ?? true
         show_only_preferred_languages = UserDefaults.standard.object(forKey: "show_only_preferred_languages") as? Bool ?? false
diff --git a/damus/Views/Notifications/EventGroupView.swift b/damus/Views/Notifications/EventGroupView.swift
@@ -212,7 +212,7 @@ struct EventGroupView: View {
                     NavigationLink(destination: dest) {
                         VStack(alignment: .leading) {
                             GroupDescription
-                            EventBody(damus_state: state, event: event, size: .normal, options: [])
+                            EventBody(damus_state: state, event: event, size: .normal, options: [.truncate_content])
                                 .padding([.top], 1)
                                 .padding([.trailing])
                                 .foregroundColor(.gray)
diff --git a/damus/Views/Notifications/NotificationItemView.swift b/damus/Views/Notifications/NotificationItemView.swift
@@ -35,6 +35,14 @@ struct NotificationItemView: View {
         notification_item_event(events: state.events, notif: item)
     }
     
+    var options: EventViewOptions {
+        if state.settings.truncate_mention_text {
+            return [.wide, .truncate_content]
+        }
+        
+        return [.wide]
+    }
+    
     func Item(_ ev: NostrEvent?) -> some View {
         Group {
             switch item {
@@ -52,7 +60,7 @@ struct NotificationItemView: View {
             
             case .reply(let ev):
                 NavigationLink(destination: ThreadView(state: state, thread: ThreadModel(event: ev, damus_state: state))) {
-                    EventView(damus: state, event: ev, options: [.wide, .truncate_content])
+                    EventView(damus: state, event: ev, options: options)
                 }
                 .buttonStyle(.plain)
             }