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

Remove gotFirstUnreadMessage bool that is breaking things (#1370)

Browse source
This commit is contained in:
Garth Vander Houwen 2025-09-03 09:37:48 -07:00 • committed by GitHub
parent c3b294df85
commit 194f62850c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -23,8 +23,6 @@ struct ChannelMessageList: View {
// Scroll state
@State private var showScrollToBottomButton = false
@State private var hasReachedBottom = false
@State private var gotFirstUnreadMessage: Bool = false
@State private var messageToHighlight: Int64 = 0
@FetchRequest private var allPrivateMessages: FetchedResults<MessageEntity>
@ -155,37 +153,29 @@ struct ChannelMessageList: View {
Spacer(minLength: 50)
}
}
// .overlay {
// RoundedRectangle(cornerRadius: 18)
// .stroke(.blue, lineWidth: 2)
// .opacity(((messageToHighlight == message.messageId) || (replyMessageId == message.messageId)) ? 1 : 0)
// }
.padding([.leading, .trailing])
.frame(maxWidth: .infinity)
.id(message.messageId)
.onAppear {
if gotFirstUnreadMessage {
if !message.read {
message.read = true
do {
for unreadMessage in allPrivateMessages.filter({ !$0.read }) {
unreadMessage.read = true
}
try context.save()
Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
appState.unreadChannelMessages = myInfo.unreadMessages
context.refresh(myInfo, mergeChanges: true)
} catch {
Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
if !message.read {
message.read = true
do {
for unreadMessage in allPrivateMessages.filter({ !$0.read }) {
unreadMessage.read = true
}
}
// Check if we've reached the bottom message
if message.messageId == allPrivateMessages.last?.messageId {
hasReachedBottom = true
showScrollToBottomButton = false
try context.save()
Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
appState.unreadChannelMessages = myInfo.unreadMessages
context.refresh(myInfo, mergeChanges: true)
} catch {
Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
}
}
}
// Check if we've reached the bottom message
if message.messageId == allPrivateMessages.last?.messageId {
hasReachedBottom = true
showScrollToBottomButton = false
} }
}
// Invisible spacer to detect reaching bottom
Color.clear
@ -210,7 +200,6 @@ struct ChannelMessageList: View {
withAnimation {
scrollView.scrollTo(firstUnreadMessageId, anchor: .top)
showScrollToBottomButton = true
gotFirstUnreadMessage = true
}
}
}

39
Meshtastic/Views/Messages/UserMessageList.swift
View file

@ -22,7 +22,6 @@ struct UserMessageList: View {
// Scroll state
@State private var showScrollToBottomButton = false
@State private var hasReachedBottom = false
@State private var gotFirstUnreadMessage: Bool = false
@State private var messageToHighlight: Int64 = 0
var body: some View {
@ -123,34 +122,27 @@ struct UserMessageList: View {
Spacer(minLength: 50)
}
}
// .overlay {
// RoundedRectangle(cornerRadius: 10)
// .stroke(.blue, lineWidth: 2)
// .opacity(((messageToHighlight == message.messageId) || (replyMessageId == message.messageId)) ? 1 : 0)
// }
.padding([.leading, .trailing])
.frame(maxWidth: .infinity)
.id(message.messageId)
.onAppear {
if gotFirstUnreadMessage {
if !message.read {
message.read = true
do {
for unreadMessage in user.messageList.filter({ !$0.read }) {
unreadMessage.read = true
}
try context.save()
Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
appState.unreadDirectMessages = user.unreadMessages
} catch {
Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
if !message.read {
message.read = true
do {
for unreadMessage in user.messageList.filter({ !$0.read }) {
unreadMessage.read = true
}
try context.save()
Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
appState.unreadDirectMessages = user.unreadMessages
} catch {
Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
}
// Check if we've reached the bottom message
if message.messageId == user.messageList.last?.messageId {
hasReachedBottom = true
showScrollToBottomButton = false
}
}
// Check if we've reached the bottom message
if message.messageId == user.messageList.last?.messageId {
hasReachedBottom = true
showScrollToBottomButton = false
}
}
}
@ -180,7 +172,6 @@ struct UserMessageList: View {
}
}
}
gotFirstUnreadMessage = true
}
.onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardDidShowNotification)) { _ in
withAnimation {