Your home as a live 3D model in the Mac menu bar and on iPhone — lights and ACs via Smart Life, Home Assistant, Philips Hue and Apple Home.
Phones pair with a Mac or a PC (#19)
0xProbability83b73cace7af
diff --git a/README.md b/README.mdindex 57aa195..dc6c035 100644--- a/README.md+++ b/README.md@@ -131,7 +131,7 @@ AI Access and About.| Do this | To get this || --- | --- || Click the menu bar icon | Open or close the panel |-| Right-click the menu bar icon | Settings, Edit Home, Load Floor Plan, Reveal Plan File, Reveal Device Log, Show Island, Open at Login, Pair iPhone, AI Access, Reload, Quit |+| Right-click the menu bar icon | Settings, Edit Home, Load Floor Plan, Reveal Plan File, Reveal Device Log, Show Island, Open at Login, Pair Phone, AI Access, Reload, Quit || `⌘,` | Settings || Click a lamp in the 3D view, or its tile | Toggle it || Drag sideways across a light tile | Dim it |@@ -230,22 +230,26 @@ apps, so it stays out of the App Store edition entirely: its code lives in its othat only the Smart Life edition and the Mac app link, and `build-ios.sh` refuses an App Store archive that contains it.The two editions are separate apps (bundle id and App Group), so both can sit on one phone.-### Sync with the Mac+### Sync with a Mac or PC-Optional. Pair a Mac and your floor plan — rooms, furniture, lamps, scenes and the links to real devices — plus the-Home Assistant and Hue connections stay the same on both, whichever one you set up or edit first.+Optional. Pair a Mac or a Windows PC and your floor plan — rooms, furniture, lamps, scenes and the links to real+devices — plus the Home Assistant and Hue connections stay the same on both, whichever one you set up or edit first.+[House Control for Windows](https://github.com/0xProbabillity/house-control-windows) pairs exactly like the Mac app.-1. On the Mac: right-click the menu bar icon → **Pair iPhone…**. A QR code appears.+1. On the computer: right-click the House Control icon — in the menu bar on a Mac, in the taskbar's tray on a PC —+ → **Pair Phone…** (**Pair iPhone…** in older versions). A QR code appears.macOS asks once whether House Control may find devices on your local network: allow it.-2. On the iPhone: **Settings** (the sliders button) → **Pair with Mac**, and point the camera at the code.- Or press **Copy Pairing Link** on the Mac and paste it on the phone.+2. On the iPhone: **Settings** (the sliders button) → **Pair with Mac or PC**, and point the camera at the code.+ Or press **Copy Pairing Link** on the computer and paste it on the phone.++[House Control for Android](https://github.com/0xProbabillity/house-control-android) pairs with the same code.From then on, whenever both are on the same Wi-Fi and the app is open, a plan saved on one reaches the other a-moment later. A home set up on the phone first goes to the Mac when you pair them. If both changed the plan while-apart, the phone asks which one to keep. A Home Assistant or Hue Bridge connected, or disconnected, on either side+moment later. A home set up on the phone first goes to the computer when you pair them. If both changed the plan+while apart, the phone asks which one to keep. A Home Assistant or Hue Bridge connected, or disconnected, on either sideis the newest one on both.-Nothing goes through a server. The Mac advertises itself with Bonjour and the two talk over TLS with a+Nothing goes through a server. The computer advertises itself with Bonjour (DNS-SD) and the two talk over TLS with apre-shared key that only the QR code carries, so a device that never saw the code cannot connect.**Reset Pairing…** in the pairing window issues a new key.@@ -394,7 +398,7 @@ Environment variables understood by the app:| `HOUSE_DOCK=1` | Show a Dock icon, so UI automation tools can see the app || `HOUSE_ISLAND=0` | Run without the island (`1` forces it on) || `HOUSE_ISLAND_EXPANDED=1` | Keep the island open |-| `HOUSE_OPEN_PAIRING=1` | Open the Pair iPhone window at launch |+| `HOUSE_OPEN_PAIRING=1` | Open the Pair Phone window at launch || `HOUSE_COMPUTER_NAME="Studio Mac"` | The name paired iPhones see, instead of the Mac's own (screenshots) || `HOUSE_SNAPSHOT_DIR=/some/folder` | Write `panel.png` and `island.png` there a few seconds after launch || `HOUSE_RENDER_HIDDEN=1` | Keep drawing while the screen is locked, for unattended captures |diff --git a/core/Sources/HouseCore/SyncClient.swift b/core/Sources/HouseCore/SyncClient.swiftindex 24641bc..450af2b 100644--- a/core/Sources/HouseCore/SyncClient.swift+++ b/core/Sources/HouseCore/SyncClient.swift@@ -225,7 +225,7 @@ public final class SyncClient {self.channel = nil// The handshake fails when the Mac's key was reset since this phone was paired.if case .some(.tls) = error {- self.set(.failed("\(pairing.name) did not accept this pairing. Pair again from the Mac's menu: Pair iPhone…"))+ self.set(.failed("\(pairing.name) did not accept this pairing. Pair again on the computer: Pair Phone… (Pair iPhone… in older versions) in House Control's menu"))} else if self.running {self.set(.searching)}diff --git a/docs/connections.md b/docs/connections.mdindex f4423e9..02e225a 100644--- a/docs/connections.md+++ b/docs/connections.md@@ -64,7 +64,7 @@ so a different device answering at that address later is refused.Apple offers HomeKit to iPhone and iPad apps, and to Mac apps only through the Mac App Store. House Control is adownload, so on the Mac it can list Apple Home devices but not switch them:-1. Pair your iPhone with the Mac (right-click the menu bar icon → **Pair iPhone…**).+1. Pair your iPhone with the Mac (right-click the menu bar icon → **Pair Phone…**).2. On the iPhone: **Settings → More connections → Apple Home → Connect**, and allow access to your Home data.3. The iPhone sends the list of your lamps, outlets, air conditioners (heater-coolers and thermostats) andthermometers to the Mac. Link them in the editor like any other device.diff --git a/ios/Sources/ConnectionViews.swift b/ios/Sources/ConnectionViews.swiftindex c941705..ec81093 100644--- a/ios/Sources/ConnectionViews.swift+++ b/ios/Sources/ConnectionViews.swift@@ -135,7 +135,7 @@ struct HomeAssistantView: View {.fixedSize(horizontal: false, vertical: true)}}- Footnote(text: "The token stays on this iPhone, in the Keychain, and goes to the Mac you paired, over your encrypted link. Lights, switches, climate devices and temperature sensors can then be linked to your plan.")+ Footnote(text: "The token stays on this iPhone, in the Keychain, and goes to the computer you paired, over your encrypted link. Lights, switches, climate devices and temperature sensors can then be linked to your plan.")}}@@ -194,9 +194,9 @@ struct HomeAssistantView: View {.confirmationDialog("Disconnect Home Assistant?", isPresented: $confirmDisconnect, titleVisibility: .visible) {Button("Disconnect", role: .destructive) { model.disconnect(service: "homeassistant") }} message: {- Text("Its devices go back to being simulated, here and on your paired Mac.")+ Text("Its devices go back to being simulated, here and on your paired computer.")}- Footnote(text: "Connected on this iPhone or on your Mac, it works on both: they share the connection over their encrypted link.")+ Footnote(text: "Connected on this iPhone or on your paired computer, it works on both: they share the connection over their encrypted link.")}.transition(.opacity)}@@ -330,7 +330,7 @@ struct HueView: View {Button { start(["host": host.trimmingCharacters(in: .whitespaces), "name": "Hue Bridge"]) } label: { Text("Pair") }.buttonStyle(SecondaryButtonStyle()).disabled(host.trimmingCharacters(in: .whitespaces).isEmpty)- Footnote(text: "No account needed: the bridge lets one app in when its button is pressed. The key it gives stays on this iPhone and your paired Mac.")+ Footnote(text: "No account needed: the bridge lets one app in when its button is pressed. The key it gives stays on this iPhone and your paired computer.")}}@@ -401,7 +401,7 @@ struct HueView: View {.confirmationDialog("Disconnect the Hue Bridge?", isPresented: $confirmDisconnect, titleVisibility: .visible) {Button("Disconnect", role: .destructive) { model.disconnect(service: "hue") }} message: {- Text("Its lamps go back to being simulated, here and on your paired Mac.")+ Text("Its lamps go back to being simulated, here and on your paired computer.")}}.transition(.opacity)diff --git a/ios/Sources/NewHomeView.swift b/ios/Sources/NewHomeView.swiftindex d97df7c..b37bba1 100644--- a/ios/Sources/NewHomeView.swift+++ b/ios/Sources/NewHomeView.swift@@ -67,7 +67,7 @@ struct NewHomeView: View {} message: {Text(model.macName == nil? "This iPhone keeps one home of your own. Export the current one from the editor first if you want to keep it."- : "This iPhone keeps one home of your own, and \(model.macName ?? "your Mac") gets the new one too.")+ : "This iPhone keeps one home of your own, and \(model.macName ?? "your computer") gets the new one too.")}}.padding(.horizontal, 18)diff --git a/ios/Sources/PairingView.swift b/ios/Sources/PairingView.swiftindex 0925801..a4762f7 100644--- a/ios/Sources/PairingView.swift+++ b/ios/Sources/PairingView.swift@@ -38,7 +38,7 @@ struct PairingView: View {.animation(.easeOut(duration: 0.2), value: rejected)}.background(Theme.background)- .navigationTitle("Pair with Mac")+ .navigationTitle("Pair with Mac or PC").navigationBarTitleDisplayMode(.inline).toolbarBackground(Theme.background, for: .navigationBar).task { await prepareCamera() }@@ -51,8 +51,8 @@ struct PairingView: View {private var steps: some View {Card(padding: 16) {VStack(alignment: .leading, spacing: 14) {- step(1, "On your Mac, right-click the House Control icon in the menu bar.")- step(2, "Choose **Pair iPhone…** — a code appears.")+ step(1, "On your computer, right-click the House Control icon: in the menu bar on a Mac, in the taskbar's tray on a PC.")+ step(2, "Choose **Pair Phone…** (**Pair iPhone…** in older versions) — a code appears.")step(3, "Point this iPhone at the code. Both devices need to be on the same Wi-Fi.")}}@@ -86,7 +86,7 @@ struct PairingView: View {"Allow the camera for House Control in Settings, or paste the pairing link below.")case .unavailable:placeholder("qrcode.viewfinder", "No camera here",- "Use Copy Pairing Link on the Mac and paste it below.")+ "Use Copy Pairing Link on the computer and paste it below.")case .unknown:ProgressView().tint(Theme.muted)}@@ -116,7 +116,7 @@ struct PairingView: View {.labelStyle(.titleAndIcon).buttonBorderShape(.capsule).tint(Theme.accent)- Text("Or press **Copy Pairing Link** on the Mac and paste it here.")+ Text("Or press **Copy Pairing Link** on the computer and paste it here.").font(.system(size: 13)).foregroundStyle(Theme.faint).multilineTextAlignment(.center)@@ -151,9 +151,9 @@ struct PairingView: View {switch model.syncStatus {case .connected:return model.hasCustomPlan ? "Connected. Your floor plan now stays the same on both, whichever one you edit."- : "Connected. Draw your home here or on the Mac; it appears on both."+ : "Connected. Draw your home here or on the computer; it appears on both."case .failed(let reason): return reason- default: return "Looking for the Mac on this Wi-Fi…"+ default: return "Looking for the computer on this Wi-Fi…"}}diff --git a/ios/Sources/SettingsView.swift b/ios/Sources/SettingsView.swiftindex 6380d8b..6f8fab1 100644--- a/ios/Sources/SettingsView.swift+++ b/ios/Sources/SettingsView.swift@@ -102,7 +102,7 @@ struct SettingsView: View {.buttonStyle(SecondaryButtonStyle())}if !model.hasCustomPlan {- footnote("Make your own home here, or pair with House Control on a Mac and the one drawn there arrives by itself.")+ footnote("Make your own home here, or pair with House Control on a Mac or PC and the one drawn there arrives by itself.")}}}@@ -183,7 +183,7 @@ struct SettingsView: View {private var macSection: some View {VStack(spacing: 10) {- SectionTitle("Mac")+ SectionTitle("Mac or PC")if let name = model.macName {Card {HStack(spacing: 14) {@@ -218,7 +218,7 @@ struct SettingsView: View {.confirmationDialog("Unpair from \(name)?", isPresented: $confirmUnpair, titleVisibility: .visible) {Button("Unpair", role: .destructive) { model.unpair() }} message: {- Text("The floor plan stays on this iPhone but no longer follows the Mac.")+ Text("The floor plan stays on this iPhone but no longer follows the computer.")}footnote("Changes saved on either one reach the other while both are on the same Wi-Fi: the floor plan, device links, Home Assistant and Hue.")} else {@@ -226,8 +226,8 @@ struct SettingsView: View {HStack(alignment: .top, spacing: 14) {IconBadge(symbol: "laptopcomputer.and.iphone", tint: Theme.accent)VStack(alignment: .leading, spacing: 4) {- Text("Optional: a Mac").font(.system(size: 16.5, weight: .semibold)).foregroundStyle(Theme.text)- Text("Pair with House Control on a Mac and your home — rooms, lamps, device links, connections — stays the same on both, whichever one you edit.")+ Text("Optional: a Mac or PC").font(.system(size: 16.5, weight: .semibold)).foregroundStyle(Theme.text)+ Text("Pair with House Control on a Mac or PC and your home — rooms, lamps, device links, connections — stays the same on both, whichever one you edit.").font(.system(size: 14)).foregroundStyle(Theme.muted).fixedSize(horizontal: false, vertical: true)@@ -235,7 +235,7 @@ struct SettingsView: View {}}NavigationLink(value: SettingsRoute.pairing) {- Label("Pair with Mac", systemImage: "qrcode.viewfinder")+ Label("Pair with Mac or PC", systemImage: "qrcode.viewfinder")}.buttonStyle(PrimaryButtonStyle())}@@ -405,9 +405,9 @@ struct SettingsView: View {private var homeKitFootnote: String {if case .ready = model.homeKit, model.macName != nil {- return "This iPhone switches your Apple Home devices; your Mac lists them for its editor, but macOS lets only App Store apps use HomeKit."+ return "This iPhone switches your Apple Home devices; your paired computer lists them for its editor, but only the iPhone app may use HomeKit."}- return "Home Assistant and Hue set up here or on your paired Mac work on both, shared over your encrypted link."+ return "Home Assistant and Hue set up here or on your paired computer work on both, shared over your encrypted link."}// MARK: - About@@ -421,8 +421,8 @@ struct SettingsView: View {infoRow("Privacy", value: "No account, no analytics")}footnote(AppModel.includesSmartLife- ? "House Control talks to your own devices: Tuya's servers for Smart Life, your Home Assistant, your Hue Bridge, Apple Home, and your Mac. Nothing else leaves this iPhone."- : "House Control talks to your own devices: your Home Assistant, your Hue Bridge, Apple Home, and your Mac. Nothing else leaves this iPhone.")+ ? "House Control talks to your own devices: Tuya's servers for Smart Life, your Home Assistant, your Hue Bridge, Apple Home, and your paired computer. Nothing else leaves this iPhone."+ : "House Control talks to your own devices: your Home Assistant, your Hue Bridge, Apple Home, and your paired computer. Nothing else leaves this iPhone.")Card {webRow(About.website, symbol: "globe", tint: Theme.accent, title: "Website", detail: "Features, help and the Mac app")RowDivider()diff --git a/ios/Sources/SmartLifeView.swift b/ios/Sources/SmartLifeView.swiftindex 4018a87..7b58cfc 100644--- a/ios/Sources/SmartLifeView.swift+++ b/ios/Sources/SmartLifeView.swift@@ -94,7 +94,7 @@ struct SmartLifeView: View {.background(Color.black.opacity(0.3), in: RoundedRectangle(cornerRadius: 14, style: .continuous)).overlay(RoundedRectangle(cornerRadius: 14, style: .continuous).strokeBorder(typing ? Theme.accent : Theme.line))if !model.suggestedUserCode.isEmpty, userCode == model.suggestedUserCode {- Label("Filled in from your Mac", systemImage: "laptopcomputer")+ Label("Filled in from your computer", systemImage: "laptopcomputer").font(.system(size: 13)).foregroundStyle(Theme.muted)}@@ -153,7 +153,7 @@ struct SmartLifeView: View {IconBadge(symbol: "laptopcomputer", tint: Theme.green)VStack(alignment: .leading, spacing: 4) {Text("The code is on \(mac)").font(.system(size: 16.5, weight: .semibold)).foregroundStyle(Theme.text)- Text("Switch to Smart Life on this iPhone, tap the scanner on its Home tab and point it at the Mac's screen. The code stays there while you are away; come back here when you have confirmed.")+ Text("Switch to Smart Life on this iPhone, tap the scanner on its Home tab and point it at the computer's screen. The code stays there while you are away; come back here when you have confirmed.").font(.system(size: 14)).foregroundStyle(Theme.muted).fixedSize(horizontal: false, vertical: true)}@@ -167,7 +167,7 @@ struct SmartLifeView: View {step(1, "Save the code to Photos (below).")step(2, "In Smart Life tap **+** → **Scan**, then the **photo** icon, and pick the code.")step(3, "Confirm the login and come back here.")- Text("Or show it on another screen: share it to a computer or tablet, or pair a Mac and it appears there.")+ Text("Or show it on another screen: share it to a computer or tablet, or pair a Mac or PC and it appears there.").font(.system(size: 13.5)).foregroundStyle(Theme.faint).fixedSize(horizontal: false, vertical: true)}@@ -211,7 +211,7 @@ struct SmartLifeView: View {.buttonStyle(SecondaryButtonStyle())}if !onMac, model.macName != nil {- Button { onMac = model.showOnMac(login.content) } label: { Label("Show on Mac", systemImage: "laptopcomputer") }+ Button { onMac = model.showOnMac(login.content) } label: { Label("Show on computer", systemImage: "laptopcomputer") }.buttonStyle(SecondaryButtonStyle())}}diff --git a/ios/Sources/WelcomeView.swift b/ios/Sources/WelcomeView.swiftindex 8ac2a83..2222426 100644--- a/ios/Sources/WelcomeView.swift+++ b/ios/Sources/WelcomeView.swift@@ -32,8 +32,8 @@ struct WelcomeView: View {VStack(alignment: .leading, spacing: 26) {feature("hand.tap.fill", Theme.warm, "Tap a lamp, drag to dim","Lights, colours, air conditioners and scenes, right on the floor plan.")- feature("pencil.and.ruler.fill", Theme.accent, "Draw it here or on your Mac",- "Rooms, lamps and ACs, on this iPhone. Pair a Mac any time: both stay in sync.")+ feature("pencil.and.ruler.fill", Theme.accent, "Draw it here or on your computer",+ "Rooms, lamps and ACs, on this iPhone. Pair a Mac or PC any time: both stay in sync.")feature("lightbulb.2.fill", Theme.green, "Your real devices",AppModel.includesSmartLife? "Smart Life, Home Assistant, Philips Hue and Apple Home. Until you connect one, everything is simulated."@@ -44,7 +44,7 @@ struct WelcomeView: View {Button { model.finishWelcome(.setUpHere) } label: { Label("Set up my home", systemImage: "house.fill") }.buttonStyle(PrimaryButtonStyle())- Button { model.finishWelcome(.pair) } label: { Label("Pair with my Mac", systemImage: "laptopcomputer.and.iphone") }+ Button { model.finishWelcome(.pair) } label: { Label("Pair with Mac or PC", systemImage: "laptopcomputer.and.iphone") }.buttonStyle(SecondaryButtonStyle()).padding(.top, 10)Button("Explore the demo home") { model.finishWelcome(.demo) }diff --git a/ios/project.yml b/ios/project.ymlindex 14e15cd..4264c83 100644--- a/ios/project.yml+++ b/ios/project.yml@@ -52,13 +52,13 @@ targets:UIRequiresFullScreen: trueUIUserInterfaceStyle: DarkITSAppUsesNonExemptEncryption: false- NSLocalNetworkUsageDescription: House Control finds your Home Assistant and Hue Bridge on this Wi-Fi network, and your Mac, to keep your floor plan the same on both.+ NSLocalNetworkUsageDescription: House Control finds your Home Assistant and Hue Bridge on this Wi-Fi network, and your Mac or PC, to keep your floor plan the same on both.NSBonjourServices: [_housecontrol._tcp, _hue._tcp, _home-assistant._tcp]NSHomeKitUsageDescription: House Control shows the lamps, air conditioners and thermometers of your homes in its 3D view and switches them for you.# Home Assistant answers plain HTTP on the local network, the Hue Bridge HTTPS with its own certificate.NSAppTransportSecurity:NSAllowsLocalNetworking: true- NSCameraUsageDescription: The camera reads the pairing code shown by House Control on your Mac.+ NSCameraUsageDescription: The camera reads the pairing code shown by House Control on your Mac or PC.CFBundleURLTypes:- CFBundleURLName: io.github.0xprobabillity.HouseControl.pairCFBundleURLSchemes: [housecontrol]diff --git a/macos/Sources/HouseControl/AppDelegate.swift b/macos/Sources/HouseControl/AppDelegate.swiftindex 15c98ea..bcda4a4 100644--- a/macos/Sources/HouseControl/AppDelegate.swift+++ b/macos/Sources/HouseControl/AppDelegate.swift@@ -200,7 +200,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {action: #selector(toggleOpenAtLogin), keyEquivalent: "")loginItem.target = selfloginItem.state = login == .on ? .on : login == .needsApproval ? .mixed : .off- menu.addItem(withTitle: "Pair iPhone…", action: #selector(pairPhone), keyEquivalent: "").target = self+ menu.addItem(withTitle: "Pair Phone…", action: #selector(pairPhone), keyEquivalent: "").target = selflet aiItem = menu.addItem(withTitle: agent.isLive ? "AI Access — Live" : "AI Access…", action: #selector(openAgent), keyEquivalent: "")aiItem.target = selfaiItem.image = NSImage(systemSymbolName: "sparkles", accessibilityDescription: nil)@@ -667,12 +667,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {if let editor, let plan = plans.customPlan() { editor.host.call("planArrived", plan, phone) }}- /// Shows the QR code an iPhone scans once to find this Mac and receive its floor plan.+ /// Shows the QR code a phone scans once to find this Mac and receive its floor plan.@objc private func pairPhone() {panel.hide()let pairing = sync.enable(name: computerName)if pairingWindow == nil {- let window = QRWindowController(title: "Pair iPhone")+ let window = QRWindowController(title: "Pair Phone")window.onClose = { [weak self] in self?.pairingWindow = nil }window.addButton("Copy Pairing Link") { [weak self] inguard let link = self?.sync.pairing?.link else { return }@@ -683,8 +683,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {pairingWindow = window}pairingWindow?.show(code: pairing.link,- headline: "Scan with House Control on your iPhone",- detail: "On the iPhone open Settings → Pair with Mac. Both devices must be on the same Wi-Fi. "+ headline: "Scan with House Control on your phone",+ detail: "On the phone, Android or iPhone, open Settings → Pair with Mac or PC (Pair with Mac in older versions). Both devices must be on the same Wi-Fi. "+ "Your floor plan, device links and connections stay the same on both, whichever one you edit; "+ "they travel straight between them, encrypted with the key in this code.")refreshPairingWindow()@@ -693,7 +693,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {private func resetPairing() {let alert = NSAlert()alert.messageText = "Reset pairing?"- alert.informativeText = "Every iPhone paired so far stops syncing until it scans the new code."+ alert.informativeText = "Every phone paired so far stops syncing until it scans the new code."alert.addButton(withTitle: "Reset")alert.addButton(withTitle: "Cancel")guard alert.runModal() == .alertFirstButtonReturn else { return }@@ -706,7 +706,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {if !devices.isEmpty {pairingWindow?.setStatus("Connected: \(devices.joined(separator: ", "))", active: true)} else if sync.isAdvertised {- pairingWindow?.setStatus("Waiting for an iPhone…", active: false)+ pairingWindow?.setStatus("Waiting for a phone…", active: false)} else {// Until macOS lets the app use the local network, no phone can find this Mac.pairingWindow?.setStatus("Allow Local Network access for House Control in System Settings → Privacy & Security",@@ -742,8 +742,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {}loginWindow?.show(code: content,headline: "Scan with the Smart Life app on \(device)",- detail: "Switch to Smart Life on the iPhone, tap the scanner on its Home tab and confirm the login. "- + "Then return to House Control: this window closes once the iPhone is signed in.")+ detail: "Switch to Smart Life on the phone, tap the scanner on its Home tab and confirm the login. "+ + "Then return to House Control: this window closes once the phone is signed in.")loginWindow?.setStatus("Requested by \(device)", active: true)}diff --git a/macos/Sources/HouseControl/SettingsWindow.swift b/macos/Sources/HouseControl/SettingsWindow.swiftindex b79800c..ce11438 100644--- a/macos/Sources/HouseControl/SettingsWindow.swift+++ b/macos/Sources/HouseControl/SettingsWindow.swift@@ -55,7 +55,7 @@ final class SettingsWindowController: NSWindowController {("General", "gearshape", AnyView(GeneralPane())),("Home", "house", AnyView(HomePane())),("Connections", "point.3.connected.trianglepath.dotted", AnyView(ConnectionsPane())),- ("iPhone", "iphone", AnyView(PhonePane())),+ ("Phone", "iphone", AnyView(PhonePane())),("AI Access", "sparkles", AnyView(AgentPane())),("About", "info.circle", AnyView(AboutPane())),]@@ -139,7 +139,7 @@ private struct GeneralPane: View {}Section("Getting around") {Tip(symbol: "cursorarrow.click", text: "Click the house in the menu bar for the panel.")- Tip(symbol: "contextualmenu.and.cursorarrow", text: "Right-click it for the menu: editor, iPhone, AI Access.")+ Tip(symbol: "contextualmenu.and.cursorarrow", text: "Right-click it for the menu: editor, phone pairing, AI Access.")Tip(symbol: "command", text: "⌘, opens these settings from any House Control window.")}}@@ -192,7 +192,7 @@ private struct ConnectionsPane: View {}}} footer: {- Footnote("Connections are set up in the editor, where you also link each lamp and AC to its real device. Home Assistant and Hue are shared with a paired iPhone.")+ Footnote("Connections are set up in the editor, where you also link each lamp and AC to its real device. Home Assistant and Hue are shared with a paired phone.")}}}@@ -205,15 +205,15 @@ private struct PhonePane: View {Pane {Section {if model.phones.isEmpty {- Label("No iPhone is connected right now", systemImage: "iphone.slash").foregroundStyle(.secondary)+ Label("No phone is connected right now", systemImage: "iphone.slash").foregroundStyle(.secondary)} else {ForEach(model.phones, id: \.self) { phone inLabel { Text(phone) } icon: { Image(systemName: "iphone").foregroundStyle(.green) }}}- ActionRow(symbol: "qrcode", title: "Pair iPhone…", detail: "Show the code to scan with House Control on the iPhone", action: model.pairPhone)+ ActionRow(symbol: "qrcode", title: "Pair Phone…", detail: "Show the code to scan with House Control on an Android phone or iPhone", action: model.pairPhone)} footer: {- Footnote("Paired, the iPhone gets this floor plan and its connections and keeps them in step with the Mac, whichever one you edit. An iPhone stays connected while its app is open.")+ Footnote("Paired, the phone gets this floor plan and its connections and keeps them in step with the Mac, whichever one you edit. A phone stays connected while its app is open.")}}}diff --git a/web/src/editor/connections.js b/web/src/editor/connections.jsindex b3a79f2..33b04cd 100644--- a/web/src/editor/connections.js+++ b/web/src/editor/connections.js@@ -284,7 +284,7 @@ export function createConnections({ rerender, toast, usedBy, onOpen }) {}nodes.push(section(info.connected ? 'How it works' : 'Set it up on your iPhone',h('ol.steps',- h('li', 'Pair your iPhone with this Mac: right-click the menu bar icon → Pair iPhone….'),+ h('li', 'Pair your iPhone with this Mac: right-click the menu bar icon → Pair Phone….'),h('li', 'On the iPhone: House Control → Settings → Apple Home → Connect, and allow access to your Home data.'),h('li', 'Its lamps, air conditioners and thermometers appear here. Link them like any other device.')),h('p.note', 'Apple lets only iPhone, iPad and App Store apps use HomeKit, so the iPhone app switches these devices. On the Mac they show what you set, but stay simulated.')));diff --git a/web/src/editor/editor.js b/web/src/editor/editor.jsindex 49bb107..ae7a0ea 100644--- a/web/src/editor/editor.js+++ b/web/src/editor/editor.js@@ -565,7 +565,7 @@ export async function bootEditor(root) {h('p.note', 'Walls facing the camera are cut away, so the azimuth decides which side of the home is open.')),section('How it works',h('p.note', isPhone- ? 'Tap anything on the plan, or find it under Items, to edit it. “Save” keeps the plan on this iPhone and sends it to your paired Mac. Coordinates are metres: x grows to the right (east), z grows downwards (south).'+ ? 'Tap anything on the plan, or find it under Items, to edit it. “Save” keeps the plan on this iPhone and sends it to your paired computer. Coordinates are metres: x grows to the right (east), z grows downwards (south).': 'Pick anything on the plan or in the list to edit it. “Save & apply” writes the plan to disk and reloads the menu bar panel. Coordinates are metres: x grows to the right (east), z grows downwards (south).')));} else if (kind === 'connections') {head('Connections', 'Where your real lamps and air conditioners live');@@ -936,7 +936,7 @@ export async function bootEditor(root) {onclick: () => { closeModals(); add(kind); haptic('light'); ui.reveal(); },}, icon(name, 24, 1.8), h('span', label)))));confirmSheet.append(h('div.p-modal-head', h('b', 'Unsaved changes')),- h('p.note', 'Save them before closing? Saved plans reach your paired Mac too.'),+ h('p.note', 'Save them before closing? Saved plans reach your paired computer too.'),h('div.p-confirm-actions',h('button.btn.primary.wide', { onclick: async () => { closeModals(); await save(); if (!dirty) close(); } }, 'Save and close'),h('button.btn.wide.danger', { onclick: () => { closeModals(); dirty = false; close(); } }, 'Discard changes'),