From 1b058af687bac9dfe8c78209fe7ba510b2d78257 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 15 May 2024 08:39:35 +0300 Subject: JuickNext: conditional layout for big screens --- JuickNext/View/ContentView.swift | 15 ++++++++++++--- JuickNext/View/Discussions.swift | 21 +++++++++++++++++++++ JuickNext/View/DiscussionsView.swift | 21 --------------------- JuickNext/View/Today.swift | 5 ++++- 4 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 JuickNext/View/Discussions.swift delete mode 100644 JuickNext/View/DiscussionsView.swift (limited to 'JuickNext') diff --git a/JuickNext/View/ContentView.swift b/JuickNext/View/ContentView.swift index 03916fc..e77d6e7 100644 --- a/JuickNext/View/ContentView.swift +++ b/JuickNext/View/ContentView.swift @@ -9,17 +9,26 @@ import SwiftUI struct ContentView: View { + @Environment(\.horizontalSizeClass) private var size var body: some View { - TabView { + let view = (size == .compact) ? + AnyView(TabView { Today() .tabItem { Image("ei-clock") } - Text("Discussions") + Discussions() .tabItem { Image("ei-bell") } - } + }): AnyView(NavigationView { + VStack { + Text("Discussions") + Text("Discover") + Text("Chats") + } + }) + view } } diff --git a/JuickNext/View/Discussions.swift b/JuickNext/View/Discussions.swift new file mode 100644 index 0000000..20e7fa8 --- /dev/null +++ b/JuickNext/View/Discussions.swift @@ -0,0 +1,21 @@ +// +// Discussions.swift +// Juick +// +// Created by Vitaly Takmazov on 14.05.2023. +// Copyright © 2023 com.juick. All rights reserved. +// + +import SwiftUI + +struct Discussions: View { + var body: some View { + Text("Discussions") + } +} + +struct Discussions_Previews: PreviewProvider { + static var previews: some View { + Discussions() + } +} diff --git a/JuickNext/View/DiscussionsView.swift b/JuickNext/View/DiscussionsView.swift deleted file mode 100644 index b8f121b..0000000 --- a/JuickNext/View/DiscussionsView.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// DiscussionsView.swift -// Juick -// -// Created by Vitaly Takmazov on 14.05.2023. -// Copyright © 2023 com.juick. All rights reserved. -// - -import SwiftUI - -struct DiscussionsView: View { - var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct DiscussionsView_Previews: PreviewProvider { - static var previews: some View { - DiscussionsView() - } -} diff --git a/JuickNext/View/Today.swift b/JuickNext/View/Today.swift index aa4a205..161a353 100644 --- a/JuickNext/View/Today.swift +++ b/JuickNext/View/Today.swift @@ -9,8 +9,11 @@ import SwiftUI struct Today: View { + let title = "Today" var body: some View { - Text("Today") + NavigationView { + Text(title) + } } } -- cgit v1.2.3