mirror of
https://github.com/home-assistant/iOS.git
synced 2026-02-05 06:35:37 -06:00
## Summary
Migrates SettingsViewController from UIKit/Eureka to SwiftUI. macOS uses
NavigationSplitView (sidebar + detail), iOS uses NavigationStack with
list navigation.
**Changes:**
- **SettingsView.swift** (new): SwiftUI implementation with
platform-specific navigation
- macOS: Sidebar with setting categories, NavigationStack in detail pane
- iOS: List-based navigation with NavigationStack
- Platform filtering: macOS hides gestures, watch, CarPlay, NFC, help,
whatsNew
- Supports `contentSections` parameter for filtering displayed sections
(defaults to `.all`)
- ServersObserver for real-time server updates via ServerObserver
protocol
- Wrapper views embed UIKit controllers not yet migrated (location,
notifications, NFC, complications, actions)
- **SettingsItem.swift**: Enhanced with `visibleCases(for:)` method to
filter items based on contentSections parameter
- **SettingsSceneDelegate.swift**: Simplified from 189→36 lines
- Returns SwiftUI SettingsView for all platforms
- Removed UINavigationController management, NSToolbar delegate
- **WebViewController.swift**, **WebViewExternalMessageHandler.swift**,
**ConnectionSecurityLevelBlockView.swift**: Updated to present SwiftUI
SettingsView
- **SettingsViewController.swift**: Deleted (253 lines removed) - all
functionality migrated to SwiftUI
Example usage with content filtering:
```swift
// Show all sections (default)
SettingsView()
// Show only servers section
SettingsView(contentSections: .servers)
```
Example navigation on macOS:
```swift
NavigationSplitView {
List(selection: $selectedItem) {
ForEach(SettingsItem.visibleCases(for: contentSections)) { item in
NavigationLink(value: item) {
Label(item.title) { item.icon }
}
}
}
} detail: {
NavigationStack {
if let selectedItem {
selectedItem.destinationView
}
}
}
```
## Screenshots
## Link to pull request in Documentation repository
Documentation: home-assistant/companion.home-assistant#
## Any other notes
Complete migration from UIKit/Eureka to SwiftUI with full feature parity
including contentSections support. UIKit controllers
(SettingsDetailViewController, NotificationSettingsViewController, etc.)
remain embedded via `embed()` function until individually migrated.
<!-- START COPILOT CODING AGENT SUFFIX -->
<details>
<summary>Original prompt</summary>
> Migrate SettingsViewController to SwiftUI, on macOS it should be a
split view (sidebar + content). If needed to embed UIKit controllers in
the middle use "embed(<UIViewController>)"
</details>
<!-- START COPILOT CODING AGENT TIPS -->
---
💬 We'd love your input! Share your thoughts on Copilot coding agent in
our [2 minute survey](https://gh.io/copilot-coding-agent-survey).
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: bgoncal <5808343+bgoncal@users.noreply.github.com>
256 lines
9.1 KiB
Swift
256 lines
9.1 KiB
Swift
import SFSafeSymbols
|
|
import Shared
|
|
import SwiftUI
|
|
|
|
struct ConnectionSecurityLevelBlockView: View {
|
|
@Environment(\.dismiss) private var dismiss
|
|
@StateObject private var viewModel: ConnectionSecurityLevelBlockViewModel
|
|
|
|
@State private var showSettings = false
|
|
@State private var showHomeNetworkSettings = false
|
|
@State private var showConnectionSecurityPreferences = false
|
|
|
|
let server: Server
|
|
|
|
private let learnMoreLink = AppConstants.WebURLs.companionAppConnectionSecurityLevel
|
|
|
|
init(server: Server) {
|
|
self._viewModel = .init(wrappedValue: ConnectionSecurityLevelBlockViewModel(server: server))
|
|
self.server = server
|
|
}
|
|
|
|
var body: some View {
|
|
NavigationView {
|
|
ScrollView {
|
|
content
|
|
}
|
|
.navigationViewStyle(.stack)
|
|
.toolbar {
|
|
ToolbarItem(placement: .topBarLeading) {
|
|
Button {
|
|
reload()
|
|
} label: {
|
|
Image(systemSymbol: .arrowClockwise)
|
|
}
|
|
}
|
|
ToolbarItem(placement: .topBarTrailing) {
|
|
if !viewModel.requirements.isEmpty {
|
|
Link(destination: learnMoreLink) {
|
|
Image(systemSymbol: .questionmark)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.safeAreaInset(edge: .bottom) {
|
|
bottomButtons
|
|
}
|
|
.onAppear {
|
|
viewModel.loadRequirements()
|
|
}
|
|
#if targetEnvironment(macCatalyst)
|
|
.fullScreenCover(isPresented: $showHomeNetworkSettings) {
|
|
homeNetworkView
|
|
}
|
|
.fullScreenCover(isPresented: $showConnectionSecurityPreferences) {
|
|
connectionPreferencesView
|
|
}
|
|
.fullScreenCover(isPresented: $showSettings) {
|
|
settingsView
|
|
}
|
|
#else
|
|
.sheet(isPresented: $showHomeNetworkSettings) {
|
|
homeNetworkView
|
|
}
|
|
.sheet(isPresented: $showConnectionSecurityPreferences) {
|
|
connectionPreferencesView
|
|
}
|
|
.sheet(isPresented: $showSettings) {
|
|
settingsView
|
|
}
|
|
#endif
|
|
.onReceive(NotificationCenter.default.publisher(for: .locationPermissionDidChange)) { notification in
|
|
if let userInfo = notification.userInfo {
|
|
let state = LocationPermissionState(userInfo: userInfo)
|
|
switch state {
|
|
case .notDetermined:
|
|
Current.Log.info("Location permission not determined")
|
|
case .denied, .restricted:
|
|
URLOpener.shared.open(
|
|
URL(string: UIApplication.openSettingsURLString)!,
|
|
options: [:],
|
|
completionHandler: nil
|
|
)
|
|
case .authorizedWhenInUse, .authorizedAlways:
|
|
// Handle permission change - reload requirements to update UI
|
|
viewModel.loadRequirements()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.navigationViewStyle(.stack)
|
|
}
|
|
|
|
private var settingsView: some View {
|
|
SettingsView()
|
|
.onDisappear {
|
|
Current.sceneManager.webViewWindowControllerPromise.then(\.webViewControllerPromise)
|
|
.done { webView in
|
|
dismiss()
|
|
webView.refresh()
|
|
}
|
|
}
|
|
}
|
|
|
|
private var content: some View {
|
|
VStack(spacing: DesignSystem.Spaces.two) {
|
|
Image(systemSymbol: .lockFill)
|
|
.resizable()
|
|
.foregroundStyle(.haPrimary)
|
|
.scaledToFit()
|
|
.frame(width: 80, height: 80)
|
|
Text(L10n.ConnectionSecurityLevelBlock.title)
|
|
.font(.title2)
|
|
.fontWeight(.semibold)
|
|
Text(L10n.ConnectionSecurityLevelBlock.body)
|
|
.font(.callout)
|
|
.foregroundColor(.secondary)
|
|
.multilineTextAlignment(.center)
|
|
.padding(.horizontal, DesignSystem.Spaces.two)
|
|
|
|
if viewModel.requirements.isEmpty {
|
|
Link(destination: learnMoreLink) {
|
|
Text(L10n.ConnectionSecurityLevelBlock.Requirement.LearnMore.title)
|
|
}
|
|
.buttonStyle(.secondaryButton)
|
|
} else {
|
|
VStack(alignment: .leading, spacing: DesignSystem.Spaces.two) {
|
|
Text(L10n.ConnectionSecurityLevelBlock.Requirement.title)
|
|
.font(DesignSystem.Font.callout.bold())
|
|
.foregroundStyle(.secondary)
|
|
ForEach(viewModel.requirements, id: \.self) { requirement in
|
|
requirementItem(systemSymbol: requirement.systemSymbol, title: requirement.title)
|
|
.onTapGesture {
|
|
switch requirement {
|
|
case .homeNetworkMissing:
|
|
showHomeNetworkSettings = true
|
|
case .locationPermission:
|
|
Current.locationManager.requestLocationPermission()
|
|
case .notOnHomeNetwork:
|
|
Current.Log.info("No action for notOnHomeNetwork requirement")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.frame(maxWidth: DesignSystem.Button.maxWidth)
|
|
.padding(.top)
|
|
}
|
|
}
|
|
.padding(DesignSystem.Spaces.three)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
.background(Color(uiColor: .systemBackground))
|
|
}
|
|
|
|
private func openSettings() {
|
|
if Current.isCatalyst {
|
|
Current.sceneManager.activateAnyScene(for: .settings)
|
|
} else {
|
|
showSettings = true
|
|
}
|
|
}
|
|
|
|
private func requirementItem(systemSymbol: SFSymbol, title: String) -> some View {
|
|
HStack {
|
|
Spacer()
|
|
Image(systemSymbol: systemSymbol)
|
|
.font(DesignSystem.Font.title2)
|
|
Text(title)
|
|
.font(DesignSystem.Font.callout)
|
|
Spacer()
|
|
}
|
|
.foregroundStyle(.haPrimary)
|
|
.frame(minHeight: 40)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding(DesignSystem.Spaces.one)
|
|
.background(.regularMaterial)
|
|
.clipShape(Capsule())
|
|
}
|
|
|
|
private var bottomButtons: some View {
|
|
VStack(spacing: DesignSystem.Spaces.one) {
|
|
Button(action: {
|
|
openSettings()
|
|
}) {
|
|
Text(L10n.ConnectionSecurityLevelBlock.OpenSettings.title)
|
|
}
|
|
.buttonStyle(.primaryButton)
|
|
Button(action: {
|
|
showConnectionSecurityPreferences = true
|
|
}) {
|
|
Text(L10n.ConnectionSecurityLevelBlock.ChangePreference.title)
|
|
}
|
|
.buttonStyle(.secondaryButton)
|
|
}
|
|
.frame(maxWidth: Sizes.maxWidthForLargerScreens)
|
|
.padding(.horizontal, DesignSystem.Spaces.two)
|
|
.padding(.top)
|
|
}
|
|
|
|
private var homeNetworkView: some View {
|
|
NavigationView(content: {
|
|
HomeNetworkInputView(onNext: { context in
|
|
server.update { info in
|
|
if let ssid = context.networkName {
|
|
info.connection.internalSSIDs = [ssid]
|
|
}
|
|
if let hardwareAddress = context.hardwareAddress {
|
|
info.connection.internalHardwareAddresses = [hardwareAddress]
|
|
}
|
|
|
|
showHomeNetworkSettings = false
|
|
}
|
|
})
|
|
.navigationViewStyle(.stack)
|
|
.toolbar {
|
|
ToolbarItem(placement: .topBarLeading) {
|
|
CloseButton {
|
|
showHomeNetworkSettings = false
|
|
}
|
|
}
|
|
}
|
|
})
|
|
.onDisappear {
|
|
reload()
|
|
}
|
|
}
|
|
|
|
private var connectionPreferencesView: some View {
|
|
NavigationView {
|
|
OnboardingPermissionsNavigationView(
|
|
onboardingServer: server,
|
|
steps: [.localAccess, .updatePreferencesSuccess]
|
|
)
|
|
.toolbar {
|
|
ToolbarItem(placement: .topBarLeading) {
|
|
CloseButton {
|
|
showConnectionSecurityPreferences = false
|
|
}
|
|
}
|
|
}
|
|
.navigationViewStyle(.stack)
|
|
}
|
|
.onDisappear {
|
|
reload()
|
|
}
|
|
}
|
|
|
|
private func reload() {
|
|
Current.sceneManager.webViewWindowControllerPromise.then(\.webViewControllerPromise).done { webView in
|
|
webView.refresh()
|
|
}
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
ConnectionSecurityLevelBlockView(server: ServerFixture.standard)
|
|
}
|