tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix chatroom cruft

Browse Source 
Changelog-Fixed: Fixed various issues with chatroom view
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-08-09 16:09:12 -07:00
parent 9420a7a0ad
commit 1ab42b4c5c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
damus/Views/ChatView.swift
View File

@@ -96,13 +96,14 @@ struct ChatView: View {
if let ref_id = thread.replies.lookup(event.id) {
if !is_reply_to_prev() {
ReplyQuoteView(privkey: damus_state.keypair.privkey, quoter: event, event_id: ref_id, image_cache: damus_state.image_cache, profiles: damus_state.profiles)
.frame(maxHeight: 100)
.environmentObject(thread)
ReplyDescription
}
}
NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, content: event.content)
NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, content: event.content)
if is_active || next_ev == nil || next_ev!.pubkey != event.pubkey {
let bar = make_actionbar_model(ev: event, damus: damus_state)
EventActionBar(damus_state: damus_state, event: event, bar: bar)
@@ -112,7 +113,6 @@ struct ChatView: View {
}
.padding(6)
}
.padding([.leading], 2)
.background(Color.secondary.opacity(0.1))
.cornerRadius(8.0)

2
damus/Views/ChatroomView.swift
View File

@@ -37,7 +37,7 @@ struct ChatroomView: View {
}
EndBlock()
EndBlock(height: 500)
}
.onReceive(NotificationCenter.default.publisher(for: .select_quote)) { notif in
let ev = notif.object as! NostrEvent

3
damus/Views/EventDetailView.swift
View File

@@ -60,11 +60,14 @@ struct EventDetailView: View {
switch cev {
case .collapsed(let c):
Text("··· \(c.count) other notes ···")
.padding([.top,.bottom], 10)
.font(.footnote)
.foregroundColor(.gray)
.onTapGesture {
//self.uncollapse_section(scroller: proxy, c: c)
//self.toggle_collapse_thread(scroller: proxy, id: nil)
let ev = thread.events[c.start]
thread.set_active_event(ev, privkey: damus.keypair.privkey)
toggle_thread_view()
}
case .event(let ev, let highlight):