Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-10-23 13:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hold the Accounts settings entry until a source can hold an account

Browse Source
This commit is contained in:
Arkadiusz Fal
2026-09-16 22:45:41 +02:00
parent f6fde48767
commit b413648ab9
2 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Yattee/Views/Settings/AccountsListView.swift
View File

@@ -466,6 +466,20 @@ struct AccountsListView: View {
return parts.joined(separator: " · ")
}
/// Whether Settings should offer the entry at all.
///
/// With no Invidious/Piped source added there is nothing this screen can
/// do but explain itself, so the row waits for the first account-capable
/// source. Existing accounts keep it visible regardless — an orphan whose
/// source was deleted can only be cleaned up from here.
@MainActor
static func showsSettingsEntry(in appEnvironment: AppEnvironment?) -> Bool {
guard let appEnvironment else { return false }
return appEnvironment.instancesManager.hasAccountCapableInstances
|| !appEnvironment.accountsManager.accounts.isEmpty
}
/// Whether the settings entry should carry an attention badge.
///
/// Both states the user can only clear from this screen: an orphan nothing

54
Yattee/Views/Settings/SettingsView.swift
View File

@@ -31,10 +31,18 @@ struct SettingsView: View {
// MARK: - macOS Settings
#if os(macOS)
/// Accounts stays out of the list until a source that can hold one exists
/// (or an account survives its source and needs cleaning up).
private var visibleSections: [SettingsSection] {
SettingsSection.allCases.filter {
$0 != .accounts || AccountsListView.showsSettingsEntry(in: appEnvironment)
}
}
private var macOSSettings: some View {
NavigationSplitView {
VStack(spacing: 0) {
List(SettingsSection.allCases, selection: $selectedSection) { section in
List(visibleSections, selection: $selectedSection) { section in
HStack {
Label(section.title, systemImage: section.icon)
@@ -138,19 +146,21 @@ struct SettingsView: View {
}
.accessibilityIdentifier("settings.row.sources")
NavigationLink {
AccountsListView()
} label: {
HStack {
Label(String(localized: "accounts.title"), systemImage: "person.crop.circle")
Spacer()
if AccountsListView.needsAttention(in: appEnvironment) {
Image(systemName: "exclamationmark.circle.fill")
.foregroundStyle(.orange)
if AccountsListView.showsSettingsEntry(in: appEnvironment) {
NavigationLink {
AccountsListView()
} label: {
HStack {
Label(String(localized: "accounts.title"), systemImage: "person.crop.circle")
Spacer()
if AccountsListView.needsAttention(in: appEnvironment) {
Image(systemName: "exclamationmark.circle.fill")
.foregroundStyle(.orange)
}
}
}
.accessibilityIdentifier("settings.row.accounts")
}
.accessibilityIdentifier("settings.row.accounts")
NavigationLink {
TVSidebarDetailContainer(systemImage: "icloud", title: String(localized: "settings.icloud.title")) { iCloudSettingsView() }
@@ -254,19 +264,21 @@ struct SettingsView: View {
}
.accessibilityIdentifier("settings.row.sources")
NavigationLink {
AccountsListView()
} label: {
HStack {
Label(String(localized: "accounts.title"), systemImage: "person.crop.circle")
Spacer()
if AccountsListView.needsAttention(in: appEnvironment) {
Image(systemName: "exclamationmark.circle.fill")
.foregroundStyle(.orange)
if AccountsListView.showsSettingsEntry(in: appEnvironment) {
NavigationLink {
AccountsListView()
} label: {
HStack {
Label(String(localized: "accounts.title"), systemImage: "person.crop.circle")
Spacer()
if AccountsListView.needsAttention(in: appEnvironment) {
Image(systemName: "exclamationmark.circle.fill")
.foregroundStyle(.orange)
}
}
}
.accessibilityIdentifier("settings.row.accounts")
}
.accessibilityIdentifier("settings.row.accounts")
}
Section {