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

Merge pull request #1357 from meshtastic/revert-1351-read-indicator-improvements

Browse source 
Revert "Remove redundant gotFirstUnreadMessage "
This commit is contained in:
Garth Vander Houwen 2025-08-27 08:19:47 -07:00 • committed by GitHub
commit 28a2b175e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ 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
@ -163,6 +164,7 @@ struct ChannelMessageList: View {
.frame(maxWidth: .infinity)
.id(message.messageId)
.onAppear {
if gotFirstUnreadMessage {
if !message.read {
message.read = true
do {
@ -182,6 +184,7 @@ struct ChannelMessageList: View {
hasReachedBottom = true
showScrollToBottomButton = false
}
}
}
}
// Invisible spacer to detect reaching bottom

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

@ -22,6 +22,7 @@ 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 {
@ -131,6 +132,7 @@ struct UserMessageList: View {
.frame(maxWidth: .infinity)
.id(message.messageId)
.onAppear {
if gotFirstUnreadMessage {
if !message.read {
message.read = true
do {
@ -149,6 +151,7 @@ struct UserMessageList: View {
hasReachedBottom = true
showScrollToBottomButton = false
}
}
}
}
}
@ -177,6 +180,7 @@ struct UserMessageList: View {
}
}
}
gotFirstUnreadMessage = true
}
.onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardDidShowNotification)) { _ in
withAnimation {