Merge remote-tracking branch 'origin/main'

This commit is contained in:
Peter Steinberger
2025-12-14 05:31:06 +00:00
3 changed files with 13 additions and 12 deletions

1
.gitignore vendored
View File

@@ -4,6 +4,7 @@ dist
pnpm-lock.yaml pnpm-lock.yaml
coverage coverage
.pnpm-store .pnpm-store
.worktrees/
.DS_Store .DS_Store
**/.DS_Store **/.DS_Store
apps/macos/.build/ apps/macos/.build/

View File

@@ -18,9 +18,9 @@ import UIKit
let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false) let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false)
let root = SettingsTab() let root = SettingsTab()
.environmentObject(appModel) .environment(appModel)
.environmentObject(appModel.voiceWake) .environment(appModel.voiceWake)
.environmentObject(bridgeController) .environment(bridgeController)
_ = Self.host(root) _ = Self.host(root)
} }
@@ -30,9 +30,9 @@ import UIKit
let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false) let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false)
let root = RootTabs() let root = RootTabs()
.environmentObject(appModel) .environment(appModel)
.environmentObject(appModel.voiceWake) .environment(appModel.voiceWake)
.environmentObject(bridgeController) .environment(bridgeController)
_ = Self.host(root) _ = Self.host(root)
} }
@@ -41,8 +41,8 @@ import UIKit
let appModel = NodeAppModel() let appModel = NodeAppModel()
let root = VoiceTab() let root = VoiceTab()
.environmentObject(appModel) .environment(appModel)
.environmentObject(appModel.voiceWake) .environment(appModel.voiceWake)
_ = Self.host(root) _ = Self.host(root)
} }
@@ -50,7 +50,7 @@ import UIKit
@Test @MainActor func voiceWakeWordsViewBuildsAViewHierarchy() { @Test @MainActor func voiceWakeWordsViewBuildsAViewHierarchy() {
let appModel = NodeAppModel() let appModel = NodeAppModel()
let root = NavigationStack { VoiceWakeWordsSettingsView() } let root = NavigationStack { VoiceWakeWordsSettingsView() }
.environmentObject(appModel) .environment(appModel)
_ = Self.host(root) _ = Self.host(root)
} }
@@ -58,8 +58,8 @@ import UIKit
let appModel = NodeAppModel() let appModel = NodeAppModel()
let bridge = BridgeSession() let bridge = BridgeSession()
let root = ChatSheet(bridge: bridge, sessionKey: "test") let root = ChatSheet(bridge: bridge, sessionKey: "test")
.environmentObject(appModel) .environment(appModel)
.environmentObject(appModel.voiceWake) .environment(appModel.voiceWake)
_ = Self.host(root) _ = Self.host(root)
} }

View File

@@ -175,7 +175,7 @@ enum PiOAuthStore {
} }
extension Data { extension Data {
private func base64URLEncodedString() -> String { fileprivate func base64URLEncodedString() -> String {
self.base64EncodedString() self.base64EncodedString()
.replacingOccurrences(of: "+", with: "-") .replacingOccurrences(of: "+", with: "-")
.replacingOccurrences(of: "/", with: "_") .replacingOccurrences(of: "/", with: "_")