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

made relay addition more obvious

Browse Source
This commit is contained in:
ericholguin
2023-03-23 23:54:42 -06:00
parent 8297859f18
commit 13c0c0d679
1 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
damus/Views/Relays/RecommendedRelayView.swift
View File

@@ -12,22 +12,33 @@ struct RecommendedRelayView: View {
let relay: String
let add_button: Bool
init(damus: DamusState, relay: String) {
@Binding var showActionButtons: Bool
init(damus: DamusState, relay: String, showActionButtons: Binding<Bool>) {
self.damus = damus
self.relay = relay
self.add_button = true
self._showActionButtons = showActionButtons
}
init(damus: DamusState, relay: String, add_button: Bool) {
init(damus: DamusState, relay: String, add_button: Bool, showActionButtons: Binding<Bool>) {
self.damus = damus
self.relay = relay
self.add_button = add_button
self._showActionButtons = showActionButtons
}
var body: some View {
ZStack {
HStack {
if let privkey = damus.keypair.privkey {
if showActionButtons && add_button {
AddButton(privkey: privkey, showText: false)
}
}
RelayType(is_paid: damus.relay_metadata.lookup(relay_id: relay)?.is_paid ?? false)
Text(relay).layoutPriority(1)
if let meta = damus.relay_metadata.lookup(relay_id: relay) {
@@ -37,41 +48,75 @@ struct RecommendedRelayView: View {
EmptyView()
}
.opacity(0.0)
.disabled(showActionButtons)
Spacer()
Image(systemName: "info.circle")
.font(.system(size: 20, weight: .medium))
.foregroundColor(Color.accentColor)
} else {
Spacer()
Image(systemName: "questionmark.circle")
.font(.system(size: 20, weight: .medium))
.foregroundColor(.gray)
}
}
}
.swipeActions {
if add_button {
if let privkey = damus.keypair.privkey {
AddAction(privkey: privkey)
AddButton(privkey: privkey, showText: false)
.tint(.accentColor)
}
}
}
.contextMenu {
CopyAction(relay: relay)
if let privkey = damus.keypair.privkey {
AddButton(privkey: privkey, showText: true)
}
}
}
func AddAction(privkey: String) -> some View {
func CopyAction(relay: String) -> some View {
Button {
guard let ev_before_add = damus.contacts.event else {
return
}
guard let ev_after_add = add_relay(ev: ev_before_add, privkey: privkey, current_relays: damus.pool.descriptors, relay: relay, info: .rw) else {
return
}
process_contact_event(state: damus, ev: ev_after_add)
damus.pool.send(.event(ev_after_add))
UIPasteboard.general.setValue(relay, forPasteboardType: "public.plain-text")
} label: {
Label(NSLocalizedString("Add Relay", comment: "Button to add recommended relay server."), systemImage: "plus.circle")
Label(NSLocalizedString("Copy", comment: "Button to copy a relay server address."), systemImage: "doc.on.doc")
}
.tint(.accentColor)
}
func AddButton(privkey: String, showText: Bool) -> some View {
Button(action: {
add_action(privkey: privkey)
}) {
if showText {
Text(NSLocalizedString("Connect", comment: "Button to connect to recommended relay server."))
}
Image(systemName: "plus.circle.fill")
.font(.system(size: 20, weight: .medium))
.foregroundColor(.accentColor)
.padding(.leading, 5)
}
}
func add_action(privkey: String) {
guard let ev_before_add = damus.contacts.event else {
return
}
guard let ev_after_add = add_relay(ev: ev_before_add, privkey: privkey, current_relays: damus.pool.descriptors, relay: relay, info: .rw) else {
return
}
process_contact_event(state: damus, ev: ev_after_add)
damus.pool.send(.event(ev_after_add))
}
}
struct RecommendedRelayView_Previews: PreviewProvider {
static var previews: some View {
RecommendedRelayView(damus: test_damus_state(), relay: "wss://relay.damus.io")
RecommendedRelayView(damus: test_damus_state(), relay: "wss://relay.damus.io", showActionButtons: .constant(false))
}
}