meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

ChannelList: replace 5 calls to channel.allPrivateMessage with new fast calls

Browse source
This commit is contained in:
Mike Robbins 2025-10-13 01:21:38 -04:00
parent 67daed0536
commit f8c1a600a3
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Meshtastic/Views/Messages/ChannelList.swift
View file

@ -37,14 +37,16 @@ struct ChannelList: View {
let dateFormatString = (localeDateFormat ?? "MM/dd/YY")
NavigationLink(value: channel) {
let mostRecent = channel.allPrivateMessages.last(where: { $0.channel == channel.index })
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(channel.unreadMessages > 0 ? 1 : 0)
.opacity(hasUnreadMessages ? 1 : 0)
.font(.system(size: 10))
.foregroundColor(.accentColor)
.brightness(0.2)
@ -70,7 +72,7 @@ struct ChannelList: View {
Spacer()
if channel.allPrivateMessages.count > 0 {
if hasMessages {
if lastMessageDay == currentDay {
Text(lastMessageTime, style: .time )
@ -95,7 +97,7 @@ struct ChannelList: View {
}
}
if channel.allPrivateMessages.count > 0 {
if hasMessages {
HStack(alignment: .top) {
Text("\(mostRecent != nil ? mostRecent!.messagePayload! : " ")")
// .font(.system(size: 16))
@ -112,6 +114,7 @@ struct ChannelList: View {
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) {
@ -119,7 +122,7 @@ struct ChannelList: View {
}
.frame(height: 62)
.contextMenu {
if channel.allPrivateMessages.count > 0 {
if hasMessages {
Button(role: .destructive) {
isPresentingDeleteChannelMessagesConfirm = true
channelToDeleteMessages = channel