From d49daa0f5726ddc6663775363d8e4dfbcc258a14 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 13 Jun 2022 18:54:16 -0700 Subject: [PATCH] Update circle text to support 4 letter codes --- MeshtasticApple/Views/Helpers/CircleText.swift | 2 +- MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MeshtasticApple/Views/Helpers/CircleText.swift b/MeshtasticApple/Views/Helpers/CircleText.swift index 88a39f4c..88bb78f4 100644 --- a/MeshtasticApple/Views/Helpers/CircleText.swift +++ b/MeshtasticApple/Views/Helpers/CircleText.swift @@ -9,7 +9,7 @@ struct CircleText: View { var text: String var color: Color var circleSize: CGFloat? = 60 - var fontSize: CGFloat? = 22 + var fontSize: CGFloat? = 20 var body: some View { diff --git a/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift b/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift index d9744158..4500052a 100644 --- a/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift +++ b/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift @@ -25,7 +25,7 @@ class PositionAnnotation: NSObject, MKAnnotation { class PositionAnnotationView: MKAnnotationView { - private let annotationFrame = CGRect(x: 0, y: 0, width: 32, height: 32) + private let annotationFrame = CGRect(x: 0, y: 0, width: 40, height: 40cen) private let label: UILabel override init(annotation: MKAnnotation?, reuseIdentifier: String?) { @@ -52,7 +52,7 @@ class PositionAnnotationView: MKAnnotationView { override func draw(_ rect: CGRect) { guard let context = UIGraphicsGetCurrentContext() else { return } - let circleRect = CGRect(x: 1, y: 1, width: 30, height: 30) + let circleRect = CGRect(x: 1, y: 1, width: 38, height: 38) context.setFillColor(CGColor(red: 0, green: 0.5, blue: 1.0, alpha: 1.0))