diff options
Diffstat (limited to 'Sora')
| -rw-r--r-- | Sora/Views/MainView.swift | 37 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridView.swift | 1 |
2 files changed, 23 insertions, 15 deletions
diff --git a/Sora/Views/MainView.swift b/Sora/Views/MainView.swift index 87bc090..bbc6a1c 100644 --- a/Sora/Views/MainView.swift +++ b/Sora/Views/MainView.swift @@ -23,24 +23,33 @@ struct MainView: View { .onAppear(perform: initializeManager) } + @ViewBuilder private var tabViewContent: some View { + TabView(selection: $selectedTab) { + ContentView(selectedTab: $selectedTab) + .tabItem { Label("Posts", systemImage: "rectangle.stack") } + .tag(0) + + NavigationStack { + BookmarksView(selectedTab: $selectedTab) + } + .tabItem { Label("Bookmarks", systemImage: "bookmark") } + .tag(1) + + SettingsView() + .tabItem { Label("Settings", systemImage: "gear") } + .tag(2) + } + } + @ViewBuilder private var platformSpecificContent: some View { #if os(macOS) ContentView(selectedTab: $selectedTab) #else - TabView(selection: $selectedTab) { - ContentView(selectedTab: $selectedTab) - .tabItem { Label("Posts", systemImage: "rectangle.stack") } - .tag(0) - - NavigationStack { - BookmarksView(selectedTab: $selectedTab) - } - .tabItem { Label("Bookmarks", systemImage: "bookmark") } - .tag(1) - - SettingsView() - .tabItem { Label("Settings", systemImage: "gear") } - .tag(2) + if #available(iOS 26, *) { + tabViewContent + .tabBarMinimizeBehavior(.onScrollDown) + } else { + tabViewContent } #endif } diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift index b665087..dc65c7d 100644 --- a/Sora/Views/Post/Grid/PostGridView.swift +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -43,7 +43,6 @@ struct PostGridView: View { } .opacity(isActive ? 1 : 0) .frame(height: isActive ? nil : 0) - .clipped() } } .searchable(text: $manager.searchText, isPresented: $isSearchablePresented, prompt: "Tags") |