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>
126 lines
3.3 KiB
Swift
126 lines
3.3 KiB
Swift
//
|
|
// Messages.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 8/29/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
import CoreData
|
|
import OSLog
|
|
import TipKit
|
|
|
|
struct Messages: View {
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
|
|
@ObservedObject
|
|
var router: Router
|
|
|
|
@Binding
|
|
var unreadChannelMessages: Int
|
|
|
|
@Binding
|
|
var unreadDirectMessages: Int
|
|
|
|
@State var node: NodeInfoEntity?
|
|
@State private var userSelection: UserEntity? // Nothing selected by default.
|
|
@State private var channelSelection: ChannelEntity? // Nothing selected by default.
|
|
|
|
@State private var columnVisibility = NavigationSplitViewVisibility.all
|
|
|
|
var body: some View {
|
|
NavigationSplitView(columnVisibility: $columnVisibility) {
|
|
List(selection: $router.navigationState.messages) {
|
|
NavigationLink(value: MessagesNavigationState.channels()) {
|
|
Label {
|
|
Text("Channels")
|
|
.badge(unreadChannelMessages)
|
|
.font(.title2)
|
|
.padding()
|
|
} icon: {
|
|
Image(systemName: "person.3")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.foregroundColor(.accentColor)
|
|
.font(.title2)
|
|
.padding()
|
|
}
|
|
}
|
|
NavigationLink(value: MessagesNavigationState.directMessages()) {
|
|
Label {
|
|
Text("Direct Messages")
|
|
.badge(unreadDirectMessages)
|
|
.font(.title2)
|
|
.padding()
|
|
} icon: {
|
|
Image(systemName: "person.circle")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.foregroundColor(.accentColor)
|
|
.font(.title2)
|
|
.padding()
|
|
}
|
|
}
|
|
|
|
TipView(MessagesTip(), arrowEdge: .top)
|
|
.tipViewStyle(PersistentTip())
|
|
}
|
|
.navigationTitle("Messages")
|
|
.navigationBarTitleDisplayMode(.large)
|
|
.navigationBarItems(leading: MeshtasticLogo())
|
|
} content: {
|
|
switch router.navigationState.messages {
|
|
case .channels(let channelId, let messageId):
|
|
ChannelList(node: $node, channelSelection: $channelSelection)
|
|
case .directMessages(let userNum, let messageId):
|
|
UserList(node: $node, userSelection: $userSelection)
|
|
case nil:
|
|
Text("Select a conversation type")
|
|
}
|
|
} detail: {
|
|
if let myInfo = node?.myInfo, let channelSelection {
|
|
ChannelMessageList(myInfo: myInfo, channel: channelSelection)
|
|
} else if let userSelection {
|
|
UserMessageList(user: userSelection)
|
|
} else if case .channels = router.navigationState.messages {
|
|
Text("Select a channel")
|
|
} else if case .directMessages = router.navigationState.messages {
|
|
Text("Select a conversation")
|
|
}
|
|
}.onChange(of: router.navigationState) {
|
|
setupNavigationState()
|
|
}
|
|
}
|
|
|
|
private func setupNavigationState() {
|
|
let nodeId = Int64(UserDefaults.preferredPeripheralNum)
|
|
if nodeId > 0 {
|
|
node = getNodeInfo(id: nodeId, context: context)
|
|
}
|
|
|
|
guard let state = router.navigationState.messages else {
|
|
channelSelection = nil
|
|
userSelection = nil
|
|
return
|
|
}
|
|
|
|
switch state {
|
|
case .channels(channelId: let channelId, messageId: _):
|
|
if let channelId {
|
|
channelSelection = node?.myInfo?.channels?.first(where: { channel in
|
|
guard let channel = channel as? ChannelEntity else { return false }
|
|
return channel.id == channelId
|
|
}) as? ChannelEntity
|
|
} else {
|
|
channelSelection = nil
|
|
userSelection = nil
|
|
}
|
|
case .directMessages(userNum: let userNum, messageId: _):
|
|
if let userNum {
|
|
userSelection = getUser(id: userNum, context: context)
|
|
} else {
|
|
channelSelection = nil
|
|
userSelection = nil
|
|
}
|
|
}
|
|
}
|
|
}
|