Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-07-21 06:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove media sources as Home sections (shortcuts-only)

Browse Source 
A media-source "section" only rendered as a full-width "Browse {name}"
link, identical for all source types and redundant with the shortcut
card. Remove it from the Available Sections add-list and clean up any
already-added media-source sections on load.

Keep HomeSectionItem.mediaSource as a decode-only case so existing saved
homeSectionOrder data (decoded all-or-nothing) still parses; strip those
entries via removeAllHomeMediaSourceSections(). Media-source shortcuts
are unchanged.
This commit is contained in:
Arkadiusz Fal
2026-06-11 20:16:00 +02:00
parent 8d556abd0b
commit d7df883d6f
5 changed files with 102 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Yattee/Views/Home/HomeSettingsView.swift
View File

@@ -27,7 +27,6 @@ struct HomeSettingsView: View {
@State private var availableShortcutsByInstance: [(instance: Instance, cards: [HomeShortcutItem])] = []
@State private var availableSectionsByInstance: [(instance: Instance, sections: [HomeSectionItem])] = []
@State private var availableShortcutsByMediaSource: [(source: MediaSource, cards: [HomeShortcutItem])] = []
@State private var availableSectionsByMediaSource: [(source: MediaSource, sections: [HomeSectionItem])] = []
// Edit mode for delete functionality
@State private var isEditMode = false
@@ -238,7 +237,7 @@ struct HomeSettingsView: View {
private var availableSectionsSection: some View {
Section {
if availableSectionsByInstance.isEmpty && availableSectionsByMediaSource.isEmpty {
if availableSectionsByInstance.isEmpty {
Text(String(localized: "home.settings.availableSections.empty"))
.foregroundStyle(.secondary)
.italic()
@@ -248,11 +247,6 @@ struct HomeSettingsView: View {
availableSectionRow(for: section, instance: item.instance)
}
}
ForEach(availableSectionsByMediaSource, id: \.source.id) { item in
ForEach(item.sections) { section in
availableMediaSourceSectionRow(for: section, source: item.source)
}
}
}
} header: {
Text(String(localized: "home.settings.availableSections.header"))
@@ -350,7 +344,6 @@ struct HomeSettingsView: View {
let sources = env.mediaSourcesManager.sources
availableShortcutsByMediaSource = settings.allAvailableMediaSourceShortcuts(sources: sources)
availableSectionsByMediaSource = settings.allAvailableMediaSourceSections(sources: sources)
}
private func saveSettingsIfLoaded() {
@@ -407,16 +400,14 @@ struct HomeSettingsView: View {
switch section {
case .instanceContent(let instanceID, let contentType):
settingsManager?.addToHome(instanceID: instanceID, contentType: contentType, asCard: false)
case .mediaSource(let sourceID):
settingsManager?.addToHome(sourceID: sourceID, asCard: false)
default:
break
}
// Reload available items
loadSettings()
}
private func removeShortcut(_ card: HomeShortcutItem) {
// Remove from local state
shortcutOrder.removeAll { $0.id == card.id }
@@ -445,16 +436,14 @@ struct HomeSettingsView: View {
switch section {
case .instanceContent(let instanceID, let contentType):
settingsManager?.removeFromHome(instanceID: instanceID, contentType: contentType)
case .mediaSource(let sourceID):
settingsManager?.removeFromHome(sourceID: sourceID)
default:
break
}
// Reload available items
loadSettings()
}
private func canDelete(shortcut: HomeShortcutItem) -> Bool {
if case .instanceContent = shortcut {
return true
@@ -469,9 +458,6 @@ struct HomeSettingsView: View {
if case .instanceContent = section {
return true
}
if case .mediaSource = section {
return true
}
return false
}
@@ -579,35 +565,6 @@ struct HomeSettingsView: View {
}
}
}
case .mediaSource(let sourceID):
if let source = appEnvironment?.mediaSourcesManager.sources.first(where: { $0.id == sourceID }) {
let isDisabled = !source.isEnabled
HomeItemRow(
icon: source.type.systemImage,
title: "\(source.name) (\(source.type.displayName))",
isVisible: sectionBinding(for: section),
isDisabled: isDisabled,
disabledReason: isDisabled ? String(localized: "home.settings.sourceDisabled") : nil
)
#if os(iOS)
.swipeActions(edge: .trailing, allowsFullSwipe: true) {
Button(role: .destructive) {
removeSection(section)
} label: {
Label(String(localized: "home.settings.remove"), systemImage: "trash")
}
.tint(.red)
}
#endif
.contextMenu {
Button(role: .destructive) {
removeSection(section)
} label: {
Label(String(localized: "home.settings.remove"), systemImage: "trash")
}
}
}
default:
HomeItemRow(
icon: section.icon,
@@ -616,7 +573,7 @@ struct HomeSettingsView: View {
)
}
}
@ViewBuilder
private func availableShortcutRow(for card: HomeShortcutItem, instance: Instance) -> some View {
if case .instanceContent(_, let contentType) = card {
@@ -728,37 +685,6 @@ struct HomeSettingsView: View {
#endif
}
}
@ViewBuilder
private func availableMediaSourceSectionRow(for section: HomeSectionItem, source: MediaSource) -> some View {
if case .mediaSource = section {
let isDisabled = !source.isEnabled
HStack {
Image(systemName: source.type.systemImage)
.frame(width: 24)
.foregroundStyle(isDisabled ? .tertiary : .secondary)
Text("\(source.name) (\(source.type.displayName))")
.foregroundStyle(isDisabled ? .tertiary : .primary)
Spacer()
Button {
addSection(section)
} label: {
Image(systemName: "plus.circle.fill")
.foregroundStyle(.green)
.imageScale(.large)
}
.buttonStyle(.plain)
.disabled(isDisabled)
}
#if !os(tvOS)
.help(isDisabled ? String(localized: "home.settings.sourceDisabled") : "")
#endif
}
}
}
// MARK: - Home Item Row