Revert "Don't make previews full bleed"

This reverts commit 98f0b2f2d2.
This commit is contained in:
William Casarin
2023-03-25 06:31:18 -06:00
parent 98f0b2f2d2
commit 57006b928b

View File

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