mirror of
https://github.com/yattee/yattee.git
synced 2026-02-21 10:19:46 +00:00
Remove duplicate navigation titles on tvOS
The sidebarAdaptable TabView already shows tab names in the sidebar pill, so the large .navigationTitle() was redundant on tvOS.
This commit is contained in:
@@ -137,8 +137,8 @@ struct BookmarksListView: View {
|
||||
}
|
||||
#endif
|
||||
}
|
||||
.navigationTitle(String(localized: "home.bookmarks.title"))
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "home.bookmarks.title"))
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
.searchable(text: $searchText, prompt: Text(String(localized: "bookmarks.search.placeholder")))
|
||||
.toolbar {
|
||||
|
||||
@@ -136,8 +136,8 @@ struct HistoryListView: View {
|
||||
}
|
||||
#endif
|
||||
}
|
||||
.navigationTitle(String(localized: "home.history.title"))
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "home.history.title"))
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
.searchable(text: $searchText, prompt: Text(String(localized: "history.search.placeholder")))
|
||||
.toolbar {
|
||||
|
||||
@@ -62,13 +62,13 @@ struct HomeView: View {
|
||||
|
||||
var body: some View {
|
||||
mainContent
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "tabs.home"))
|
||||
.navigationSubtitleIfAvailable(
|
||||
settingsManager?.incognitoModeEnabled == true
|
||||
? String(localized: "home.incognitoMode.subtitle")
|
||||
: nil
|
||||
)
|
||||
#if !os(tvOS)
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
#endif
|
||||
.toolbar {
|
||||
|
||||
@@ -53,8 +53,8 @@ struct MediaSourcesView: View {
|
||||
sourcesList
|
||||
}
|
||||
}
|
||||
.navigationTitle(String(localized: "sources.title"))
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "sources.title"))
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .primaryAction) {
|
||||
|
||||
@@ -127,8 +127,8 @@ struct SearchView: View {
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
}
|
||||
}
|
||||
.navigationTitle(String(localized: "tabs.search"))
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "tabs.search"))
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
#endif
|
||||
.toolbar {
|
||||
|
||||
@@ -206,7 +206,9 @@ struct SettingsView: View {
|
||||
}
|
||||
}
|
||||
}
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "settings.title"))
|
||||
#endif
|
||||
#if os(iOS)
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
#endif
|
||||
|
||||
@@ -99,8 +99,8 @@ struct ManageChannelsView: View {
|
||||
viewWidth = newWidth
|
||||
}
|
||||
}
|
||||
.navigationTitle(String(localized: "subscriptions.channels.title"))
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "subscriptions.channels.title"))
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
.searchable(text: $searchText, prompt: Text(String(localized: "channels.search.placeholder")))
|
||||
.toolbar {
|
||||
|
||||
@@ -214,8 +214,8 @@ struct SubscriptionsView: View {
|
||||
await feedCache.refresh(using: appEnvironment)
|
||||
LoggingService.shared.info("Pull-to-refresh completed", category: .general)
|
||||
}
|
||||
.navigationTitle(String(localized: "tabs.subscriptions"))
|
||||
#if !os(tvOS)
|
||||
.navigationTitle(String(localized: "tabs.subscriptions"))
|
||||
.toolbarTitleDisplayMode(.inlineLarge)
|
||||
#endif
|
||||
.toolbar {
|
||||
|
||||
Reference in New Issue
Block a user