Fixes navigation issue

main
Laurent 3 years ago
parent aa71352e92
commit 99d55b3c3c
  1. 4
      LeCountdown.xcodeproj/project.pbxproj
  2. 24
      LeCountdown/Views/HomeView.swift

@ -1379,7 +1379,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.1;
MARKETING_VERSION = 0.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.staxriver.LeCountdown;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
@ -1413,7 +1413,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.1;
MARKETING_VERSION = 0.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.staxriver.LeCountdown;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;

@ -69,17 +69,19 @@ struct RegularHomeView: View {
.tabItem { Label("Presets", systemImage: "globe") }
.tag(0)
} detail: {
TabView(selection: $tabSelection) {
ContentView<AbstractTimer>()
.environment(\.managedObjectContext, viewContext)
.environmentObject(Conductor.maestro)
.tabItem { Label("Home", systemImage: "clock.fill") }
.tag(1)
ActivitiesView()
.environment(\.managedObjectContext, viewContext)
.tabItem { Label("Stats", systemImage: "chart.bar.fill") }
.tag(2)
}.tabViewStyle(.page(indexDisplayMode: .never))
NavigationStack {
TabView(selection: $tabSelection) {
ContentView<AbstractTimer>()
.environment(\.managedObjectContext, viewContext)
.environmentObject(Conductor.maestro)
.tabItem { Label("Home", systemImage: "clock.fill") }
.tag(1)
ActivitiesView()
.environment(\.managedObjectContext, viewContext)
.tabItem { Label("Stats", systemImage: "chart.bar.fill") }
.tag(2)
}.tabViewStyle(.page(indexDisplayMode: .never))
}
}
.onAppear {
self._setColumnVisibility()

Loading…
Cancel
Save