mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Update messaging list separator insets
* Dont show unread messages or notifications for emoji reactions matching iMessage.
* Restore ble state method (#1416)
* Restore BLE State
* Log privacy
* AccessoryManager to handle restored connection
* Comment task out
* Update restore state function based on conversation with jake
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Two Column Node List (#1425)
* Restore BLE State
* Log privacy
* AccessoryManager to handle restored connection
* Comment task out
* Switch the node list to a two column layout
* Keep asian translations of channel details string
* Update restore state function based on conversation with jake
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* always show node list search bar
* Update auto correct modifier
* Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover
* Work in progress.
* Update detents
* Gate the discovery process while restoring
* Use geometry reader to size weather tiles on node details
* Update BLE Transport
* Update location weather condistion styles
* Log privacy in didReceive
* Remove extra dividers from admin key config, fix onboarding typo
* Bump minimum catalyst target
* Bump mac target version
* Use @FetchRequest for UserList to try and use less memory on ios 17
* Revert change to @fetchrequest
* Stab in the dark for Devices crash
* Updated UserList (back?) to @FetchRequest
* Set mac minimum to 15
* Nil out continuation after use
* Use @FetchRequest for the node list to stop crashes on iOS 17
* Handle failed connections during restoration
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update protos
* Update protos
* Remove stale keys
* Serbian translations update (#1422)
* Log privacy
* Add Serbian translations
---------
Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com>
* Clarify public key sub-text in security settings (#1412)
* Clarify public key sub-text in settings
* Trigger lint
* freq slot num pad (#1410)
* kill keyboard toolbar on lora config
* delete extranious scrollDismissesKeyboard
* Properly set catalyst target
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Views/Settings/Config/SecurityConfig.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Enums/DeviceEnums.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Make current location nilable, remove log spam
* clean up toUser logic
* Fix telemetry entity not added in nodeInfoPacket
* fix typo: powerMetrics.hasChXCurrent mismatch
* Duplicate decoding of telemetry.current removed
* Clean up mesh map fetch request and distance filter logic
* Revert attempt to fix message logic
* Bump datadog version
* Missing message fix, attempt #2 (#1431)
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
* Retry fewer times for longer
* Revert "Missing message fix, attempt #2 (#1431)" (#1432)
This reverts commit a96d318adb.
* Make retry 2 seconds
* Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database
* Add clear notifications function
* Link from channel messages to node info
* Link to node details
* Discovery on retry fix
* Discovery on retry fix fix
* Add contact to device node db if you get an encrypted send faild routing error
* Seperate channel message view into two views for better performance.
* Refactor User Message List
* Update device hardware
Add liquid glass to config save button
* Save button cleanup
* Update button structure on users view
* Move encrypted send logic out of the router. Update protos
* Restore node long- and short- names (#1442)
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Revert routing error
* Toggle for enabling device telemetry broadcast enable
* Update
* Enhancements for interval dropdowns (#1445)
* Cleanup
* Fix core data version
* Add never to update interval
* Device telemetry Enabled Boolean (#1446)
* Update core data and interval picker
* Move formatter
* Rework to nest options under enabled
* Clearer names
* Safer devicehardware api call, remove node history filter from mesh map
* Fix build
* Simplify mesh map filter
* Remove stale translation keys
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com>
Co-authored-by: Spencer Smith <dontaskspencer@gmail.com>
Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
136 lines
3.9 KiB
Swift
136 lines
3.9 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
|
|
@Environment(\.colorScheme) private var colorScheme
|
|
@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()) {
|
|
Spacer()
|
|
Label {
|
|
Text("Channels")
|
|
.badge(unreadChannelMessages)
|
|
.font(.title2)
|
|
.padding()
|
|
} icon: {
|
|
Image(systemName: "person.2")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.foregroundColor(.accentColor)
|
|
.font(.title2)
|
|
.padding()
|
|
}
|
|
}
|
|
.alignmentGuide(.listRowSeparatorLeading) {
|
|
$0[.leading]
|
|
}
|
|
NavigationLink(value: MessagesNavigationState.directMessages()) {
|
|
Spacer()
|
|
Label {
|
|
Text("Direct Messages")
|
|
.badge(unreadDirectMessages)
|
|
.font(.title2)
|
|
.padding()
|
|
} icon: {
|
|
Image(systemName: "person")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.foregroundColor(.accentColor)
|
|
.font(.title2)
|
|
.padding()
|
|
}
|
|
}
|
|
.alignmentGuide(.listRowSeparatorLeading) {
|
|
$0[.leading]
|
|
}
|
|
Spacer()
|
|
TipView(MessagesTip(), arrowEdge: .top)
|
|
.tipViewStyle(PersistentTip())
|
|
.listRowSeparator(.hidden)
|
|
Spacer()
|
|
.listRowSeparator(.hidden)
|
|
}
|
|
.listStyle(.plain)
|
|
.navigationTitle("Messages")
|
|
.navigationBarTitleDisplayMode(.large)
|
|
.navigationBarItems(leading: MeshtasticLogo())
|
|
} content: {
|
|
switch router.navigationState.messages {
|
|
case .channels(let channelId, let messageId):
|
|
ChannelList(node: $node, channelSelection: $channelSelection)
|
|
// Removed navigationTitle and navigationBarTitleDisplayMode here.
|
|
// ChannelList.swift now handles this within its own NavigationStack.
|
|
case .directMessages(let userNum, let messageId):
|
|
UserList(node: $node, userSelection: $userSelection)
|
|
// Removed navigationTitle here. UserList will handle this.
|
|
case nil:
|
|
Text("Select a conversation type")
|
|
}
|
|
} detail: {
|
|
if let myInfo = node?.myInfo, let channelSelection {
|
|
ChannelMessageList(myInfo: myInfo, channel: channelSelection)
|
|
// The toolbar is now defined inside ChannelMessageList.swift
|
|
} 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
|
|
}
|
|
}
|
|
}
|
|
}
|