Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 13:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve sections visibility

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-11-11 20:34:20 +01:00
parent 4c2d473caa
commit fa0523d3c6
9 changed files with 71 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Model/Accounts/AccountsModel.swift
View File

@ -49,10 +49,6 @@ final class AccountsModel: ObservableObject {
!isEmpty && !current.anonymous && api.signedIn
}
var isDemo: Bool {
false
}
init() {
cancellables.append(
invidious.objectWillChange.sink { [weak self] _ in self?.objectWillChange.send() }
@ -80,6 +76,7 @@ final class AccountsModel: ObservableObject {
current = account
guard !account.isNil else {
current = nil
return
}

2
Shared/Navigation/AppTabNavigation.swift
View File

@ -39,8 +39,10 @@ struct AppTabNavigation: View {
playlistsNavigationView
}
if !accounts.isEmpty {
searchNavigationView
}
}
.id(accounts.current?.id ?? "")
.overlay(playlistView)
.overlay(channelView)

2
Shared/Navigation/Sidebar.swift
View File

@ -73,6 +73,7 @@ struct Sidebar: View {
.id("trending")
}
if !accounts.isEmpty {
NavigationLink(destination: LazyView(SearchView()), tag: TabSelection.search, selection: $navigation.tabSelection) {
Label("Search", systemImage: "magnifyingglass")
.accessibility(label: Text("Search"))
@ -81,6 +82,7 @@ struct Sidebar: View {
.keyboardShortcut("f")
}
}
}
private func scrollScrollViewToItem(scrollView: ScrollViewProxy, for selection: TabSelection) {
if case .recentlyOpened = selection {

4
Shared/Settings/AdvancedSettings.swift
View File

@ -46,6 +46,10 @@ struct AdvancedSettings: View {
InstancesManifest.shared.setPublicAccount(newCountry, accounts: accounts, asCurrent: accounts.current?.isPublic ?? true)
}
.onChange(of: instancesManifest) { _ in
countryOfPublicInstances = nil
if let account = accounts.current, account.isPublic {
accounts.setCurrent(nil)
}
countries.removeAll()
}
.sheet(isPresented: $presentingInstanceForm) {

5
Shared/Settings/PlayerSettings.swift
View File

@ -62,7 +62,9 @@ struct PlayerSettings: View {
private var sections: some View {
Group {
Section(header: SettingsHeader(text: "Playback".localized())) {
if !accounts.isEmpty {
sourcePicker
}
pauseOnHidingPlayerToggle
#if !os(macOS)
pauseOnEnteringBackgroundToogle
@ -97,9 +99,8 @@ struct PlayerSettings: View {
sidebarPicker
#endif
if !accounts.isEmpty {
keywordsToggle
if !accounts.isDemo {
returnYouTubeDislikeToggle
}
}

28
Shared/Settings/SettingsView.swift
View File

@ -10,7 +10,7 @@ struct SettingsView: View {
case browsing, player, quality, history, sponsorBlock, advanced, help
}
@State private var selection = Tabs.browsing
@State private var selection: Tabs?
#endif
@Environment(\.colorScheme) private var colorScheme
@ -34,13 +34,15 @@ struct SettingsView: View {
var settings: some View {
#if os(macOS)
TabView(selection: $selection) {
if !accounts.isEmpty {
Form {
BrowsingSettings()
}
.tabItem {
Label("Browsing", systemImage: "list.and.film")
}
.tag(Tabs.browsing)
.tag(Optional(Tabs.browsing))
}
Form {
PlayerSettings()
@ -48,7 +50,7 @@ struct SettingsView: View {
.tabItem {
Label("Player", systemImage: "play.rectangle")
}
.tag(Tabs.player)
.tag(Optional(Tabs.player))
Form {
QualitySettings()
@ -56,7 +58,7 @@ struct SettingsView: View {
.tabItem {
Label("Quality", systemImage: "4k.tv")
}
.tag(Tabs.quality)
.tag(Optional(Tabs.quality))
Form {
HistorySettings()
@ -64,15 +66,17 @@ struct SettingsView: View {
.tabItem {
Label("History", systemImage: "clock.arrow.circlepath")
}
.tag(Tabs.history)
.tag(Optional(Tabs.history))
if !accounts.isEmpty {
Form {
SponsorBlockSettings()
}
.tabItem {
Label("SponsorBlock", systemImage: "dollarsign.circle")
}
.tag(Tabs.sponsorBlock)
.tag(Optional(Tabs.sponsorBlock))
}
Group {
AdvancedSettings()
@ -80,7 +84,7 @@ struct SettingsView: View {
.tabItem {
Label("Advanced", systemImage: "wrench.and.screwdriver")
}
.tag(Tabs.advanced)
.tag(Optional(Tabs.advanced))
Form {
Help()
@ -88,7 +92,7 @@ struct SettingsView: View {
.tabItem {
Label("Help", systemImage: "questionmark.circle")
}
.tag(Tabs.help)
.tag(Optional(Tabs.help))
}
.padding(20)
.frame(width: 600, height: windowHeight)
@ -106,8 +110,10 @@ struct SettingsView: View {
var settingsList: some View {
List {
#if os(tvOS)
if !accounts.isEmpty {
AccountSelectionView()
Divider()
}
#endif
Section {
@ -119,11 +125,13 @@ struct SettingsView: View {
}
#endif
if !accounts.isEmpty {
NavigationLink {
BrowsingSettings()
} label: {
Label("Browsing", systemImage: "list.and.film")
}
}
NavigationLink {
PlayerSettings()
@ -143,11 +151,13 @@ struct SettingsView: View {
Label("History", systemImage: "clock.arrow.circlepath")
}
if !accounts.isEmpty {
NavigationLink {
SponsorBlockSettings()
} label: {
Label("SponsorBlock", systemImage: "dollarsign.circle")
}
}
NavigationLink {
AdvancedSettings()
@ -210,6 +220,8 @@ struct SettingsView: View {
#if os(macOS)
private var windowHeight: Double {
switch selection {
case nil:
return accounts.isEmpty ? 680 : 400
case .browsing:
return 400
case .player:

2
Shared/Views/ShareButton.swift
View File

@ -19,7 +19,7 @@ struct ShareButton: View {
} else {
instanceActions
Divider()
if !accounts.isDemo {
if !accounts.isEmpty {
youtubeActions
}
}

4
macOS/InstancesSettings.swift
View File

@ -35,7 +35,7 @@ struct InstancesSettings: View {
Spacer()
}
if !selectedInstance.isNil, selectedInstance.app.supportsAccounts, !accounts.isDemo {
if !selectedInstance.isNil, selectedInstance.app.supportsAccounts {
SettingsHeader(text: "Accounts".localized())
let list = List(selection: $selectedAccount) {
@ -114,13 +114,11 @@ struct InstancesSettings: View {
if selectedInstance != nil {
HStack {
if !accounts.isDemo {
Button("Add Account...") {
selectedAccount = nil
presentingAccountForm = true
}
.disabled(!selectedInstance.app.supportsAccounts)
}
Spacer()

2
tvOS/TVNavigationView.swift
View File

@ -47,9 +47,11 @@ struct TVNavigationView: View {
.tabItem { Text("Now Playing") }
.tag(TabSelection.nowPlaying)
if !accounts.isEmpty {
LazyView(SearchView())
.tabItem { Image(systemName: "magnifyingglass") }
.tag(TabSelection.search)
}
LazyView(SettingsView())
.tabItem { Image(systemName: "gear") }