mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Delete Messages fix * Bump version to 2.7.9 * Bump widgets version * TAK Server channel index picker Create a settings picker for the TAK Server's channel index. This allows users to specify TAK traffic to use the non-primary channel to help reduce channel congestion. * Changed capitalization from 'environment' to 'Environment' for section header. (#1591) * Add Danish (da) translations — resolves merge conflicts from PR #1609 (#1612) * Initial plan * Add Danish (da) translations from PR #1609 Resolves merge conflicts from PR #1609 by adding Danish translations to the Localizable.xcstrings file. The PR adds Danish translation strings throughout the app while preserving all existing translations for other languages. Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Migrate test project to Swift Testing and add connect view and router tests (#1643) * Migrate to Swift Testing and add connect view tests - Convert RouterTests.swift from XCTest to Swift Testing (@Suite, @Test, #expect, #require) - Create ConnectViewTests.swift with tests for connect view child types: - Device struct (creation, signal strength, RSSI, description, codable) - TransportType enum (cases, raw values, codable) - ConnectionState enum (equality, codable) - BLESignalStrength enum (raw values, init) - TransportStatus enum (equality) - NavigationState (defaults, tabs, sub-states) - InvalidVersion view (creation with versions) - ConnectedDevice view (connected/disconnected/MQTT states) - CircleText view (default/custom sizes, emoji) - BatteryCompact view (levels, nil, charging, plugged in) - SignalStrengthIndicator view (dimensions, strength levels) - Update Xcode project to include new test file Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/d7bb7a89-2105-4fcb-96bc-7ec794467c74 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Fix signal strength test boundary conditions The getSignalStrength() method uses NSNumber.compare(.orderedDescending), which is a strict greater-than check. Fix the boundary test cases: - RSSI -65 is .normal (not .strong), since -65 is not > -65 - RSSI -85 is .weak (not .normal), since -85 is not > -85 - Add -64 → .strong and -84 → .normal as adjacent boundary tests Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/4fcbc01e-cbea-4d11-b2c0-e923c6730d69 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Improve and complete router tests with comprehensive coverage Added tests for: - Custom initial state - Invalid scheme / unknown path handling (state unchanged) - navigateToNodeDetail public method - Messages edge cases: channelId only, userNum only, messageId only, non-numeric params - Nodes with non-numeric nodenum - Map with both nodenum+waypointId (nodeId priority), non-numeric params - Parameterized settings test covering all 31 SettingsNavigationState cases - State transitions: consecutive routes, invalid scheme preserves existing state Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/f69b7352-21aa-494c-8864-31fc0f4b21b8 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Localizable update * Merge translations file --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Fix merge conflicts in PR #1614 (Spanish translations) (#1644) * 20% of strings translated to spanish * add more translations * add rest of translations * small fixes --------- Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * fix typo in hop limit option description (#1631) O hop -> 0 hop --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> Co-authored-by: Austin Hargis <25471876+austinhargis@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: axunes <axunes@axunes.net>
209 lines
6.3 KiB
Swift
209 lines
6.3 KiB
Swift
//
|
|
// ChannelList.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 8/29/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
import CoreData
|
|
import OSLog
|
|
|
|
struct ChannelList: View {
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
@Binding var node: NodeInfoEntity?
|
|
@Binding var channelSelection: ChannelEntity?
|
|
@State private var channelToDeleteMessages: ChannelEntity?
|
|
@State private var isPresentingDeleteChannelMessagesConfirm: Bool = false
|
|
@State private var isPresentingTraceRouteSentAlert = false
|
|
@State private var showingHelp = false
|
|
|
|
var restrictedChannels = ["gpio", "mqtt", "serial", "admin"]
|
|
|
|
@FetchRequest(
|
|
sortDescriptors: [NSSortDescriptor(keyPath: \ChannelEntity.index, ascending: true)],
|
|
predicate: nil,
|
|
animation: .default
|
|
) private var channels: FetchedResults<ChannelEntity>
|
|
|
|
@ViewBuilder
|
|
private func makeChannelRow(
|
|
myInfo: MyInfoEntity,
|
|
channel: ChannelEntity
|
|
) -> some View {
|
|
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMdd", options: 0, locale: Locale.current)
|
|
let dateFormatString = (localeDateFormat ?? "MM/dd/YY")
|
|
|
|
NavigationLink(value: channel) {
|
|
let mostRecent = channel.mostRecentPrivateMessage
|
|
let hasMessages = mostRecent != nil
|
|
let hasUnreadMessages = hasMessages && (channel.unreadMessages > 0)
|
|
let lastMessageTime = Date(timeIntervalSince1970: TimeInterval(Int64((mostRecent?.messageTimestamp ?? 0 ))))
|
|
let lastMessageDay = Calendar.current.dateComponents([.day], from: lastMessageTime).day ?? 0
|
|
let currentDay = Calendar.current.dateComponents([.day], from: Date()).day ?? 0
|
|
|
|
ZStack {
|
|
Image(systemName: "circle.fill")
|
|
.opacity(hasUnreadMessages ? 1 : 0)
|
|
.font(.system(size: 10))
|
|
.foregroundColor(.accentColor)
|
|
.brightness(0.2)
|
|
}
|
|
CircleText(text: String(channel.index), color: .accentColor)
|
|
.brightness(0.2)
|
|
|
|
VStack(alignment: .leading) {
|
|
HStack {
|
|
ChannelLock(channel: channel)
|
|
if channel.name?.isEmpty ?? false {
|
|
if channel.role == 1 {
|
|
Text(String("PrimaryChannel").camelCaseToWords())
|
|
.font(.headline)
|
|
} else {
|
|
Text(String("Channel \(channel.index)").camelCaseToWords())
|
|
.font(.headline)
|
|
}
|
|
} else {
|
|
Text(String(channel.name ?? "Channel \(channel.index)").camelCaseToWords())
|
|
.font(.headline)
|
|
}
|
|
|
|
Spacer()
|
|
|
|
if hasMessages {
|
|
|
|
if lastMessageDay == currentDay {
|
|
Text(lastMessageTime, style: .time )
|
|
.font(.footnote)
|
|
.foregroundColor(.secondary)
|
|
} else if lastMessageDay == (currentDay - 1) {
|
|
Text("Yesterday")
|
|
.font(.footnote)
|
|
.foregroundColor(.secondary)
|
|
} else if lastMessageDay < (currentDay - 1) && lastMessageDay > (currentDay - 5) {
|
|
Text(lastMessageTime.formattedDate(format: dateFormatString))
|
|
.font(.footnote)
|
|
.foregroundColor(.secondary)
|
|
} else if lastMessageDay < (currentDay - 1800) {
|
|
Text(lastMessageTime.formattedDate(format: dateFormatString))
|
|
.font(.footnote)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
}
|
|
if channel.mute {
|
|
Image(systemName: "bell.slash")
|
|
}
|
|
}
|
|
|
|
if hasMessages {
|
|
HStack(alignment: .top) {
|
|
Text("\(mostRecent != nil ? mostRecent!.messagePayload! : " ")")
|
|
// .font(.system(size: 16))
|
|
.font(.footnote)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
var body: some View {
|
|
VStack {
|
|
// Display Contacts for the rest of the non admin channels
|
|
if let node, let myInfo = node.myInfo {
|
|
List(selection: $channelSelection) {
|
|
ForEach(channels) { (channel: ChannelEntity) in
|
|
let hasMessages = channel.mostRecentPrivateMessage != nil
|
|
if !restrictedChannels.contains(channel.name?.lowercased() ?? "") {
|
|
makeChannelRow(myInfo: myInfo, channel: channel)
|
|
.alignmentGuide(.listRowSeparatorLeading) {
|
|
$0[.leading]
|
|
}
|
|
.frame(height: 62)
|
|
.contextMenu {
|
|
if hasMessages {
|
|
Button(role: .destructive) {
|
|
isPresentingDeleteChannelMessagesConfirm = true
|
|
channelToDeleteMessages = channel
|
|
} label: {
|
|
Label("Delete Messages", systemImage: "trash")
|
|
}
|
|
}
|
|
Button {
|
|
channel.mute.toggle()
|
|
do {
|
|
Task {
|
|
do {
|
|
_ = try await accessoryManager.saveChannel(channel: channel.protoBuf, fromUser: node.user!, toUser: node.user!)
|
|
Task { @MainActor in
|
|
do {
|
|
context.refresh(channel, mergeChanges: true)
|
|
try context.save()
|
|
} catch {
|
|
context.rollback()
|
|
Logger.data.error("💥 Save Channel Mute Error")
|
|
}
|
|
}
|
|
} catch {
|
|
Logger.mesh.error("Unable to save channel")
|
|
}
|
|
}
|
|
}
|
|
} label: {
|
|
Label(channel.mute ? "Show Alerts" : "Hide Alerts", systemImage: channel.mute ? "bell" : "bell.slash")
|
|
}
|
|
}
|
|
.confirmationDialog(
|
|
"This conversation will be deleted.",
|
|
isPresented: $isPresentingDeleteChannelMessagesConfirm,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button(role: .destructive) {
|
|
Task {
|
|
await MeshPackets.shared.deleteChannelMessages(channel: channelToDeleteMessages!)
|
|
await MainActor.run {
|
|
context.refresh(channel, mergeChanges: true)
|
|
context.refresh(myInfo, mergeChanges: true)
|
|
|
|
// Reset state
|
|
channelToDeleteMessages = nil
|
|
}
|
|
}
|
|
} label: {
|
|
Text("Delete")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.olderThanOS26 { $0.padding([.top, .bottom]) }
|
|
.listStyle(.plain)
|
|
}
|
|
}
|
|
.sheet(isPresented: $showingHelp) {
|
|
ChannelsHelp()
|
|
.presentationDetents([.large])
|
|
.presentationDragIndicator(.visible)
|
|
}
|
|
.safeAreaInset(edge: .bottom, alignment: .leading) {
|
|
HStack {
|
|
Button(action: {
|
|
withAnimation {
|
|
showingHelp = !showingHelp
|
|
}
|
|
}) {
|
|
Image(systemName: !showingHelp ? "questionmark.circle" : "questionmark.circle.fill")
|
|
.padding(.vertical, 5)
|
|
}
|
|
.tint(Color(UIColor.secondarySystemBackground))
|
|
.foregroundColor(.accentColor)
|
|
.buttonStyle(.borderedProminent)
|
|
}
|
|
.controlSize(.regular)
|
|
.padding(5)
|
|
}
|
|
.padding(.bottom, 5)
|
|
.navigationTitle("Channels")
|
|
}
|
|
}
|