From d15a2f04017e5f4af3b8a83d7ce57575c2f6744b Mon Sep 17 00:00:00 2001 From: ericholguin Date: Sat, 25 Mar 2023 08:22:19 -0600 Subject: [PATCH] update icons --- .../bitcoin-logo.imageset/bitcoin-logo.svg | 4 ++-- damus/Views/Relays/RecommendedRelayView.swift | 4 ++-- damus/Views/Relays/RelayStatus.swift | 11 +++++------ damus/Views/Relays/RelayView.swift | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg b/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg index d3521bdd..cf814514 100644 --- a/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg +++ b/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg @@ -1,7 +1,7 @@ - - + + diff --git a/damus/Views/Relays/RecommendedRelayView.swift b/damus/Views/Relays/RecommendedRelayView.swift index 76b9dc5d..c3537b26 100644 --- a/damus/Views/Relays/RecommendedRelayView.swift +++ b/damus/Views/Relays/RecommendedRelayView.swift @@ -53,13 +53,13 @@ struct RecommendedRelayView: View { Spacer() Image(systemName: "info.circle") - .font(.system(size: 20, weight: .medium)) + .font(.system(size: 20, weight: .regular)) .foregroundColor(Color.accentColor) } else { Spacer() Image(systemName: "questionmark.circle") - .font(.system(size: 20, weight: .medium)) + .font(.system(size: 20, weight: .regular)) .foregroundColor(.gray) } } diff --git a/damus/Views/Relays/RelayStatus.swift b/damus/Views/Relays/RelayStatus.swift index b05187aa..b711bcf9 100644 --- a/damus/Views/Relays/RelayStatus.swift +++ b/damus/Views/Relays/RelayStatus.swift @@ -14,7 +14,7 @@ struct RelayStatus: View { let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect() @State var conn_color: Color = .gray - @State var conn_image: String = "wifi.slash" + @State var conn_image: String = "network" @State var connecting: Bool = false func update_connection() { @@ -22,13 +22,12 @@ struct RelayStatus: View { if relay.id == self.relay { let c = relay.connection if c.isConnected { - conn_image = "checkmark" - conn_color = .accentColor + conn_image = "network" + conn_color = .green } else if c.isConnecting || c.isReconnecting { connecting = true } else { - //conn_image = "wifi.exclamationmark" - conn_image = "xmark" + conn_image = "exclamationmark.circle.fill" conn_color = .red } } @@ -39,7 +38,7 @@ struct RelayStatus: View { HStack { if connecting { ProgressView() - .padding(.trailing, 5) + .padding(.trailing, 4) } else { Image(systemName: conn_image) .frame(width: 8.0, height: 8.0) diff --git a/damus/Views/Relays/RelayView.swift b/damus/Views/Relays/RelayView.swift index 2facc40a..62e91c90 100644 --- a/damus/Views/Relays/RelayView.swift +++ b/damus/Views/Relays/RelayView.swift @@ -36,13 +36,13 @@ struct RelayView: View { Spacer() Image(systemName: "info.circle") - .font(.system(size: 20, weight: .medium)) + .font(.system(size: 20, weight: .regular)) .foregroundColor(Color.accentColor) } else { Text(relay) Spacer() Image(systemName: "questionmark.circle") - .font(.system(size: 20, weight: .medium)) + .font(.system(size: 20, weight: .regular)) .foregroundColor(.gray) } }