mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
Update messaging list separator insets
This commit is contained in:
parent
1b98ae97cd
commit
d9c2acbe44
3 changed files with 20 additions and 4 deletions
|
|
@ -114,6 +114,9 @@ struct ChannelList: View {
|
|||
ForEach(channels) { (channel: ChannelEntity) in
|
||||
if !restrictedChannels.contains(channel.name?.lowercased() ?? "") {
|
||||
makeChannelRow(myInfo: myInfo, channel: channel)
|
||||
.alignmentGuide(.listRowSeparatorLeading) {
|
||||
$0[.leading]
|
||||
}
|
||||
.frame(height: 62)
|
||||
.contextMenu {
|
||||
if channel.allPrivateMessages.count > 0 {
|
||||
|
|
|
|||
|
|
@ -27,39 +27,49 @@ struct Messages: View {
|
|||
NavigationSplitView(columnVisibility: $columnVisibility) {
|
||||
List(selection: $router.navigationState.messages) {
|
||||
NavigationLink(value: MessagesNavigationState.channels()) {
|
||||
Spacer()
|
||||
Label {
|
||||
Text("Channels")
|
||||
.badge(unreadChannelMessages)
|
||||
.font(.title2)
|
||||
.padding()
|
||||
} icon: {
|
||||
Image(systemName: "person.3")
|
||||
Image(systemName: "person.2")
|
||||
.symbolRenderingMode(.hierarchical)
|
||||
.foregroundColor(.accentColor)
|
||||
.font(.title2)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
.alignmentGuide(.listRowSeparatorLeading) {
|
||||
$0[.leading]
|
||||
}
|
||||
NavigationLink(value: MessagesNavigationState.directMessages()) {
|
||||
Spacer()
|
||||
Label {
|
||||
Text("Direct Messages")
|
||||
.badge(unreadDirectMessages)
|
||||
.font(.title2)
|
||||
.padding()
|
||||
} icon: {
|
||||
Image(systemName: "person.circle")
|
||||
Image(systemName: "person")
|
||||
.symbolRenderingMode(.hierarchical)
|
||||
.foregroundColor(.accentColor)
|
||||
.font(.title2)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
|
||||
.alignmentGuide(.listRowSeparatorLeading) {
|
||||
$0[.leading]
|
||||
}
|
||||
Spacer()
|
||||
TipView(MessagesTip(), arrowEdge: .top)
|
||||
.tipViewStyle(PersistentTip())
|
||||
.tipBackground(colorScheme == .dark ? Color(.systemBackground) : Color(.secondarySystemBackground))
|
||||
.listRowSeparator(.hidden)
|
||||
Spacer()
|
||||
.listRowSeparator(.hidden)
|
||||
}
|
||||
.listStyle(.plain)
|
||||
.navigationTitle("Messages")
|
||||
.navigationBarTitleDisplayMode(.large)
|
||||
.navigationBarItems(leading: MeshtasticLogo())
|
||||
|
|
|
|||
|
|
@ -112,6 +112,9 @@ struct UserList: View {
|
|||
}
|
||||
}
|
||||
.frame(height: 62)
|
||||
.alignmentGuide(.listRowSeparatorLeading) {
|
||||
$0[.leading]
|
||||
}
|
||||
.contextMenu {
|
||||
Button {
|
||||
if node != nil && !(user.userNode?.favorite ?? false) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue