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 extra navigation stack

Browse source
This commit is contained in:
Garth Vander Houwen 2023-09-16 08:48:36 -07:00
parent ef11d825d2
commit a5b86d6c14
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,7 @@ struct ChannelList: View {
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMdd", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "MM/dd/YY")
NavigationStack {
VStack {
List {
// Display Contacts for the rest of the non admin channels
if node != nil && node!.myInfo != nil && node!.myInfo!.channels != nil {

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

@ -32,7 +32,7 @@ struct ChannelMessageList: View {
@State private var sendPositionWithMessage: Bool = false
var body: some View {
NavigationStack {
VStack {
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMddjmmssa", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mm:ss a")
ScrollViewReader { scrollView in

2
Meshtastic/Views/Messages/UserList.swift
View file

@ -36,7 +36,7 @@ struct UserList: View {
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMdd", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "MM/dd/YY")
NavigationStack {
VStack {
List {
ForEach(users) { (user: UserEntity) in

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

@ -30,7 +30,7 @@ struct UserMessageList: View {
@State private var sendPositionWithMessage: Bool = false
var body: some View {
NavigationStack {
VStack {
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMddjmmss", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mm:ss:a")
ScrollViewReader { scrollView in