diff --git a/Meshtastic/Views/Helpers/CircleText.swift b/Meshtastic/Views/Helpers/CircleText.swift index bcacfec2..603cbc5a 100644 --- a/Meshtastic/Views/Helpers/CircleText.swift +++ b/Meshtastic/Views/Helpers/CircleText.swift @@ -10,6 +10,7 @@ struct CircleText: View { var color: Color var circleSize: CGFloat? = 60 var fontSize: CGFloat? = 20 + var brightness: Double? = 0 var body: some View { @@ -18,6 +19,7 @@ struct CircleText: View { ZStack { Circle() .fill(color) + .brightness(brightness ?? 0) .frame(width: circleSize, height: circleSize) Text(text).textCase(.uppercase).font(font).foregroundColor(.white).fixedSize() .frame(width: circleSize, height: circleSize, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/).offset(x: 0, y: 0) diff --git a/Meshtastic/Views/Messages/Contacts.swift b/Meshtastic/Views/Messages/Contacts.swift index 1d4f814c..37efd2a7 100644 --- a/Meshtastic/Views/Messages/Contacts.swift +++ b/Meshtastic/Views/Messages/Contacts.swift @@ -41,7 +41,7 @@ struct Contacts: View { let currentDay = Calendar.current.dateComponents([.day], from: Date()).day ?? 0 VStack(alignment: .leading) { HStack { - CircleText(text: String(channel.index), color: .gray, circleSize: 52, fontSize: 40) + CircleText(text: String(channel.index), color: .accentColor, circleSize: 52, fontSize: 40, brightness: 0.1) .padding(.trailing, 5) VStack { HStack { @@ -98,7 +98,7 @@ struct Contacts: View { HStack { VStack { HStack { - CircleText(text: user.shortName ?? "???", color: .gray, circleSize: 52, fontSize: 16) + CircleText(text: user.shortName ?? "???", color: .accentColor, circleSize: 52, fontSize: 16, brightness: 0.1) .padding(.trailing, 5) VStack { HStack { diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift index b27b4462..2845bafe 100644 --- a/Meshtastic/Views/Nodes/NodeList.swift +++ b/Meshtastic/Views/Nodes/NodeList.swift @@ -42,16 +42,17 @@ struct NodeList: View { let connected: Bool = (bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.num == node.num) VStack(alignment: .leading) { HStack { - CircleText(text: node.user?.shortName ?? "???", color: .gray, circleSize: 52, fontSize: 16) + CircleText(text: node.user?.shortName ?? "???", color: .accentColor, circleSize: 52, fontSize: 16, brightness: 0.1) .padding(.trailing, 5) VStack(alignment: .leading) { Text(node.user?.longName ?? "Unknown").font(.headline) if connected { HStack(alignment: .bottom) { Image(systemName: "repeat.circle.fill") - .font(.title2) + .font(.title3) .symbolRenderingMode(.hierarchical) - Text("Currently Connected").font(.callout) + Text("Currently Connected").font(.subheadline) + .foregroundColor(.green) } } if node.positions?.count ?? 0 > 0 && (bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.num != node.num) { @@ -71,7 +72,7 @@ struct NodeList: View { } HStack(alignment: .bottom) { Image(systemName: "clock.badge.checkmark.fill") - .font(.headline) + .font(.title3) .symbolRenderingMode(.hierarchical) LastHeardText(lastHeard: node.lastHeard) .font(.subheadline)