mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
309 lines
10 KiB
Swift
309 lines
10 KiB
Swift
//
|
|
// WidgetsLiveActivity.swift
|
|
// Widgets
|
|
//
|
|
// Created by Garth Vander Houwen on 2/28/23.
|
|
//
|
|
#if canImport(ActivityKit)
|
|
import ActivityKit
|
|
import WidgetKit
|
|
import SwiftUI
|
|
|
|
struct WidgetsLiveActivity: Widget {
|
|
var body: some WidgetConfiguration {
|
|
|
|
ActivityConfiguration(for: MeshActivityAttributes.self) { context in
|
|
LiveActivityView(nodeName: context.attributes.name,
|
|
uptimeSeconds: 0, // context.attributes.uptimeSeconds,
|
|
channelUtilization: context.state.channelUtilization,
|
|
airtime: context.state.airtime,
|
|
sentPackets: context.state.sentPackets,
|
|
receivedPackets: context.state.receivedPackets,
|
|
badReceivedPackets: context.state.badReceivedPackets,
|
|
dupeReceivedPackets: context.state.dupeReceivedPackets,
|
|
packetsSentRelay: context.state.packetsSentRelay,
|
|
packetsCanceledRelay: context.state.packetsCanceledRelay,
|
|
nodesOnline: context.state.nodesOnline,
|
|
totalNodes: context.state.totalNodes,
|
|
timerRange: context.state.timerRange)
|
|
.widgetURL(URL(string: "meshtastic:///connect"))
|
|
|
|
} dynamicIsland: { context in
|
|
DynamicIsland {
|
|
DynamicIslandExpandedRegion(.leading) {
|
|
if context.state.totalNodes > 0 {
|
|
Text(" \(context.state.nodesOnline) online")
|
|
.font(.callout)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
} else {
|
|
Text(" ")
|
|
.font(.callout)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
}
|
|
Text("Ch. Util: \(context.state.channelUtilization?.formatted(.number.precision(.fractionLength(2))) ?? Constants.nilValueIndicator)%")
|
|
.font(.caption2)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
Text("Airtime: \(context.state.airtime?.formatted(.number.precision(.fractionLength(2))) ?? Constants.nilValueIndicator)%")
|
|
.font(.caption2)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
Text("Sent: \(context.state.sentPackets)")
|
|
.font(.caption2)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
Text("Received: \(context.state.receivedPackets)")
|
|
.font(.caption2)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
}
|
|
DynamicIslandExpandedRegion(.center) {
|
|
TimerView(timerRange: context.state.timerRange)
|
|
.tint(Color("LightIndigo"))
|
|
}
|
|
DynamicIslandExpandedRegion(.trailing, priority: 1) {
|
|
Spacer()
|
|
Text("Bad: \(context.state.badReceivedPackets)")
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
Text("Dupe: \(context.state.dupeReceivedPackets)")
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
Text("Relayed: \(context.state.packetsSentRelay)")
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
Text("Relay Cancel: \(context.state.packetsCanceledRelay)")
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
.fixedSize()
|
|
}
|
|
DynamicIslandExpandedRegion(.bottom) {
|
|
Text("Last Heard: \(Date().formatted())")
|
|
.font(.caption2)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.tint)
|
|
.fixedSize()
|
|
}
|
|
|
|
} compactLeading: {
|
|
Image("m-logo-black")
|
|
.resizable()
|
|
.frame(width: 25)
|
|
.padding(4)
|
|
.background(.green.gradient, in: ContainerRelativeShape())
|
|
} compactTrailing: {
|
|
Text(timerInterval: context.state.timerRange, countsDown: true)
|
|
.monospacedDigit()
|
|
.foregroundColor(Color("LightIndigo"))
|
|
.frame(width: 40)
|
|
} minimal: {
|
|
Image("m-logo-black")
|
|
.resizable()
|
|
.frame(width: 24.0)
|
|
.padding(4)
|
|
.background(.green.gradient, in: ContainerRelativeShape())
|
|
}
|
|
.contentMargins(.trailing, 32, for: .expanded)
|
|
.contentMargins([.leading, .top, .bottom], 6, for: .compactLeading)
|
|
.contentMargins(.all, 6, for: .minimal)
|
|
.widgetURL(URL(string: "meshtastic:///connect"))
|
|
}
|
|
}
|
|
}
|
|
|
|
struct WidgetsLiveActivity_Previews: PreviewProvider {
|
|
static let attributes = MeshActivityAttributes(nodeNum: 123456789, name: "RAK Compact Rotary Handset Gray 8E6G")
|
|
static let state = MeshActivityAttributes.ContentState(uptimeSeconds: 600, channelUtilization: 1.2, airtime: 3.5, sentPackets: 12587, receivedPackets: 12555, badReceivedPackets: 800, dupeReceivedPackets: 100, packetsSentRelay: 250, packetsCanceledRelay: 372, nodesOnline: 99, totalNodes: 100, timerRange: Date.now...Date(timeIntervalSinceNow: 300))
|
|
|
|
static var previews: some View {
|
|
attributes
|
|
.previewContext(state, viewKind: .dynamicIsland(.compact))
|
|
.previewDisplayName("Compact")
|
|
attributes
|
|
.previewContext(state, viewKind: .dynamicIsland(.minimal))
|
|
.previewDisplayName("Minimal")
|
|
attributes
|
|
.previewContext(state, viewKind: .dynamicIsland(.expanded))
|
|
.previewDisplayName("Expanded")
|
|
attributes
|
|
.previewContext(state, viewKind: .content)
|
|
.previewDisplayName("Notification")
|
|
}
|
|
}
|
|
struct LiveActivityView: View {
|
|
@Environment(\.colorScheme) private var colorScheme
|
|
@Environment(\.isLuminanceReduced) var isLuminanceReduced
|
|
|
|
var nodeName: String
|
|
var uptimeSeconds: UInt32?
|
|
var channelUtilization: Float?
|
|
var airtime: Float?
|
|
var sentPackets: UInt32
|
|
var receivedPackets: UInt32
|
|
var badReceivedPackets: UInt32
|
|
var dupeReceivedPackets: UInt32
|
|
var packetsSentRelay: UInt32
|
|
var packetsCanceledRelay: UInt32
|
|
var nodesOnline: UInt32
|
|
var totalNodes: UInt32
|
|
var timerRange: ClosedRange<Date>
|
|
|
|
var body: some View {
|
|
HStack {
|
|
Spacer()
|
|
Image(colorScheme == .light ? "m-logo-black" : "m-logo-white")
|
|
.resizable()
|
|
.clipShape(ContainerRelativeShape())
|
|
.opacity(isLuminanceReduced ? 0.5 : 1.0)
|
|
.aspectRatio(contentMode: .fit)
|
|
.frame(minWidth: 25, idealWidth: 45, maxWidth: 55)
|
|
Spacer()
|
|
NodeInfoView(isLuminanceReduced: _isLuminanceReduced, nodeName: nodeName, uptimeSeconds: uptimeSeconds, channelUtilization: channelUtilization, airtime: airtime, sentPackets: sentPackets, receivedPackets: receivedPackets, badReceivedPackets: badReceivedPackets,
|
|
dupeReceivedPackets: dupeReceivedPackets, packetsSentRelay: packetsSentRelay, packetsCanceledRelay: packetsCanceledRelay, nodesOnline: nodesOnline, timerRange: timerRange)
|
|
Spacer()
|
|
}
|
|
.tint(.primary)
|
|
.padding([.leading, .top, .bottom])
|
|
.padding(.trailing, 25)
|
|
.activityBackgroundTint(colorScheme == .light ? Color("LiveActivityBackground") : Color("AccentColorDimmed"))
|
|
.activitySystemActionForegroundColor(.primary)
|
|
}
|
|
}
|
|
|
|
struct NodeInfoView: View {
|
|
@Environment(\.isLuminanceReduced) var isLuminanceReduced
|
|
|
|
var nodeName: String
|
|
var uptimeSeconds: UInt32?
|
|
var channelUtilization: Float?
|
|
var airtime: Float?
|
|
var sentPackets: UInt32
|
|
var receivedPackets: UInt32
|
|
var badReceivedPackets: UInt32
|
|
var dupeReceivedPackets: UInt32
|
|
var packetsSentRelay: UInt32
|
|
var packetsCanceledRelay: UInt32
|
|
var nodesOnline: UInt32
|
|
var timerRange: ClosedRange<Date>
|
|
|
|
var body: some View {
|
|
let errorRate = (Double(badReceivedPackets) / Double(receivedPackets)) * 100
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
Text(nodeName)
|
|
.font(nodeName.count > 14 ? .callout : .title3)
|
|
.fontWeight(.semibold)
|
|
.foregroundStyle(.tint)
|
|
// Text("\(channelUtilization.map { String(format: "Ch. Util: %.2f", $0 ) } ?? "--")% \(airtime.map { String(format: "Airtime: %.2f", $0) } ?? "--")%")
|
|
Text("Ch. Util: \(channelUtilization?.formatted(.number.precision(.fractionLength(2))) ?? Constants.nilValueIndicator)%")
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.8 : 1.0)
|
|
.fixedSize()
|
|
Text("Packets: Sent \(sentPackets) Rec. \(receivedPackets)")
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.8 : 1.0)
|
|
.fixedSize()
|
|
Text("Bad: \(badReceivedPackets) Error Rate: \(errorRate.formatted(.number.precision(.fractionLength(2))))%")
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.8 : 1.0)
|
|
.fixedSize()
|
|
|
|
Text("Connected: \(nodesOnline) nodes online")
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.8 : 1.0)
|
|
.fixedSize()
|
|
|
|
let now = Date()
|
|
Text("Last Heard: \(now.formatted())")
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.8 : 1.0)
|
|
.fixedSize()
|
|
HStack {
|
|
|
|
if timerRange.upperBound >= now {
|
|
Text("Next Update:")
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.8 : 1.0)
|
|
.fixedSize()
|
|
Text(timerInterval: timerRange, countsDown: true)
|
|
.monospacedDigit()
|
|
.multilineTextAlignment(.leading)
|
|
.font(.caption)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.tint)
|
|
} else {
|
|
Text("Not Connected")
|
|
.multilineTextAlignment(.leading)
|
|
.font(.caption)
|
|
.fontWeight(.semibold)
|
|
.foregroundStyle(.tint)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
struct TimerView: View {
|
|
@Environment(\.isLuminanceReduced) var isLuminanceReduced
|
|
|
|
var timerRange: ClosedRange<Date>
|
|
|
|
var body: some View {
|
|
VStack(alignment: .center) {
|
|
Text("UPDATE IN")
|
|
.font(.caption2)
|
|
.allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/)
|
|
.fontWeight(.medium)
|
|
.foregroundStyle(.secondary)
|
|
.opacity(isLuminanceReduced ? 0.5 : 1.0)
|
|
Text(timerInterval: timerRange, countsDown: true)
|
|
.monospacedDigit()
|
|
.multilineTextAlignment(.center)
|
|
.frame(width: 80)
|
|
.font(.callout)
|
|
.fontWeight(.semibold)
|
|
.foregroundStyle(.tint)
|
|
Image(systemName: "timer")
|
|
.symbolRenderingMode(.multicolor)
|
|
.resizable()
|
|
.foregroundStyle(.secondary)
|
|
.frame(width: 30, height: 30)
|
|
.opacity(isLuminanceReduced ? 0.5 : 1.0)
|
|
.offset(y: -5)
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ExpandedTrailingView: View {
|
|
var nodeName: String
|
|
var connected: Bool
|
|
var channelUtilization: Float
|
|
var airtime: Float
|
|
var batteryLevel: UInt32
|
|
var timerInterval: ClosedRange<Date>
|
|
|
|
var body: some View {
|
|
HStack(alignment: .lastTextBaseline) {
|
|
Spacer()
|
|
TimerView(timerRange: timerInterval)
|
|
}
|
|
.tint(Color("LightIndigo"))
|
|
}
|
|
}
|
|
#endif
|