Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Use NavigationSplitView rather than TabView for iPad #6 #279

Merged
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
25 changes: 25 additions & 0 deletions Basic-Car-Maintenance/Shared/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,9 @@
}
}
}
},
"Basic Car" : {

},
"Can't Delete Last Vehicle" : {
"localizations" : {
Expand Down Expand Up @@ -3686,6 +3689,17 @@
}
}
},
"Sidebar" : {
"extractionState" : "stale",
"localizations" : {
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Боковая панель"
}
}
}
},
"Sign Out" : {
"localizations" : {
"be" : {
Expand Down Expand Up @@ -4301,6 +4315,17 @@
}
}
},
"Unexpected error occured." : {
"extractionState" : "stale",
"localizations" : {
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Произошла ошибка."
}
}
}
},
"Update" : {
"comment" : "Label for submit button on form to update an existing entry",
"localizations" : {
Expand Down
111 changes: 92 additions & 19 deletions Basic-Car-Maintenance/Shared/MainView/Views/MainTabView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,38 @@
import SwiftUI
import SwiftData

enum TabSelection: Int {
enum TabSelection: Int, Identifiable, CaseIterable {
var id: Self { self }

case dashboard = 0
case odometer = 1
case settings = 2
}

extension TabSelection {
var label: LocalizedStringKey {
switch self {
case .dashboard:
return "Dashboard"
case .odometer:
return "Odometer"
case .settings:
return "Settings"
}
}

var image: String {
switch self {
case .dashboard:
return SFSymbol.dashboard
case .odometer:
return SFSymbol.gauge
case .settings:
return SFSymbol.gear
}
}
}

@MainActor
struct MainTabView: View {
@Query var acknowledgedAlerts: [AcknowledgedAlert]
Expand All @@ -24,28 +50,27 @@ struct MainTabView: View {

@AppStorage("lastTabOpen") var selectedTab = TabSelection.dashboard

@State private var selectedTabId: TabSelection.ID? = .dashboard
mikaelacaron marked this conversation as resolved.
Show resolved Hide resolved
@State private var columnVisibility = NavigationSplitViewVisibility.automatic

@State var authenticationViewModel = AuthenticationViewModel()
@State var viewModel = MainTabViewModel()

init() {
_selectedTabId = State(initialValue: selectedTab)
}

var body: some View {
TabView(selection: $selectedTab) {
DashboardView(userUID: authenticationViewModel.user?.uid)
.tag(TabSelection.dashboard)
.tabItem {
Label("Dashboard", systemImage: SFSymbol.dashboard)
}

OdometerView(userUID: authenticationViewModel.user?.uid)
.tag(TabSelection.odometer)
.tabItem {
Label("Odometer", systemImage: SFSymbol.gauge)
}

SettingsView(authenticationViewModel: authenticationViewModel)
.tag(TabSelection.settings)
.tabItem {
Label("Settings", systemImage: SFSymbol.gear)
}
Group {
#if os(iOS)
if UIDevice.current.userInterfaceIdiom == .pad {
navigationSplitView()
} else {
tabView()
}
#else
navigationSplitView()
#endif
}
.sheet(item: $viewModel.alert) { alert in
AlertView(alert: alert)
Expand Down Expand Up @@ -73,6 +98,9 @@ struct MainTabView: View {
guard let id = newValue?.id else { return }
saveNewAlert(id)
}
.onChange(of: selectedTabId ?? TabSelection.dashboard) { _, newValue in
selectedTab = newValue
}
}

/// Save newly acknowledged alert to DB
Expand All @@ -81,6 +109,51 @@ struct MainTabView: View {
let acknowledgedAlert = AcknowledgedAlert(id: id)
context.insert(acknowledgedAlert)
}

/// Save screen content for specific selection
/// - Parameter selection: tab selection enum value
@ViewBuilder
private func selectionContent(for selection: TabSelection) -> some View {
switch selection {
case .dashboard:
DashboardView(userUID: authenticationViewModel.user?.uid)
case .odometer:
OdometerView(userUID: authenticationViewModel.user?.uid)
case .settings:
SettingsView(authenticationViewModel: authenticationViewModel)
}
}

/// Primarily used on iPad and Mac devices
/// - Returns: `NavigationSplitView` navigation
@ViewBuilder
private func navigationSplitView() -> some View {
NavigationSplitView(columnVisibility: $columnVisibility) {
List(TabSelection.allCases, selection: $selectedTabId) { tabSelection in
Label(tabSelection.label, systemImage: tabSelection.image)
}
.navigationTitle("Basic Car")
} detail: {
if let tabSelection = selectedTabId {
selectionContent(for: tabSelection)
.tag(tabSelection)
}
}
}

/// Primarily used on iPhone devices
/// - Returns: `TabView` navigation
@ViewBuilder func tabView() -> some View {
TabView(selection: $selectedTab) {
ForEach(TabSelection.allCases) { tabSelection in
selectionContent(for: tabSelection)
.tag(tabSelection)
.tabItem {
Label(tabSelection.label, systemImage: tabSelection.image)
}
}
}
}
}

#Preview {
Expand Down
Loading