mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
More unread messages infrastructure
This commit is contained in:
parent
acf5cd00ad
commit
ee795b74c4
3 changed files with 10 additions and 6 deletions
|
|
@ -10,17 +10,17 @@ import Foundation
|
|||
extension UserEntity {
|
||||
|
||||
var messageList: [MessageEntity] {
|
||||
|
||||
self.value(forKey: "allMessages") as? [MessageEntity] ?? [MessageEntity]()
|
||||
}
|
||||
|
||||
var adminMessageList: [MessageEntity] {
|
||||
|
||||
self.value(forKey: "adminMessages") as? [MessageEntity] ?? [MessageEntity]()
|
||||
}
|
||||
|
||||
var unreadMessages: Int {
|
||||
self.receivedMessages?.count ?? 0
|
||||
|
||||
let unreadMessages = receivedMessages?.filter{ ($0 as AnyObject).read == false } ?? []
|
||||
return unreadMessages.count
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ struct ContentView: View {
|
|||
Label("messages", systemImage: "message")
|
||||
}
|
||||
.tag(Tab.contacts)
|
||||
.badge(42)
|
||||
// .badge(42)
|
||||
Connect()
|
||||
.tabItem {
|
||||
Label("bluetooth", systemImage: "antenna.radiowaves.left.and.right")
|
||||
|
|
@ -24,13 +24,11 @@ struct ContentView: View {
|
|||
Label("nodes", systemImage: "flipphone")
|
||||
}
|
||||
.tag(Tab.nodes)
|
||||
.badge(11)
|
||||
NodeMap()
|
||||
.tabItem {
|
||||
Label("map", systemImage: "map")
|
||||
}
|
||||
.tag(Tab.map)
|
||||
.badge(4)
|
||||
Settings()
|
||||
.tabItem {
|
||||
Label("settings", systemImage: "gear")
|
||||
|
|
|
|||
|
|
@ -216,8 +216,14 @@ struct UserMessageList: View {
|
|||
}
|
||||
}, secondaryButton: .cancel())
|
||||
}
|
||||
.onAppear {
|
||||
if !message.read {
|
||||
print("\(message.messageId) read")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// End Message List ForEach
|
||||
}
|
||||
}
|
||||
.padding([.top])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue