Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SwiftLeeds/Views/About/AboutView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ struct AboutView: View {
.ignoresSafeArea(edges: .bottom)
}
.sheet(isPresented: $isFullAboutShown) {
NavigationView {
NavigationStack {
ScrollView {
VStack(alignment: .leading, spacing: Padding.cellGap) {
Text(aboutSwiftLeeds)
Expand Down
3 changes: 1 addition & 2 deletions SwiftLeeds/Views/My Conference/MyConferenceView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct MyConferenceView: View {
@Namespace private var namespace

var body: some View {
NavigationView {
NavigationStack {
VStack(spacing: 0) {
Divider()

Expand Down Expand Up @@ -52,7 +52,6 @@ struct MyConferenceView: View {
}
}
}
.navigationViewStyle(.stack)
.accentColor(.white)
.task {
try? await viewModel.loadSchedule()
Expand Down
1 change: 0 additions & 1 deletion SwiftLeeds/Views/Tab/SidebarMainView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ struct SidebarMainView: View {
SettingsView()
}
}

}
}
7 changes: 7 additions & 0 deletions SwiftLeeds/Views/Tab/SidebarView.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Settings
import SwiftUI

struct SidebarView: View {
Expand Down Expand Up @@ -25,6 +26,12 @@ struct SidebarView: View {
}) {
Label("Sponsors", systemImage: "sparkles")
}

NavigationLink(destination: SettingsView().onAppear {
appState.selectedTab = .settings
}) {
Label("Settings", systemImage: "gearshape.fill")
}
}
.listStyle(.sidebar)
}
Expand Down
9 changes: 5 additions & 4 deletions SwiftLeeds/Views/Tab/Tabs.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ColorTheme
import SwiftUI

struct Tabs: View {
Expand All @@ -14,8 +15,8 @@ struct Tabs: View {
}
}

struct Tabs_Previews: PreviewProvider {
static var previews: some View {
Tabs()
}
#Preview {
Tabs()
.environmentObject(AppState())
.environmentObject(ThemeManager.shared)
}
10 changes: 5 additions & 5 deletions SwiftLeedsPackage/Sources/Settings/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public struct SettingsView: View {
public init() {}

public var body: some View {
NavigationView {
NavigationStack {
List {
Section("App Icon") {
LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: 3), spacing: 16) {
Expand All @@ -24,7 +24,7 @@ public struct SettingsView: View {
}
.padding(.vertical, 8)
}

Section("Appearance") {
Picker("Theme", selection: $themeManager.currentTheme) {
ForEach(ThemeOption.allCases, id: \.self) { theme in
Expand All @@ -35,19 +35,19 @@ public struct SettingsView: View {
themeManager.setTheme(newTheme)
}
}

Section("About") {
HStack {
Text("Version")
Spacer()
Text(viewModel.appVersion)
.foregroundColor(.secondary)
}

Button("Contact Us") {
viewModel.openContactUs()
}

Button("Code of Conduct") {
viewModel.openCodeOfConduct()
}
Expand Down