meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Take off mesh map node limits, reduce max font size for circle text

Browse source
This commit is contained in:
Garth Vander Houwen 2024-05-28 12:33:49 -07:00
parent 0a14d74192
commit ba35e08309
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
View file

@ -14,9 +14,9 @@ extension PositionEntity {
static func allPositionsFetchRequest() -> NSFetchRequest<PositionEntity> {
let request: NSFetchRequest<PositionEntity> = 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")

7
Meshtastic/Views/Helpers/CircleText.swift
View file

@ -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)
}

2
protobufs

@ -1 +1 @@
Subproject commit 5f78a06c0fe5d0bd99c2fe206165212bdce89da0
Subproject commit dd7d64cc038a6365c119ec7508762cc45f405948