Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 02:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Locations manifest, reorganized instances settings

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-07-01 23:28:32 +02:00
parent 6f62f14adf
commit 4fcf57d755
28 changed files with 686 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tvOS/AccountSelectionView.swift
View File

@@ -11,13 +11,13 @@ struct AccountSelectionView: View {
@Default(.instances) private var instances
var body: some View {
Section(header: Text(showHeader ? "Current Account" : "")) {
Button(accountButtonTitle(account: accountsModel.current, long: true)) {
Section(header: Text(showHeader ? "Current Location" : "")) {
Button(accountButtonTitle(account: accountsModel.current)) {
if let account = nextAccount {
accountsModel.setCurrent(account)
}
}
.disabled(instances.isEmpty)
.disabled(instances.isEmpty && Defaults[.countryOfPublicInstances].isNil)
.contextMenu {
ForEach(allAccounts) { account in
Button(accountButtonTitle(account: account)) {
@@ -32,20 +32,18 @@ struct AccountSelectionView: View {
}
var allAccounts: [Account] {
accounts + instances.map(\.anonymousAccount)
accounts + instances.map(\.anonymousAccount) + [accountsModel.publicAccount].compactMap { $0 }
}
private var nextAccount: Account? {
allAccounts.next(after: accountsModel.current)
}
func accountButtonTitle(account: Account! = nil, long: Bool = false) -> String {
func accountButtonTitle(account: Account! = nil) -> String {
guard account != nil else {
return "Not selected"
}
let instanceDescription = long ? account.instance.longDescription : account.instance.description
return instances.count > 1 ? "\(account.description) — \(instanceDescription)" : account.description
return account.isPublic ? account.description : "\(account.description) — \(account.instance.shortDescription)"
}
}

4
tvOS/TVNavigationView.swift
View File

@@ -6,6 +6,7 @@ struct TVNavigationView: View {
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<RecentsModel> private var recents
@EnvironmentObject<SettingsModel> private var settings
@Default(.visibleSections) private var visibleSections
@@ -36,7 +37,7 @@ struct TVNavigationView: View {
.tag(TabSelection.trending)
}
if visibleSections.contains(.playlists), accounts.app.supportsUserPlaylists {
if visibleSections.contains(.playlists), accounts.app.supportsUserPlaylists, accounts.signedIn {
PlaylistsView()
.tabItem { Text("Playlists") }
.tag(TabSelection.playlists)
@@ -56,7 +57,6 @@ struct TVNavigationView: View {
.tag(TabSelection.settings)
}
}
.fullScreenCover(isPresented: $navigation.presentingSettings) { SettingsView() }
.fullScreenCover(isPresented: $navigation.presentingAddToPlaylist) {
if let video = navigation.videoToAddToPlaylist {
AddToPlaylistView(video: video)