mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Remove extra want config call when adding a contact * App badge and unnecessary notification fixes (#1455) * - Fix for app badge not going to zero if a message arrives while you have that chat open - Fix for push notifications popping up when a message is received while that chat is open * Fix for cancelling notifications, works now. And scroll to bottom of conversation upon new message * Fix: Channels help grammer fix (#1452) * remove outdated TCP not available on Apple devices (#1450) * Update initial onboarding view * remove toggle gating for mac * Update crash reporting opt out in real time * Update onboarding text * Use mDNS text records for node name * TCP IP and port on the connection screen * Hide app icon chooser on mac * Infinite loop hang bugfixes and performance improvements for both `UserMessageList` and `ChannelMessageList` (#1465) * 2.7.5 Working Changes (#1460) * Remove extra want config call when adding a contact * App badge and unnecessary notification fixes (#1455) * - Fix for app badge not going to zero if a message arrives while you have that chat open - Fix for push notifications popping up when a message is received while that chat is open * Fix for cancelling notifications, works now. And scroll to bottom of conversation upon new message * Fix: Channels help grammer fix (#1452) * remove outdated TCP not available on Apple devices (#1450) * Update initial onboarding view * remove toggle gating for mac * Update crash reporting opt out in real time * Update onboarding text --------- Co-authored-by: Gnome Adrift <646322+gnomeadrift@users.noreply.github.com> Co-authored-by: Zain Kergaye <62440012+ZainKergaye@users.noreply.github.com> Co-authored-by: NillRudd <102033730+NillRudd@users.noreply.github.com> * UserEntity: add mostRecentMessage and unreadMessages with early exit when lastMessage is nil, and fetch 1 row (not N) otherwise * UserList: replace 5 slow calls to user.messageList with new fast calls * NodeList: always put the connected node at the top of list (if it matches the node filters) * ChannelEntity: add faster mostRecentPrivateMessage and unreadMessages which fetch 1 row (not N) * ChannelList: replace 5 calls to channel.allPrivateMessage with new fast calls * Fix incorrect appState.unreadDirectMessages calculations * MyInfoEntity: also fix unreadMessages count here to be fast, and use it for appState.unreadChannelMessages * UserMessageList: use @FetchRequest to prevent the N^2 behavior that was happening in calls to allPrivateMessages * Refactor ChannelEntityExtension and MyInfoEntityExtension to be more similar to UserEntityExtension * Remove SwiftUI-infinite-loop-causing `.id(redrawTapbacksTrigger)` in ChannelMessageList and UserMessageList (duplicate row ids) * MyInfoEntityExtension: exclude emoji tapbacks (which never get marked as read anyway) from unread message count * Add SaveChannelLinkData so MessageText and MeshtasticApp can use .sheet(item: ...) and avoid infinite loop hang due to Binding rebuild * ChannelMessageList and UserMessageList: switch to stable messageId for ForEach SwiftUI row identity * ChannelMessageList and UserMessageList: debouncedScrollToBottom; keyboardWillShowNotification/keyboardDidShowNotification * ChannelMessageList and UserMessageList: scroll to bottom onFirstAppear * ChannelMessageList and UserMessageList: block spurious markMessagesAsRead when this View is not active --------- Co-authored-by: Garth Vander Houwen <garth@meshtastic.com> Co-authored-by: Gnome Adrift <646322+gnomeadrift@users.noreply.github.com> Co-authored-by: Zain Kergaye <62440012+ZainKergaye@users.noreply.github.com> Co-authored-by: NillRudd <102033730+NillRudd@users.noreply.github.com> * message-list-performance: revert scrolling changes (#1472) * Reverte0f0b4a0f7(ChannelMessageList and UserMessageList: scroll to bottom onFirstAppear) * Revert "ChannelMessageList and UserMessageList: debouncedScrollToBottom; keyboardWillShowNotification/keyboardDidShowNotification" This reverts commitee1a7c4415. --------- Co-authored-by: Gnome Adrift <646322+gnomeadrift@users.noreply.github.com> Co-authored-by: Zain Kergaye <62440012+ZainKergaye@users.noreply.github.com> Co-authored-by: NillRudd <102033730+NillRudd@users.noreply.github.com> Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Mike Robbins <mrobbins@alum.mit.edu>
202 lines
6.1 KiB
Swift
202 lines
6.1 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) {
|
|
deleteChannelMessages(channel: channelToDeleteMessages!, context: context)
|
|
context.refresh(myInfo, mergeChanges: true)
|
|
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")
|
|
}
|
|
}
|