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

Revert "Add menu ellipsis button to notes"

Browse Source 
This reverts commit 390c9162ae.
This commit is contained in:
William Casarin
2023-02-17 10:24:47 -08:00
parent 5018b9aa1e
commit 7c563cb0ae
6 changed files with 48 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Views/ChatroomView.swift
View File

@@ -24,7 +24,7 @@ struct ChatroomView: View {
next_ev: ind == count-1 ? nil : thread.events[ind+1], next_ev: ind == count-1 ? nil : thread.events[ind+1],
damus_state: damus damus_state: damus
) )
.contextMenu{MenuItems(event: ev, keypair: damus.keypair, target_pubkey: ev.pubkey)} .event_context_menu(ev, keypair: damus.keypair, target_pubkey: ev.pubkey)
.onTapGesture { .onTapGesture {
if thread.initial_event.id == ev.id { if thread.initial_event.id == ev.id {
//dismiss() //dismiss()

2
damus/Views/DMChatView.swift
View File

@@ -19,7 +19,7 @@ struct DMChatView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in
DMView(event: dms.events[ind], damus_state: damus_state) DMView(event: dms.events[ind], damus_state: damus_state)
.contextMenu{MenuItems(event: ev, keypair: damus_state.keypair, target_pubkey: ev.pubkey)} .event_context_menu(ev, keypair: damus_state.keypair, target_pubkey: ev.pubkey)
} }
EndBlock(height: 80) EndBlock(height: 80)
} }

12
damus/Views/Events/EmbeddedEventView.swift
View File

@@ -18,20 +18,12 @@ struct EmbeddedEventView: View {
var body: some View { var body: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
let profile = damus_state.profiles.lookup(id: pubkey) let profile = damus_state.profiles.lookup(id: pubkey)
HStack {
EventProfile(damus_state: damus_state, pubkey: pubkey, profile: profile, size: .small) EventProfile(damus_state: damus_state, pubkey: pubkey, profile: profile, size: .small)
Spacer()
EventMenuContext(event: event, keypair: damus_state.keypair, target_pubkey: event.pubkey)
.padding([.bottom], 4)
}
.minimumScaleFactor(0.75)
.lineLimit(1)
EventBody(damus_state: damus_state, event: event, size: .small) EventBody(damus_state: damus_state, event: event, size: .small)
} }
.event_context_menu(event, keypair: damus_state.keypair, target_pubkey: pubkey)
} }
} }

23
damus/Views/Events/EventMenu.swift
View File

@@ -13,29 +13,7 @@ struct EventMenuContext: View {
let target_pubkey: String let target_pubkey: String
var body: some View { var body: some View {
HStack {
Menu {
MenuItems(event: event, keypair: keypair, target_pubkey: target_pubkey)
} label: {
Label(NSLocalizedString("", comment: "Context menu"), systemImage: "ellipsis")
.foregroundColor(Color.gray)
}
}
.contentShape(Rectangle())
.onTapGesture {}
}
}
struct MenuItems: View {
let event: NostrEvent
let keypair: Keypair
let target_pubkey: String
var body: some View {
Group {
Button { Button {
UIPasteboard.general.string = event.get_content(keypair.privkey) UIPasteboard.general.string = event.get_content(keypair.privkey)
} label: { } label: {
@@ -82,7 +60,6 @@ struct MenuItems: View {
} }
} }
} }
}
} }
/* /*

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

@@ -28,18 +28,7 @@ struct SelectedEventView: View {
let profile = damus.profiles.lookup(id: pubkey) let profile = damus.profiles.lookup(id: pubkey)
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack {
EventProfile(damus_state: damus, pubkey: pubkey, profile: profile, size: .normal) EventProfile(damus_state: damus, pubkey: pubkey, profile: profile, size: .normal)
Spacer()
EventMenuContext(event: event, keypair: damus.keypair, target_pubkey: event.pubkey)
.padding([.bottom], 4)
}
.minimumScaleFactor(0.75)
.lineLimit(1)
EventBody(damus_state: damus, event: event, size: .selected) EventBody(damus_state: damus, event: event, size: .selected)
if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) { if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) {
@@ -71,6 +60,7 @@ struct SelectedEventView: View {
self.bar.update(damus: self.damus, evid: target) self.bar.update(damus: self.damus, evid: target)
} }
.padding([.leading], 2) .padding([.leading], 2)
.event_context_menu(event, keypair: damus.keypair, target_pubkey: event.pubkey)
} }
} }
} }

7
damus/Views/Events/TextEvent.swift
View File

@@ -37,13 +37,7 @@ struct TextEvent: View {
.foregroundColor(.gray) .foregroundColor(.gray)
Spacer() Spacer()
EventMenuContext(event: event, keypair: damus.keypair, target_pubkey: event.pubkey)
.padding([.bottom], 4)
} }
.minimumScaleFactor(0.75)
.lineLimit(1)
EventBody(damus_state: damus, event: event, size: .normal) EventBody(damus_state: damus, event: event, size: .normal)
@@ -65,6 +59,7 @@ struct TextEvent: View {
.id(event.id) .id(event.id)
.frame(maxWidth: .infinity, minHeight: PFP_SIZE) .frame(maxWidth: .infinity, minHeight: PFP_SIZE)
.padding([.bottom], 2) .padding([.bottom], 2)
.event_context_menu(event, keypair: damus.keypair, target_pubkey: pubkey)
} }
} }