mirror of
https://github.com/yattee/yattee.git
synced 2026-06-04 13:54:19 +00:00
Give TVSidebarDetailContainer an optional bottom action slot and use it to show the Add Source button beside the sources list on tvOS. Switch the Settings > Sources list from a focus-capturing List to the same ScrollView+LazyVStack layout MediaSourcesView already uses, drop .buttonStyle(.card) so row icons no longer clip, and bump the row icon-to-title spacing to 24pt. Replace the sheet-based Add/Edit flow in MediaSourcesView with navigationDestinations wrapped in the sidebar container, and decorate each Add Source form (WebDAV, SMB, remote server, PeerTube browse) with its own sidebar icon and title.
222 lines
7.8 KiB
Swift
222 lines
7.8 KiB
Swift
//
|
|
// AddSourceView.swift
|
|
// Yattee
|
|
//
|
|
// Selection screen for adding new sources. Presents a list of source types
|
|
// with NavigationLinks to dedicated forms for each type.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct AddSourceView: View {
|
|
@Environment(\.dismiss) private var dismiss
|
|
@Environment(\.appEnvironment) private var appEnvironment
|
|
|
|
// Network discovery sheet
|
|
@State private var showingNetworkDiscovery = false
|
|
@State private var selectedShareType: DiscoveredShare.ShareType?
|
|
|
|
// Navigation destinations from network discovery
|
|
@State private var navigateToWebDAV = false
|
|
@State private var navigateToSMB = false
|
|
@State private var discoveredWebDAVURL: URL?
|
|
@State private var discoveredSMBServer: String?
|
|
@State private var discoveredName: String?
|
|
@State private var discoveredAllowInvalidCerts = false
|
|
|
|
var body: some View {
|
|
#if os(tvOS)
|
|
listContent
|
|
.navigationDestination(isPresented: $navigateToWebDAV) {
|
|
TVSidebarDetailContainer(
|
|
systemImage: "externaldrive.connected.to.line.below",
|
|
title: String(localized: "sources.addWebDAV")
|
|
) {
|
|
AddWebDAVView(
|
|
prefillURL: discoveredWebDAVURL,
|
|
prefillName: discoveredName,
|
|
prefillAllowInvalidCertificates: discoveredAllowInvalidCerts
|
|
)
|
|
}
|
|
}
|
|
.navigationDestination(isPresented: $navigateToSMB) {
|
|
TVSidebarDetailContainer(
|
|
systemImage: "server.rack",
|
|
title: String(localized: "sources.addSMB")
|
|
) {
|
|
AddSMBView(
|
|
prefillServer: discoveredSMBServer,
|
|
prefillName: discoveredName
|
|
)
|
|
}
|
|
}
|
|
.sheet(isPresented: $showingNetworkDiscovery) {
|
|
NetworkShareDiscoverySheet(filterType: selectedShareType) { share in
|
|
handleSelectedShare(share)
|
|
}
|
|
}
|
|
#else
|
|
NavigationStack {
|
|
listContent
|
|
.navigationTitle(String(localized: "sources.newSource"))
|
|
#if os(iOS)
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
#endif
|
|
.toolbar {
|
|
ToolbarItem(placement: .confirmationAction) {
|
|
Button(role: .cancel) {
|
|
dismiss()
|
|
} label: {
|
|
Label(String(localized: "common.close"), systemImage: "xmark")
|
|
.labelStyle(.iconOnly)
|
|
}
|
|
}
|
|
}
|
|
.navigationDestination(isPresented: $navigateToWebDAV) {
|
|
AddWebDAVView(
|
|
prefillURL: discoveredWebDAVURL,
|
|
prefillName: discoveredName,
|
|
prefillAllowInvalidCertificates: discoveredAllowInvalidCerts,
|
|
dismissSheet: dismiss
|
|
)
|
|
}
|
|
.navigationDestination(isPresented: $navigateToSMB) {
|
|
AddSMBView(
|
|
prefillServer: discoveredSMBServer,
|
|
prefillName: discoveredName,
|
|
dismissSheet: dismiss
|
|
)
|
|
}
|
|
}
|
|
.sheet(isPresented: $showingNetworkDiscovery) {
|
|
NetworkShareDiscoverySheet(filterType: selectedShareType) { share in
|
|
handleSelectedShare(share)
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
private var listContent: some View {
|
|
List {
|
|
Section {
|
|
#if !os(tvOS)
|
|
NavigationLink {
|
|
AddLocalFolderView(dismissSheet: dismiss)
|
|
} label: {
|
|
Label(String(localized: "sources.addLocalFolder"), systemImage: "folder")
|
|
}
|
|
#endif
|
|
|
|
NavigationLink {
|
|
#if os(tvOS)
|
|
TVSidebarDetailContainer(
|
|
systemImage: "externaldrive.connected.to.line.below",
|
|
title: String(localized: "sources.addWebDAV")
|
|
) {
|
|
AddWebDAVView()
|
|
}
|
|
#else
|
|
AddWebDAVView(dismissSheet: dismiss)
|
|
#endif
|
|
} label: {
|
|
Label(String(localized: "sources.addWebDAV"), systemImage: "externaldrive.connected.to.line.below")
|
|
}
|
|
|
|
NavigationLink {
|
|
#if os(tvOS)
|
|
TVSidebarDetailContainer(
|
|
systemImage: "server.rack",
|
|
title: String(localized: "sources.addSMB")
|
|
) {
|
|
AddSMBView()
|
|
}
|
|
#else
|
|
AddSMBView(dismissSheet: dismiss)
|
|
#endif
|
|
} label: {
|
|
Label(String(localized: "sources.addSMB"), systemImage: "server.rack")
|
|
}
|
|
|
|
NavigationLink {
|
|
#if os(tvOS)
|
|
TVSidebarDetailContainer(
|
|
systemImage: "globe",
|
|
title: String(localized: "sources.addRemoteServer")
|
|
) {
|
|
AddRemoteServerView()
|
|
}
|
|
#else
|
|
AddRemoteServerView(dismissSheet: dismiss)
|
|
#endif
|
|
} label: {
|
|
Label(String(localized: "sources.addRemoteServer"), systemImage: "globe")
|
|
}
|
|
|
|
NavigationLink {
|
|
#if os(tvOS)
|
|
TVSidebarDetailContainer(
|
|
systemImage: "globe",
|
|
title: String(localized: "sources.browsePeerTube")
|
|
) {
|
|
if let appEnvironment {
|
|
PeerTubeInstancesExploreView()
|
|
.appEnvironment(appEnvironment)
|
|
}
|
|
}
|
|
#else
|
|
if let appEnvironment {
|
|
PeerTubeInstancesExploreView()
|
|
.appEnvironment(appEnvironment)
|
|
}
|
|
#endif
|
|
} label: {
|
|
Label {
|
|
Text(String(localized: "sources.browsePeerTube"))
|
|
} icon: {
|
|
Image("peertube")
|
|
.resizable()
|
|
.aspectRatio(contentMode: .fit)
|
|
.frame(width: 24, height: 24)
|
|
}
|
|
}
|
|
}
|
|
|
|
Section {
|
|
Button {
|
|
selectedShareType = nil
|
|
showingNetworkDiscovery = true
|
|
} label: {
|
|
Label(String(localized: "discovery.scanNetwork"), systemImage: "wifi")
|
|
}
|
|
#if os(tvOS)
|
|
.buttonStyle(TVSettingsButtonStyle())
|
|
#endif
|
|
} footer: {
|
|
Text(String(localized: "sources.footer.discovery"))
|
|
}
|
|
}
|
|
}
|
|
|
|
private func handleSelectedShare(_ share: DiscoveredShare) {
|
|
discoveredName = share.name
|
|
|
|
switch share.type {
|
|
case .webdav, .webdavs:
|
|
discoveredWebDAVURL = share.url
|
|
discoveredAllowInvalidCerts = share.type == .webdavs
|
|
navigateToWebDAV = true
|
|
|
|
case .smb:
|
|
discoveredSMBServer = share.host
|
|
navigateToSMB = true
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Preview
|
|
|
|
#Preview {
|
|
AddSourceView()
|
|
.appEnvironment(.preview)
|
|
}
|