From ba35e083096e0adb6e8f902cec324a145e8832d4 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 28 May 2024 12:33:49 -0700 Subject: [PATCH] Take off mesh map node limits, reduce max font size for circle text --- .../Extensions/CoreData/PositionEntityExtension.swift | 6 +++--- Meshtastic/Views/Helpers/CircleText.swift | 7 +++---- protobufs | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift index 680b88bc..9eb16a58 100644 --- a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift @@ -14,9 +14,9 @@ extension PositionEntity { static func allPositionsFetchRequest() -> NSFetchRequest { let request: NSFetchRequest = PositionEntity.fetchRequest() - request.fetchLimit = 100 - request.returnsObjectsAsFaults = false - request.includesSubentities = true + //request.fetchLimit = 100 + //request.returnsObjectsAsFaults = false + //request.includesSubentities = true request.returnsDistinctResults = true request.sortDescriptors = [NSSortDescriptor(key: "time", ascending: false)] let positionPredicate = NSPredicate(format: "nodePosition != nil && (nodePosition.user.shortName != nil || nodePosition.user.shortName != '') && latest == true") diff --git a/Meshtastic/Views/Helpers/CircleText.swift b/Meshtastic/Views/Helpers/CircleText.swift index 0a348349..96ca51b2 100644 --- a/Meshtastic/Views/Helpers/CircleText.swift +++ b/Meshtastic/Views/Helpers/CircleText.swift @@ -17,11 +17,10 @@ struct CircleText: View { .fill(color) .frame(width: circleSize, height: circleSize) Text(text) - .textCase(.uppercase) + .frame(width: circleSize * 0.96, height: circleSize * 0.96, alignment: .center) .foregroundColor(color.isLight() ? .black : .white) - .font(.system(size: 8000)) - .minimumScaleFactor(0.001) - .frame(width: circleSize * 0.95, height: circleSize * 0.95, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) + .font(.system(size: 3000)) + .minimumScaleFactor(0.002) } .aspectRatio(1, contentMode: .fit) } diff --git a/protobufs b/protobufs index 5f78a06c..dd7d64cc 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 5f78a06c0fe5d0bd99c2fe206165212bdce89da0 +Subproject commit dd7d64cc038a6365c119ec7508762cc45f405948