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

Revert "Revert "Don't make previews full bleed""

Browse Source 
This reverts commit 57006b928b.
This commit is contained in:
William Casarin
2023-03-26 09:36:02 -06:00
parent 754ee254e9
commit 0b40cd127c
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
damus/Views/NoteContentView.swift
View File

@@ -58,8 +58,28 @@ struct NoteContentView: View {
.font(eventviewsize_to_font(size))
}
func MainContent() -> some View {
return VStack(alignment: .leading) {
var invoicesView: some View {
InvoicesView(our_pubkey: damus_state.keypair.pubkey, invoices: artifacts.invoices)
}
var previewView: some View {
Group {
if let preview = self.preview, show_images {
if let preview_height {
preview
.frame(height: preview_height)
} else {
preview
}
} else if let link = artifacts.links.first {
LinkViewRepresentable(meta: .url(link))
.frame(height: 50)
}
}
}
var MainContent: some View {
VStack(alignment: .leading) {
if size == .selected {
SelectableText(attributedString: artifacts.content)
TranslateView(damus_state: damus_state, event: event)
@@ -84,25 +104,25 @@ struct NoteContentView: View {
}
if artifacts.invoices.count > 0 {
InvoicesView(our_pubkey: damus_state.keypair.pubkey, invoices: artifacts.invoices)
if with_padding {
invoicesView
.padding(.horizontal)
} else {
invoicesView
}
}
if let preview = self.preview, show_images {
if let preview_height {
preview
.frame(height: preview_height)
} else {
preview
}
} else if let link = artifacts.links.first {
LinkViewRepresentable(meta: .url(link))
.frame(height: 50)
if with_padding {
previewView.padding(.horizontal)
} else {
previewView
}
}
}
var body: some View {
MainContent()
MainContent
.onReceive(handle_notify(.profile_updated)) { notif in
let profile = notif.object as! ProfileUpdate
let blocks = event.blocks(damus_state.keypair.privkey)