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

Update messages routing to clear NavigationSplitView when switching on sidebar

Browse source
This commit is contained in:
Blake McAnally 2024-07-16 19:47:57 -05:00
parent 8fe6d46009
commit fd96b36d4d
2 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Localizable.xcstrings
View file

@ -18786,6 +18786,15 @@
},
"Secondary" : {
},
"Select a channel" : {
},
"Select a conversation" : {
},
"Select a conversation type" : {
},
"Select a Trace Route" : {

48
Meshtastic/Views/Messages/Messages.swift
View file

@ -87,21 +87,26 @@ struct Messages: View {
.navigationTitle("messages")
.navigationBarTitleDisplayMode(.large)
.navigationBarItems(leading: MeshtasticLogo())
.onAppear {
setupNavigationState()
}
} content: {
if case .messages(.channels) = router.navigationState {
ChannelList(node: $node, channelSelection: $channelSelection)
} else if case .messages(.directMessages) = router.navigationState {
UserList(node: $node, userSelection: $userSelection)
} else if case .messages(nil) = router.navigationState {
Text("Select a conversation type")
}
} detail: {
if let myInfo = node?.myInfo, let channelSelection {
ChannelMessageList(myInfo: myInfo, channel: channelSelection)
} else if let userSelection {
UserMessageList(user: userSelection)
} else if case .messages(.channels) = router.navigationState {
Text("Select a channel")
} else if case .messages(.directMessages) = router.navigationState {
Text("Select a conversation")
}
}.onChange(of: router.navigationState) { _ in
setupNavigationState()
}
}
@ -115,23 +120,30 @@ struct Messages: View {
return
}
if let state {
switch state {
case .channels(channelId: let channelId, messageId: _):
if let channelId {
channelSelection = node?.myInfo?.channels?.first(where: { channel in
guard let channel = channel as? ChannelEntity else { return false }
return channel.id == channelId
}) as? ChannelEntity
}
case .directMessages(userNum: let userNum, messageId: _):
if let userNum {
userSelection = getUser(id: userNum, context: context)
}
}
} else {
guard let state else {
channelSelection = nil
userSelection = nil
return
}
switch state {
case .channels(channelId: let channelId, messageId: _):
if let channelId {
channelSelection = node?.myInfo?.channels?.first(where: { channel in
guard let channel = channel as? ChannelEntity else { return false }
return channel.id == channelId
}) as? ChannelEntity
} else {
channelSelection = nil
userSelection = nil
}
case .directMessages(userNum: let userNum, messageId: _):
if let userNum {
userSelection = getUser(id: userNum, context: context)
} else {
channelSelection = nil
userSelection = nil
}
}
}
}