diff --git a/LeCountdown/LeCountdownApp.swift b/LeCountdown/LeCountdownApp.swift index 2d3d8c0..999c83d 100644 --- a/LeCountdown/LeCountdownApp.swift +++ b/LeCountdown/LeCountdownApp.swift @@ -42,18 +42,8 @@ struct LeCountdownApp: App { WindowGroup { ZStack { - #if os(iOS) - if UIDevice.isPhoneIdiom { - CompactHomeView() - .environment(\.managedObjectContext, persistenceController.container.viewContext) - } else { - RegularHomeView() - .environment(\.managedObjectContext, persistenceController.container.viewContext) - } - #else - RegularHomeView() + CompactHomeView() .environment(\.managedObjectContext, persistenceController.container.viewContext) - #endif } .onAppear { self._onAppear() diff --git a/LeCountdown/Utils/Extensions.swift b/LeCountdown/Utils/Extensions.swift index 83afa42..c821ccf 100644 --- a/LeCountdown/Utils/Extensions.swift +++ b/LeCountdown/Utils/Extensions.swift @@ -43,6 +43,8 @@ extension Bundle { return displayName } else if let name: String = self.localizedInfoDictionary?["CFBundleName"] as? String { return name + } else if let name = self.infoDictionary?["CFBundleDisplayName"] as? String { + return name } return "No Name Found" } diff --git a/LeCountdown/Views/HomeView.swift b/LeCountdown/Views/HomeView.swift index 70abe4d..d439824 100644 --- a/LeCountdown/Views/HomeView.swift +++ b/LeCountdown/Views/HomeView.swift @@ -23,28 +23,9 @@ struct CompactHomeView: View { var body: some View { NavigationStack { - ContentView() .environment(\.managedObjectContext, viewContext) .environmentObject(Conductor.maestro) - -// TabView(selection: $tabSelection) { -// PresetsView(tabSelection: $tabSelection) -// .environment(\.managedObjectContext, viewContext) -// .tabItem { Label("Presets", systemImage: "globe") } -// .tag(0) -// ContentView() -// .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) -// } -// .navigationBarTitleDisplayMode(NavigationBarItem.TitleDisplayMode.large) -// .tabViewStyle(.page(indexDisplayMode: .never)) } .onAppear { if self.timers.count > 0 { @@ -58,59 +39,59 @@ struct CompactHomeView: View { } -struct RegularHomeView: View { - - @Environment(\.managedObjectContext) private var viewContext - - @State private var tabSelection: Int = 1 - - @State private var columnVisibility: NavigationSplitViewVisibility = .detailOnly - - var body: some View { - - NavigationSplitView(columnVisibility: $columnVisibility) { - PresetsView(tabSelection: $tabSelection) - .environment(\.managedObjectContext, viewContext) - .tabItem { Label("Presets", systemImage: "globe") } - .tag(0) - } detail: { - NavigationStack { - TabView(selection: $tabSelection) { - ContentView() - .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() - } - .onContinueUserActivity(Shortcut.newCountdown.rawValue, perform: _handleNewCountdown) - .onOpenURL { _ in - self.tabSelection = 1 - } - } - - fileprivate func _setColumnVisibility() { - let count = viewContext.count(entityName: "AbstractTimer") - if count > 0 { - self.columnVisibility = .detailOnly - } else { - self.columnVisibility = .automatic - } - } - - fileprivate func _handleNewCountdown(_ userActivity: NSUserActivity) { - print(">>> new countdown") - } - -} +//struct RegularHomeView: View { +// +// @Environment(\.managedObjectContext) private var viewContext +// +// @State private var tabSelection: Int = 1 +// +// @State private var columnVisibility: NavigationSplitViewVisibility = .detailOnly +// +// var body: some View { +// +// NavigationSplitView(columnVisibility: $columnVisibility) { +// PresetsView(tabSelection: $tabSelection) +// .environment(\.managedObjectContext, viewContext) +// .tabItem { Label("Presets", systemImage: "globe") } +// .tag(0) +// } detail: { +// NavigationStack { +// TabView(selection: $tabSelection) { +// ContentView() +// .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() +// } +// .onContinueUserActivity(Shortcut.newCountdown.rawValue, perform: _handleNewCountdown) +// .onOpenURL { _ in +// self.tabSelection = 1 +// } +// } +// +// fileprivate func _setColumnVisibility() { +// let count = viewContext.count(entityName: "AbstractTimer") +// if count > 0 { +// self.columnVisibility = .detailOnly +// } else { +// self.columnVisibility = .automatic +// } +// } +// +// fileprivate func _handleNewCountdown(_ userActivity: NSUserActivity) { +// print(">>> new countdown") +// } +// +//} struct CompactHomeView_Previews: PreviewProvider { static var previews: some View { @@ -121,11 +102,11 @@ struct CompactHomeView_Previews: PreviewProvider { } } -struct RegularHomeView_Previews: PreviewProvider { - static var previews: some View { - RegularHomeView() - .environmentObject(Conductor.maestro) - .environment(\.managedObjectContext, PersistenceController.preview.container.viewContext) - - } -} +//struct RegularHomeView_Previews: PreviewProvider { +// static var previews: some View { +// RegularHomeView() +// .environmentObject(Conductor.maestro) +// .environment(\.managedObjectContext, PersistenceController.preview.container.viewContext) +// +// } +//}