From cbd6b2c242d889d922c73c029fe1a14e5e67a09b Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Mon, 13 Jun 2022 14:39:21 -0700
Subject: [PATCH] Size updates for larger short name

---
 MeshtasticApple/Views/Helpers/CircleText.swift       |  2 +-
 MeshtasticApple/Views/Messages/Contacts.swift        |  2 +-
 MeshtasticApple/Views/Messages/UserMessageList.swift |  4 ++--
 MeshtasticApple/Views/Settings/PowerConfig.swift     | 12 +++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/MeshtasticApple/Views/Helpers/CircleText.swift b/MeshtasticApple/Views/Helpers/CircleText.swift
index 4ada7061..88a39f4c 100644
--- a/MeshtasticApple/Views/Helpers/CircleText.swift
+++ b/MeshtasticApple/Views/Helpers/CircleText.swift
@@ -8,7 +8,7 @@ import SwiftUI
 struct CircleText: View {
     var text: String
     var color: Color
-	var circleSize: CGFloat? = 50
+	var circleSize: CGFloat? = 60
 	var fontSize: CGFloat? = 22
 
     var body: some View {
diff --git a/MeshtasticApple/Views/Messages/Contacts.swift b/MeshtasticApple/Views/Messages/Contacts.swift
index 007dd6ad..f4f2b0e7 100644
--- a/MeshtasticApple/Views/Messages/Contacts.swift
+++ b/MeshtasticApple/Views/Messages/Contacts.swift
@@ -100,7 +100,7 @@ struct Contacts: View {
 
 							VStack {
 
-								CircleText(text: user.shortName ?? "???", color: Color.blue)
+								CircleText(text: user.shortName ?? "????", color: Color.blue)
 							}
 							.padding(.trailing)
 
diff --git a/MeshtasticApple/Views/Messages/UserMessageList.swift b/MeshtasticApple/Views/Messages/UserMessageList.swift
index f651f8cf..d410c43f 100644
--- a/MeshtasticApple/Views/Messages/UserMessageList.swift
+++ b/MeshtasticApple/Views/Messages/UserMessageList.swift
@@ -74,7 +74,7 @@ struct UserMessageList: View {
 										if currentUser { Spacer(minLength:50) }
 										
 										if !currentUser {
-											CircleText(text: message.fromUser?.shortName ?? "????", color: currentUser ? .accentColor : Color(.darkGray), circleSize: 36, fontSize: 16).padding(.all, 5)
+											CircleText(text: message.fromUser?.shortName ?? "????", color: currentUser ? .accentColor : Color(.darkGray), circleSize: 46, fontSize: 16).padding(.all, 5)
 										}
 										
 										VStack(alignment: currentUser ? .trailing : .leading) {
@@ -444,7 +444,7 @@ struct UserMessageList: View {
 
 				HStack {
 
-					CircleText(text: user.shortName ?? "???", color: .blue, circleSize: 42, fontSize: 20).fixedSize()
+					CircleText(text: user.shortName ?? "???", color: .blue, circleSize: 42, fontSize: 16).fixedSize()
 					Text(user.longName ?? "Unknown").font(.headline).fixedSize()
 				}
 			}
diff --git a/MeshtasticApple/Views/Settings/PowerConfig.swift b/MeshtasticApple/Views/Settings/PowerConfig.swift
index d47461a6..809eb091 100644
--- a/MeshtasticApple/Views/Settings/PowerConfig.swift
+++ b/MeshtasticApple/Views/Settings/PowerConfig.swift
@@ -21,7 +21,13 @@ struct PowerConfig: View {
 		VStack {
 
 			Form {
-
+				
+				Section(header: Text("Warning")) {
+				
+					Text("These power settings are designed for and and are only useful in very specific mostly solar use cases and should not be enabled by the majority of users, expecially if you are using your device as a messaging handset paired with a phone.")
+						.font(.callout)
+						.listRowSeparator(.visible)
+				}
 				Section(header: Text("States")) {
 					
 					Toggle(isOn: $isPowerSaving) {
@@ -30,7 +36,7 @@ struct PowerConfig: View {
 					}
 					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
 					.disabled(isAlwaysPowered)
-					Text("If set, we are powered from a low-current source (i.e. solar), so even if it looks like we have power flowing in we should try to minimize power consumption as much as possible.")
+					Text("If set, we are powered from a low-current source (i.e. solar) and do not intend on using a client to connect via BLE, WiFi or Serial.  This setting is assumed and unnessary if you have turned on Router mode.")
 						.font(.caption)
 						.listRowSeparator(.visible)
 					
@@ -40,7 +46,7 @@ struct PowerConfig: View {
 					}
 					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
 					.disabled(isPowerSaving)
-					Text("Circumvents the logic block for determining whether the device is powered or not. Useful for devices with finicky ADC issues on the battery sense pins, or no battery pin at all.")
+					Text("Circumvents the logic block for determining whether the device is powered or not. Useful for devices with finicky ADC issues on the battery sense pins, or no battery pin at all. This mode increases battery use substantially")
 						.font(.caption)
 						.listRowSeparator(.visible)