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>
100 lines
3.4 KiB
Swift
100 lines
3.4 KiB
Swift
//
|
|
// BatteryGauge.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 9/28/22.
|
|
//
|
|
|
|
import SwiftUI
|
|
import Charts
|
|
|
|
struct BatteryGauge: View {
|
|
|
|
@ObservedObject var node: NodeInfoEntity
|
|
private let minValue = 0.0
|
|
private let maxValue = 100.00
|
|
|
|
var body: some View {
|
|
|
|
let deviceMetrics = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0"))
|
|
let mostRecent = deviceMetrics?.lastObject as? TelemetryEntity
|
|
// For VoiceOver purposes, detect when device is plugged in (battery > 100%)
|
|
let isPluggedIn = (mostRecent?.batteryLevel ?? 0) > 100
|
|
// Use a capped battery level for UI display
|
|
let batteryLevel = Double(min(100, mostRecent?.batteryLevel ?? 0))
|
|
|
|
VStack {
|
|
if isPluggedIn {
|
|
// Use a completely standalone view for the plugged in state
|
|
// to avoid any VoiceOver confusion
|
|
PluggedInIndicator()
|
|
} else {
|
|
let gradient = Gradient(colors: [.red, .orange, .green])
|
|
Gauge(value: batteryLevel, in: minValue...maxValue) {
|
|
// Accessibility for battery gauge
|
|
if batteryLevel >= 0.0 && batteryLevel < 10 {
|
|
Label("Battery Level %", systemImage: "battery.0")
|
|
} else if batteryLevel >= 10.0 && batteryLevel < 25.00 {
|
|
Label("Battery Level %", systemImage: "battery.25")
|
|
} else if batteryLevel >= 25.0 && batteryLevel < 50.00 {
|
|
Label("Battery Level %", systemImage: "battery.50")
|
|
} else if batteryLevel >= 50.0 && batteryLevel < 75.00 {
|
|
Label("Battery Level %", systemImage: "battery.75")
|
|
} else if batteryLevel >= 75.0 && batteryLevel <= 99.00 {
|
|
Label("Battery Level %", systemImage: "battery.100")
|
|
} else {
|
|
Label("Battery Level %", systemImage: "battery.100.bolt")
|
|
}
|
|
} currentValueLabel: {
|
|
if batteryLevel == 0.0 {
|
|
Text("< 1%")
|
|
} else {
|
|
Text(Int(batteryLevel), format: .percent)
|
|
}
|
|
}
|
|
.accessibilityLabel(NSLocalizedString("Battery Level", comment: "VoiceOver label for battery gauge"))
|
|
.accessibilityValue(String(format: NSLocalizedString("Battery Level %d", comment: "VoiceOver value for battery level"), Int(batteryLevel)))
|
|
.tint(gradient)
|
|
.gaugeStyle(.accessoryCircular)
|
|
}
|
|
if mostRecent?.voltage ?? 0 > 0 {
|
|
Text(String(format: "%.2f", mostRecent?.voltage ?? 0) + " V")
|
|
.font(.callout)
|
|
.foregroundColor(.gray)
|
|
.fixedSize()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A dedicated view for showing a device is plugged in
|
|
/// With proper VoiceOver support that matches the visual indication
|
|
struct PluggedInIndicator: View {
|
|
var body: some View {
|
|
// This view is isolated from any battery measurement
|
|
// to ensure VoiceOver doesn't pick up any percentages
|
|
Image(systemName: "powerplug")
|
|
.font(.largeTitle)
|
|
.foregroundColor(.accentColor)
|
|
.symbolRenderingMode(.hierarchical)
|
|
// Override the accessibility to ensure correct VoiceOver announcement
|
|
.accessibilityElement(children: .ignore)
|
|
.accessibilityLabel("Battery Level".localized)
|
|
.accessibilityValue("Plugged in".localized)
|
|
}
|
|
}
|
|
|
|
struct BatteryGauge_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
VStack {
|
|
// BatteryGauge(batteryLevel: 0.0)
|
|
// BatteryGauge(batteryLevel: 9.0)
|
|
// BatteryGauge(batteryLevel: 24.0)
|
|
// BatteryGauge(batteryLevel: 49.0)
|
|
// BatteryGauge(batteryLevel: 74.0)
|
|
// BatteryGauge(batteryLevel: 99.0)
|
|
// BatteryGauge(batteryLevel: 100.0)
|
|
// BatteryGauge(batteryLevel: 111.0)
|
|
}
|
|
}
|
|
}
|