From a5b86d6c14b5c6c5efa0b2fbb3add1e330cd9fb0 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 16 Sep 2023 08:48:36 -0700 Subject: [PATCH] Remove extra navigation stack --- Meshtastic/Views/Messages/ChannelList.swift | 3 +-- Meshtastic/Views/Messages/ChannelMessageList.swift | 2 +- Meshtastic/Views/Messages/UserList.swift | 2 +- Meshtastic/Views/Messages/UserMessageList.swift | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Views/Messages/ChannelList.swift b/Meshtastic/Views/Messages/ChannelList.swift index 952f54e8..5df1a487 100644 --- a/Meshtastic/Views/Messages/ChannelList.swift +++ b/Meshtastic/Views/Messages/ChannelList.swift @@ -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 { diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index e4f5d668..57b27edd 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -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 diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift index 9d3e050e..8f8d2c04 100644 --- a/Meshtastic/Views/Messages/UserList.swift +++ b/Meshtastic/Views/Messages/UserList.swift @@ -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 diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift index 6fd5c6d3..12d28783 100644 --- a/Meshtastic/Views/Messages/UserMessageList.swift +++ b/Meshtastic/Views/Messages/UserMessageList.swift @@ -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