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

Show full bleed images on selected events in threads

Browse Source 
Changelog-Changed: Show full bleed images on selected events in threads
This commit is contained in:
William Casarin
2023-04-04 10:58:16 -07:00
parent 9ca959d8d3
commit 98d11fb71e
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/Views/Events/SelectedEventView.swift
View File

@@ -39,21 +39,24 @@ struct SelectedEventView: View {
.padding([.bottom], 4) .padding([.bottom], 4)
} }
.padding(.horizontal)
.minimumScaleFactor(0.75) .minimumScaleFactor(0.75)
.lineLimit(1) .lineLimit(1)
if event_is_reply(event, privkey: damus.keypair.privkey) { if event_is_reply(event, privkey: damus.keypair.privkey) {
ReplyDescription(event: event, profiles: damus.profiles) ReplyDescription(event: event, profiles: damus.profiles)
.padding(.horizontal)
} }
EventBody(damus_state: damus, event: event, size: size, options: []) EventBody(damus_state: damus, event: event, size: size, options: [.pad_content])
if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) { if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) {
BuilderEventView(damus: damus, event_id: mention.ref.id) BuilderEventView(damus: damus, event_id: mention.ref.id)
.padding(.horizontal)
} }
Text(verbatim: "\(format_date(event.created_at))") Text(verbatim: "\(format_date(event.created_at))")
.padding(.top, 10) .padding([.top, .leading, .trailing])
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundColor(.gray)
@@ -62,11 +65,13 @@ struct SelectedEventView: View {
if !bar.is_empty { if !bar.is_empty {
EventDetailBar(state: damus, target: event.id, target_pk: event.pubkey) EventDetailBar(state: damus, target: event.id, target_pk: event.pubkey)
.padding(.horizontal)
Divider() Divider()
} }
EventActionBar(damus_state: damus, event: event) EventActionBar(damus_state: damus, event: event)
.padding([.top], 4) .padding([.top], 4)
.padding(.horizontal)
Divider() Divider()
.padding([.top], 4) .padding([.top], 4)
@@ -76,7 +81,6 @@ struct SelectedEventView: View {
guard target == self.event.id else { return } guard target == self.event.id else { return }
self.bar.update(damus: self.damus, evid: target) self.bar.update(damus: self.damus, evid: target)
} }
.padding([.leading], 2)
.compositingGroup() .compositingGroup()
} }
} }

7
damus/Views/NoteContentView.swift
View File

@@ -85,7 +85,12 @@ struct NoteContentView: View {
var MainContent: some View { var MainContent: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
if size == .selected { if size == .selected {
SelectableText(attributedString: artifacts.content, size: self.size) if with_padding {
SelectableText(attributedString: artifacts.content, size: self.size)
.padding(.horizontal)
} else {
SelectableText(attributedString: artifacts.content, size: self.size)
}
} else { } else {
if with_padding { if with_padding {
truncatedText truncatedText

9
damus/Views/ThreadView.swift
View File

@@ -30,8 +30,8 @@ struct ThreadView: View {
MutedEventView(damus_state: state, MutedEventView(damus_state: state,
event: parent_event, event: parent_event,
scroller: reader, scroller: reader,
selected: false selected: false)
) .padding(.horizontal)
.onTapGesture { .onTapGesture {
thread.set_active_event(parent_event, privkey: state.keypair.privkey) thread.set_active_event(parent_event, privkey: state.keypair.privkey)
scroll_to_event(scroller: reader, id: parent_event.id, delay: 0.1, animate: false) scroll_to_event(scroller: reader, id: parent_event.id, delay: 0.1, animate: false)
@@ -49,7 +49,7 @@ struct ThreadView: View {
Rectangle() Rectangle()
.fill(Color.gray.opacity(0.25)) .fill(Color.gray.opacity(0.25))
.frame(width: 2, height: eventHeight) .frame(width: 2, height: eventHeight)
.offset(x: 25, y: 40) .offset(x: 40, y: 40)
}) })
// MARK: - Actual event view // MARK: - Actual event view
@@ -68,6 +68,7 @@ struct ThreadView: View {
scroller: nil, scroller: nil,
selected: false selected: false
) )
.padding(.horizontal)
.onTapGesture { .onTapGesture {
thread.set_active_event(child_event, privkey: state.keypair.privkey) thread.set_active_event(child_event, privkey: state.keypair.privkey)
scroll_to_event(scroller: reader, id: child_event.id, delay: 0.1, animate: false) scroll_to_event(scroller: reader, id: child_event.id, delay: 0.1, animate: false)
@@ -76,7 +77,7 @@ struct ThreadView: View {
Divider() Divider()
.padding([.top], 4) .padding([.top], 4)
} }
}.padding() }
}.navigationBarTitle(NSLocalizedString("Thread", comment: "Navigation bar title for note thread.")) }.navigationBarTitle(NSLocalizedString("Thread", comment: "Navigation bar title for note thread."))
.onAppear { .onAppear {
thread.subscribe() thread.subscribe()