Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-09 20:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS 14/macOS Big Sur Support

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-11-28 15:37:55 +01:00
parent 696751e07c
commit 5ef89ac9f4
57 changed files with 1147 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Shared/Navigation/AccountsMenuView.swift
View File

@@ -15,13 +15,25 @@ struct AccountsMenuView: View {
}
}
} label: {
Label(model.current?.description ?? "Select Account", systemImage: "person.crop.circle")
.labelStyle(.titleAndIcon)
if #available(iOS 15.0, macOS 12.0, *) {
label
.labelStyle(.titleAndIcon)
} else {
HStack {
Image(systemName: "person.crop.circle")
label
.labelStyle(.titleOnly)
}
}
}
.disabled(instances.isEmpty)
.transaction { t in t.animation = .none }
}
private var label: some View {
Label(model.current?.description ?? "Select Account", systemImage: "person.crop.circle")
}
private var allAccounts: [Account] {
accounts + instances.map(\.anonymousAccount)
}

1
Shared/Navigation/AppSidebarPlaylists.swift
View File

@@ -12,6 +12,7 @@ struct AppSidebarPlaylists: View {
LazyView(PlaylistVideosView(playlist))
} label: {
Label(playlist.title, systemImage: AppSidebarNavigation.symbolSystemImage(playlist.title))
.backport
.badge(Text("\(playlist.videos.count)"))
}
.id(playlist.id)

1
Shared/Navigation/AppSidebarSubscriptions.swift
View File

@@ -18,7 +18,6 @@ struct AppSidebarSubscriptions: View {
navigation.presentUnsubscribeAlert(channel)
}
}
.modifier(UnsubscribeAlertModifier())
.id("channel\(channel.id)")
}
}

27
Shared/Navigation/AppTabNavigation.swift
View File

@@ -41,6 +41,8 @@ struct AppTabNavigation: View {
} else {
trendingNavigationView
}
} else {
trendingNavigationView
}
} else {
if accounts.app.supportsPopular {
@@ -62,26 +64,7 @@ struct AppTabNavigation: View {
}
NavigationView {
LazyView(
SearchView()
.toolbar { toolbarContent }
.searchable(text: $search.queryText, placement: .navigationBarDrawer(displayMode: .always)) {
ForEach(search.querySuggestions.collection, id: \.self) { suggestion in
Text(suggestion)
.searchCompletion(suggestion)
}
}
.onChange(of: search.queryText) { query in
search.loadSuggestions(query)
}
.onSubmit(of: .search) {
search.changeQuery { query in
query.query = search.queryText
}
recents.addQuery(search.queryText)
}
)
LazyView(SearchView())
}
.tabItem {
Label("Search", systemImage: "magnifyingglass")
@@ -129,7 +112,7 @@ struct AppTabNavigation: View {
.toolbar { toolbarContent }
}
.tabItem {
Label("Popular", systemImage: "chart.bar")
Label("Popular", systemImage: "arrow.up.right.circle")
.accessibility(label: Text("Popular"))
}
.tag(TabSelection.popular)
@@ -141,7 +124,7 @@ struct AppTabNavigation: View {
.toolbar { toolbarContent }
}
.tabItem {
Label("Trending", systemImage: "chart.line.uptrend.xyaxis")
Label("Trending", systemImage: "chart.bar")
.accessibility(label: Text("Trending"))
}
.tag(TabSelection.trending)

6
Shared/Navigation/Sidebar.swift
View File

@@ -46,7 +46,7 @@ struct Sidebar: View {
}
var mainNavigationLinks: some View {
Section("Videos") {
Section(header: Text("Videos")) {
NavigationLink(destination: LazyView(FavoritesView()), tag: TabSelection.favorites, selection: $navigation.tabSelection) {
Label("Favorites", systemImage: "heart")
.accessibility(label: Text("Favorites"))
@@ -60,13 +60,13 @@ struct Sidebar: View {
if accounts.app.supportsPopular {
NavigationLink(destination: LazyView(PopularView()), tag: TabSelection.popular, selection: $navigation.tabSelection) {
Label("Popular", systemImage: "chart.bar")
Label("Popular", systemImage: "arrow.up.right.circle")
.accessibility(label: Text("Popular"))
}
}
NavigationLink(destination: LazyView(TrendingView()), tag: TabSelection.trending, selection: $navigation.tabSelection) {
Label("Trending", systemImage: "chart.line.uptrend.xyaxis")
Label("Trending", systemImage: "chart.bar")
.accessibility(label: Text("Trending"))
}