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

Position details sheet

Browse source
This commit is contained in:
Garth Vander Houwen 2023-11-08 18:41:47 -08:00
parent 913c3932f4
commit 5551f6d5cf
2 changed files with 25 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meshtastic/Views/Nodes/Helpers/PositionPopover.swift
View file

@ -14,9 +14,9 @@ struct PositionPopover: View {
var body: some View {
VStack (alignment: .leading) {
HStack {
CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(UIColor(hex: UInt32(position.nodePosition?.user?.num ?? 0))))
CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(UIColor(hex: UInt32(position.nodePosition?.user?.num ?? 0))), circleSize: 80)
Text(position.nodePosition?.user?.longName ?? "Unknown")
.font(.title3)
.font(.largeTitle)
let degrees = Angle.degrees(Double(position.heading))
}
Divider()
@ -121,6 +121,8 @@ struct PositionPopover: View {
}
}
}
}
}
.presentationDetents([.fraction(0.4), .medium])
.presentationDragIndicator(.visible)
}
}

54
Meshtastic/Views/Nodes/MeshMap.swift
View file

@ -20,7 +20,6 @@ struct MeshMap: View {
@StateObject var appState = AppState.shared
/// Parameters
@State var showUserLocation: Bool = true
//@State var positions: [PositionEntity] = []
/// Map State User Defaults
@AppStorage("meshMapShowNodeHistory") private var showNodeHistory = false
@AppStorage("meshMapShowRouteLines") private var showRouteLines = false
@ -42,23 +41,16 @@ struct MeshMap: View {
var delay: Double = 0
@State private var scale: CGFloat = 0.5
let fromDate: NSDate = Calendar.current.date(byAdding: .month, value: -1, to: Date())! as NSDate
@FetchRequest(sortDescriptors: [NSSortDescriptor(key: "time", ascending: true)],
predicate: NSPredicate(format: "time >= %@ && nodePosition != nil && latest == true", Calendar.current.date(byAdding: .day, value: -30, to: Date())! as NSDate), animation: .none)
private var positions: FetchedResults<PositionEntity>
@FetchRequest(sortDescriptors: [NSSortDescriptor(key: "name", ascending: false)],
predicate: NSPredicate(
format: "expire == nil || expire >= %@", Date() as NSDate
), animation: .none)
private var waypoints: FetchedResults<WaypointEntity>
@State var waypointCoordinate: WaypointCoordinate?
@State var selectedTracking: UserTrackingModes = .none
@State var isPresentingInfoSheet: Bool = false
@State private var customMapOverlay: MapViewSwiftUI.CustomMapOverlay? = MapViewSwiftUI.CustomMapOverlay(
mapName: "offlinemap",
tileType: "png",
canReplaceMapContent: true
)
var body: some View {
NavigationStack {
ZStack {
@ -70,7 +62,7 @@ struct MeshMap: View {
Annotation(waypoint.name ?? "?", coordinate: waypoint.coordinate) {
ZStack {
CircleText(text: String(UnicodeScalar(Int(waypoint.icon)) ?? "📍"), color: Color.orange, circleSize: 35)
.onTapGesture(coordinateSpace: .named("nodemap")) { location in
.onTapGesture(coordinateSpace: .named("meshmap")) { location in
print("Tapped at \(location)")
let pinLocation = reader.convert(location, from: .local)
selectedWaypoint = (selectedWaypoint == waypoint ? nil : waypoint)
@ -90,45 +82,39 @@ struct MeshMap: View {
.foregroundStyle(Color(nodeColor.lighter()).opacity(0.3))
.scaleEffect(scale)
.animation(
Animation.easeInOut(duration: 1.0)
Animation.easeInOut(duration: 0.6)
.repeatForever().delay(delay), value: scale
)
.onAppear {
self.scale = 1
}
.frame(width: 60, height: 60)
}
CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(nodeColor), circleSize: 40)
}
.onTapGesture(coordinateSpace: .named("meshmap")) { location in
print("Tapped at \(location)")
let pinLocation = reader.convert(location, from: .local)
selectedPosition = (selectedPosition == position ? nil : position)
}
}
}
/// Node Color from node.num
//let nodeColor = UIColor(hex: UInt32(node.num))
/// Route Lines
// if showRouteLines {
// if showRouteLines {
// let gradient = LinearGradient(
// colors: [Color(nodeColor.lighter().lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
// startPoint: .leading, endPoint: .trailing
// )
// let dashed = StrokeStyle(
// lineWidth: 3,
// lineCap: .round, lineJoin: .round, dash: [10, 10]
// )
// MapPolyline(coordinates: lineCoords)
// .stroke(gradient, style: dashed)
// }
// }
}
}
}
.ignoresSafeArea(.all, edges: [.top, .leading, .trailing])
.frame(maxHeight: .infinity)
.sheet(item: $waypointCoordinate, content: { wpc in
WaypointFormView(coordinate: wpc)
.presentationDetents([.medium, .large])
.presentationDragIndicator(.automatic)
})
// .popover(item: $selectedPosition) { selection in
// PositionPopover(position: selection)
// .padding()
// .opacity(0.8)
// .presentationCompactAdaptation(.sheet)
// }
.sheet(item: $selectedPosition) { selection in
PositionPopover(position: selection)
.padding()
}
}
.navigationTitle("Mesh Map")
.navigationBarItems(leading: