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

Show paid or global relay type next to relay status

Browse Source 
Changelog-Added: Show if relay is paid
This commit is contained in:
William Casarin
2023-02-10 09:35:59 -08:00
parent 771fa845e3
commit 289d55b918
7 changed files with 146 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
damus/Views/Relays/RelayDetailView.swift
View File

@@ -13,7 +13,6 @@ struct RelayDetailView: View {
let nip11: RelayMetadata
@State private var errorString: String?
@State var conn_color: Color
@Environment(\.dismiss) var dismiss
@@ -34,9 +33,7 @@ struct RelayDetailView: View {
HStack {
Text(relay)
Spacer()
Circle()
.frame(width: 8.0, height: 8.0)
.foregroundColor(conn_color)
RelayStatus(pool: state.pool, relay: relay)
}
}
Section(NSLocalizedString("Description", comment: "Label to display relay description.")) {
@@ -92,6 +89,6 @@ struct RelayDetailView: View {
struct RelayDetailView_Previews: PreviewProvider {
static var previews: some View {
let metadata = RelayMetadata(name: "name", description: "desc", pubkey: "pubkey", contact: "contact", supported_nips: [1,2,3], software: "software", version: "version", limitation: Limitations.empty)
RelayDetailView(state: test_damus_state(), relay: "relay", nip11: metadata, conn_color: .green)
RelayDetailView(state: test_damus_state(), relay: "relay", nip11: metadata)
}
}

50
damus/Views/Relays/RelayStatus.swift Normal file
View File

@@ -0,0 +1,50 @@
//
// RelayStatus.swift
// damus
//
// Created by William Casarin on 2023-02-10.
//
import SwiftUI
struct RelayStatus: View {
let pool: RelayPool
let relay: String
let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
@State var conn_color: Color = .gray
func update_connection_color() {
for relay in pool.relays {
if relay.id == self.relay {
let c = relay.connection
if c.isConnected {
conn_color = .green
} else if c.isConnecting || c.isReconnecting {
conn_color = .yellow
} else {
conn_color = .red
}
}
}
}
var body: some View {
Circle()
.frame(width: 8.0, height: 8.0)
.foregroundColor(conn_color)
.onReceive(timer) { _ in
update_connection_color()
}
.onAppear() {
update_connection_color()
}
}
}
struct RelayStatus_Previews: PreviewProvider {
static var previews: some View {
RelayStatus(pool: test_damus_state().pool, relay: "relay")
}
}

42
damus/Views/Relays/RelayToggle.swift Normal file
View File

@@ -0,0 +1,42 @@
//
// RelayToggle.swift
// damus
//
// Created by William Casarin on 2023-02-10.
//
import SwiftUI
struct RelayToggle: View {
let state: DamusState
let timeline: Timeline
let relay_id: String
func toggle_binding(relay_id: String) -> Binding<Bool> {
return Binding(get: {
!state.relay_filters.is_filtered(timeline: timeline, relay_id: relay_id)
}, set: { on in
if !on {
state.relay_filters.insert(timeline: timeline, relay_id: relay_id)
} else {
state.relay_filters.remove(timeline: timeline, relay_id: relay_id)
}
})
}
var body: some View {
HStack {
RelayStatus(pool: state.pool, relay: relay_id)
RelayType(is_paid: state.relay_metadata.lookup(relay_id: relay_id)?.is_paid ?? false)
Toggle(relay_id, isOn: toggle_binding(relay_id: relay_id))
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
}
}
}
struct RelayToggle_Previews: PreviewProvider {
static var previews: some View {
RelayToggle(state: test_damus_state(), timeline: .search, relay_id: "wss://jb55.com")
.padding()
}
}

27
damus/Views/Relays/RelayType.swift Normal file
View File

@@ -0,0 +1,27 @@
//
// RelayType.swift
// damus
//
// Created by William Casarin on 2023-02-10.
//
import SwiftUI
struct RelayType: View {
let is_paid: Bool
var body: some View {
Image(systemName: is_paid ? "dollarsign.circle.fill" : "globe.americas.fill")
.foregroundColor(is_paid ? Color("DamusGreen") : .gray)
}
}
struct RelayType_Previews: PreviewProvider {
static var previews: some View {
VStack {
RelayType(is_paid: false)
RelayType(is_paid: true)
}
}
}

47
damus/Views/Relays/RelayView.swift
View File

@@ -11,45 +11,22 @@ struct RelayView: View {
let state: DamusState
let relay: String
let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
@State var conn_color: Color = .gray
func update_connection_color() {
for relay in state.pool.relays {
if relay.id == self.relay {
let c = relay.connection
if c.isConnected {
conn_color = .green
} else if c.isConnecting || c.isReconnecting {
conn_color = .yellow
} else {
conn_color = .red
}
}
}
}
var body: some View {
HStack {
Circle()
.frame(width: 8.0, height: 8.0)
.foregroundColor(conn_color)
if let meta = state.relay_metadata.lookup(relay_id: relay) {
NavigationLink {
RelayDetailView(state: state, relay: relay, nip11: meta, conn_color: conn_color)
} label: {
Group {
HStack {
RelayStatus(pool: state.pool, relay: relay)
RelayType(is_paid: state.relay_metadata.lookup(relay_id: relay)?.is_paid ?? false)
if let meta = state.relay_metadata.lookup(relay_id: relay) {
NavigationLink {
RelayDetailView(state: state, relay: relay, nip11: meta)
} label: {
Text(relay)
}
} else {
Text(relay)
}
} else {
Text(relay)
}
}
.onReceive(timer) { _ in
update_connection_color()
}
.onAppear() {
update_connection_color()
}
.swipeActions {
if let privkey = state.keypair.privkey {
RemoveAction(privkey: privkey)
@@ -94,6 +71,6 @@ struct RelayView: View {
struct RelayView_Previews: PreviewProvider {
static var previews: some View {
RelayView(state: test_damus_state(), relay: "wss://relay.damus.io", conn_color: .red)
RelayView(state: test_damus_state(), relay: "wss://relay.damus.io")
}
}