Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate tab and sidebar selection

This commit is contained in:
Thomas Ricouard 2023-01-04 12:55:09 +01:00
parent 73f3fef738
commit 1baa02948b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IceCubesApp/App/IceCubesApp.swift
View File

@ -17,7 +17,8 @@ struct IceCubesApp: App {
@StateObject private var quickLook = QuickLook()
@StateObject private var theme = Theme()
@State private var selectedTab: Tab? = .timeline
@State private var selectedTab: Tab = .timeline
@State private var selectSidebarItem: Tab? = .timeline
@State private var popToRootTab: Tab = .other
private var availableTabs: [Tab] {
@ -73,9 +74,7 @@ struct IceCubesApp: App {
/// Stupid hack to trigger onChange binding in tab views.
popToRootTab = .other
DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
if let selectedTab {
popToRootTab = selectedTab
}
popToRootTab = selectedTab
}
}
selectedTab = newTab
@ -94,7 +93,7 @@ struct IceCubesApp: App {
private var splitView: some View {
NavigationSplitView {
List(availableTabs, selection: $selectedTab) { tab in
List(availableTabs, selection: $selectSidebarItem) { tab in
NavigationLink(value: tab) {
tab.label
}
@ -102,7 +101,7 @@ struct IceCubesApp: App {
.scrollContentBackground(.hidden)
.background(theme.secondaryBackgroundColor)
} detail: {
selectedTab?.makeContentView(popToRootTab: $popToRootTab)
selectSidebarItem?.makeContentView(popToRootTab: $popToRootTab)
}
}