mirror of
https://github.com/home-assistant/iOS.git
synced 2026-06-18 21:51:51 -05: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>
294 lines
10 KiB
Swift
294 lines
10 KiB
Swift
import SFSafeSymbols
|
|
import Shared
|
|
import StoreKit
|
|
import SwiftUI
|
|
|
|
struct WatchConfigurationView: View {
|
|
@Environment(\.dismiss) private var dismiss
|
|
@StateObject private var viewModel = WatchConfigurationViewModel()
|
|
|
|
@State private var isLoaded = false
|
|
@State private var showResetConfirmation = false
|
|
|
|
var body: some View {
|
|
content
|
|
.navigationTitle("Apple Watch")
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
.toolbar(content: {
|
|
ToolbarItem(placement: .topBarTrailing) {
|
|
Button(action: {
|
|
viewModel.save { success in
|
|
if success {
|
|
// When iOS 15 support is dropped we can start using `@Environment(\.requestReview)
|
|
// private var requestReview`
|
|
SKStoreReviewController.requestReview()
|
|
dismiss()
|
|
}
|
|
}
|
|
}, label: {
|
|
Text(verbatim: L10n.Watch.Configuration.Save.title)
|
|
})
|
|
}
|
|
})
|
|
.sheet(isPresented: $viewModel.showAddItem, content: {
|
|
MagicItemAddView(context: .watch) { itemToAdd in
|
|
guard let itemToAdd else { return }
|
|
viewModel.addItem(itemToAdd)
|
|
}
|
|
.preferredColorScheme(.dark)
|
|
})
|
|
.alert(viewModel.errorMessage ?? L10n.errorLabel, isPresented: $viewModel.showError) {
|
|
Button(action: {}, label: {
|
|
Text(verbatim: L10n.okLabel)
|
|
})
|
|
}
|
|
}
|
|
|
|
private var content: some View {
|
|
List {
|
|
watchPreview
|
|
.listRowBackground(Color.clear)
|
|
.onAppear {
|
|
// Prevent trigger when popping nav controller
|
|
guard !isLoaded else { return }
|
|
viewModel.loadWatchConfig()
|
|
isLoaded = true
|
|
}
|
|
itemsSection
|
|
assistSection
|
|
resetView
|
|
}
|
|
.preferredColorScheme(.dark)
|
|
}
|
|
|
|
private var resetView: some View {
|
|
Button(L10n.Watch.Debug.DeleteDb.Reset.title, role: .destructive) {
|
|
showResetConfirmation = true
|
|
}
|
|
.confirmationDialog(
|
|
L10n.Watch.Debug.DeleteDb.Alert.title,
|
|
isPresented: $showResetConfirmation,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button(L10n.yesLabel, role: .destructive) {
|
|
viewModel.deleteConfiguration { success in
|
|
if success {
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
Button(L10n.noLabel, role: .cancel) {}
|
|
}
|
|
}
|
|
|
|
private var itemsSection: some View {
|
|
Section(L10n.Watch.Configuration.Items.title) {
|
|
ForEach(viewModel.watchConfig.items, id: \.serverUniqueId) { item in
|
|
makeListItem(item: item)
|
|
}
|
|
.onMove { indices, newOffset in
|
|
viewModel.moveItem(from: indices, to: newOffset)
|
|
}
|
|
.onDelete { indexSet in
|
|
viewModel.deleteItem(at: indexSet)
|
|
}
|
|
Button {
|
|
viewModel.showAddItem = true
|
|
} label: {
|
|
Label(L10n.Watch.Configuration.AddItem.title, systemImage: "plus")
|
|
}
|
|
}
|
|
}
|
|
|
|
private var assistSection: some View {
|
|
Section("Assist") {
|
|
Toggle(isOn: $viewModel.watchConfig.assist.showAssist, label: {
|
|
Text(verbatim: L10n.Watch.Configuration.ShowAssist.title)
|
|
})
|
|
if viewModel.watchConfig.assist.showAssist {
|
|
HStack {
|
|
Text(L10n.Watch.Labels.SelectedPipeline.title)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
AssistPipelinePicker(
|
|
selectedServerId: $viewModel.watchConfig.assist.serverId,
|
|
selectedPipelineId: $viewModel.watchConfig.assist.pipelineId
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private var watchPreview: some View {
|
|
ZStack {
|
|
watchItemsList
|
|
.offset(x: -10)
|
|
Image(.watchFrame)
|
|
.resizable()
|
|
.aspectRatio(contentMode: .fit)
|
|
.frame(width: 260)
|
|
.foregroundStyle(.clear, Color(hue: 0, saturation: 0, brightness: 0.2))
|
|
}
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
}
|
|
|
|
private var watchItemsList: some View {
|
|
ZStack(alignment: .top) {
|
|
List {
|
|
VStack {}.padding(.top, 40)
|
|
Group {
|
|
ForEach(viewModel.watchConfig.items, id: \.serverUniqueId) { item in
|
|
makeWatchItem(item: item)
|
|
}
|
|
if viewModel.watchConfig.items.isEmpty {
|
|
noItemsWatchView
|
|
}
|
|
}
|
|
.listRowSeparator(.hidden)
|
|
.listRowSpacing(DesignSystem.Spaces.half)
|
|
}
|
|
.animation(.default, value: viewModel.watchConfig.items)
|
|
.listStyle(.plain)
|
|
.frame(width: 200, height: 265)
|
|
.offset(x: 5, y: 10)
|
|
watchStatusBar
|
|
.offset(y: 10)
|
|
}
|
|
.clipShape(RoundedRectangle(cornerRadius: 62))
|
|
}
|
|
|
|
private func makeListItem(item: MagicItem) -> some View {
|
|
let itemInfo = viewModel.magicItemInfo(for: item) ?? .init(
|
|
id: item.id,
|
|
name: item.id,
|
|
iconName: "",
|
|
customization: nil
|
|
)
|
|
return makeListItemRow(item: item, info: itemInfo)
|
|
}
|
|
|
|
@ViewBuilder
|
|
private func makeListItemRow(item: MagicItem, info: MagicItem.Info) -> some View {
|
|
if item.type == .action {
|
|
itemRow(item: item, info: info)
|
|
} else {
|
|
NavigationLink {
|
|
MagicItemCustomizationView(mode: .edit, context: .watch, item: item) { updatedMagicItem in
|
|
viewModel.updateItem(updatedMagicItem)
|
|
}
|
|
} label: {
|
|
itemRow(item: item, info: info)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func itemRow(item: MagicItem, info: MagicItem.Info) -> some View {
|
|
HStack {
|
|
Image(uiImage: image(for: item, itemInfo: info, watchPreview: false, color: .white))
|
|
Text(item.name(info: info))
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
Image(systemName: SFSymbol.line3Horizontal.rawValue)
|
|
.foregroundStyle(.gray)
|
|
}
|
|
}
|
|
|
|
private func makeWatchItem(item: MagicItem) -> some View {
|
|
let itemInfo = viewModel.magicItemInfo(for: item) ?? .init(
|
|
id: item.id,
|
|
name: item.id,
|
|
iconName: "",
|
|
customization: nil
|
|
)
|
|
|
|
return HStack(spacing: DesignSystem.Spaces.one) {
|
|
VStack {
|
|
Image(uiImage: image(for: item, itemInfo: itemInfo, watchPreview: true))
|
|
.foregroundColor(Color(uiColor: .init(hex: itemInfo.customization?.iconColor)))
|
|
.padding(DesignSystem.Spaces.one)
|
|
}
|
|
.background(Color(uiColor: .init(hex: itemInfo.customization?.iconColor)).opacity(0.3))
|
|
.clipShape(Circle())
|
|
Text(item.name(info: itemInfo))
|
|
.font(.system(size: 16))
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.foregroundStyle(textColorForWatchItem(itemInfo: itemInfo))
|
|
}
|
|
.padding(DesignSystem.Spaces.one)
|
|
.frame(width: 190, height: 55)
|
|
.background(backgroundForWatchItem(itemInfo: itemInfo))
|
|
.clipShape(RoundedRectangle(cornerRadius: 14))
|
|
.padding(.vertical, -DesignSystem.Spaces.one)
|
|
.listRowSeparator(.hidden)
|
|
}
|
|
|
|
private func backgroundForWatchItem(itemInfo: MagicItem.Info) -> Color {
|
|
if let backgroundColor = itemInfo.customization?.backgroundColor {
|
|
Color(uiColor: .init(hex: backgroundColor))
|
|
} else {
|
|
Color.gray.opacity(0.3)
|
|
}
|
|
}
|
|
|
|
private func textColorForWatchItem(itemInfo: MagicItem.Info) -> Color {
|
|
if let textColor = itemInfo.customization?.textColor {
|
|
Color(uiColor: .init(hex: textColor))
|
|
} else {
|
|
Color.white
|
|
}
|
|
}
|
|
|
|
private func image(
|
|
for item: MagicItem,
|
|
itemInfo: MagicItem.Info,
|
|
watchPreview: Bool,
|
|
color: UIColor? = nil
|
|
) -> UIImage {
|
|
let icon: MaterialDesignIcons = item.icon(info: itemInfo)
|
|
|
|
return icon.image(
|
|
ofSize: .init(width: watchPreview ? 24 : 18, height: watchPreview ? 24 : 18),
|
|
color: color ?? .init(hex: itemInfo.customization?.iconColor)
|
|
)
|
|
}
|
|
|
|
private var watchStatusBar: some View {
|
|
ZStack(alignment: .trailing) {
|
|
Text("9:41")
|
|
.font(.system(size: 14).bold())
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.padding(.top)
|
|
if viewModel.watchConfig.assist.showAssist {
|
|
Image(uiImage: MaterialDesignIcons.messageProcessingOutlineIcon.image(
|
|
ofSize: .init(width: 18, height: 18),
|
|
color: .haPrimary
|
|
))
|
|
.padding(Spaces.one)
|
|
.background(.regularMaterial)
|
|
.clipShape(RoundedRectangle(cornerRadius: 25.0))
|
|
.offset(x: -22)
|
|
.padding(.top)
|
|
}
|
|
}
|
|
.animation(.bouncy, value: viewModel.watchConfig.assist.showAssist)
|
|
.frame(width: 210, height: 50)
|
|
.background(LinearGradient(colors: [.black, .clear], startPoint: .top, endPoint: .bottom))
|
|
}
|
|
|
|
private var noItemsWatchView: some View {
|
|
Text(verbatim: L10n.Watch.Settings.NoItems.Phone.title)
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.font(.footnote)
|
|
.padding(Spaces.one)
|
|
.background(.gray.opacity(0.3))
|
|
.clipShape(RoundedRectangle(cornerRadius: CornerRadiusSizes.one))
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
VStack {
|
|
Text("Abc")
|
|
.sheet(isPresented: .constant(true), content: {
|
|
WatchConfigurationView()
|
|
})
|
|
}
|
|
}
|