From c25a60942d702294515eeb1ceefad62bdbe35c92 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 2 Sep 2023 09:23:20 -0700 Subject: [PATCH] Font scaling for Short name circle text --- Meshtastic/Views/Helpers/CircleText.swift | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Meshtastic/Views/Helpers/CircleText.swift b/Meshtastic/Views/Helpers/CircleText.swift index dcfd7118..66cbb746 100644 --- a/Meshtastic/Views/Helpers/CircleText.swift +++ b/Meshtastic/Views/Helpers/CircleText.swift @@ -8,23 +8,22 @@ import SwiftUI struct CircleText: View { var text: String var color: Color - var circleSize: CGFloat? = 45 + var circleSize: CGFloat = 45 var textColor: Color? = .white var body: some View { - let font = Font.system(size: (text.count == 1) ? ((circleSize ?? 45) * 0.75) : (text.count == 2 ? ((circleSize ?? 45) * 0.52) : (text.count == 3 ? ((circleSize ?? 45) * 0.42) : ((circleSize ?? 45) * 0.32)))) - ZStack { Circle() .fill(color) .frame(width: circleSize, height: circleSize) Text(text) .textCase(.uppercase) - .font(font) .foregroundColor(textColor) - .fixedSize() - .frame(width: circleSize, height: circleSize, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) + .font(.system(size: 500)) + .minimumScaleFactor(0.001) + .frame(width: circleSize * 0.90, + height: circleSize * 0.90, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) } } } @@ -32,6 +31,9 @@ struct CircleText: View { struct CircleText_Previews: PreviewProvider { static var previews: some View { CircleText(text: "MOMO", color: Color.accentColor, circleSize: 80) + CircleText(text: "WWWW", color: Color.accentColor, circleSize: 80) + CircleText(text: "LCP", color: Color.accentColor, circleSize: 80) + CircleText(text: "8", color: Color.accentColor, circleSize: 80) .previewLayout(.fixed(width: 300, height: 100)) } }