Skip to content

Combine Watch extension and Watch App + UI fixes for watchOS 26 #3776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Combine Watch extension and Watch App + UI fixes for watchOS 26 #3776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0acc707
UI fixes for iOS 26
bgoncal Aug 19, 2025
b44d87b
Combine Watch extension and Watch App + UI fixes for watchOS 26
bgoncal Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
301 changes: 93 additions & 208 deletions HomeAssistant.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/App-Beta.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/App-Debug.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/App-Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Codegen.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-Intents.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-Matter.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1410"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "1.3">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-NotificationContent.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "1.3">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-NotificationService.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-PushProvider.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-Share.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-Today.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Extensions-Widgets.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Shared-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/SharedTesting.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1620"
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Tests-UI.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/Tests-Unit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "2600"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/WatchApp (Complication).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "2600"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/WatchApp (Notification).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "2600"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HomeAssistant.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "2600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ abstract_target 'watchOS' do
shared_fwk_pods
end

target 'WatchExtension-Watch' do
target 'WatchApp' do
pod 'EMTLoadingIndicator', git: 'https://github.com/hirokimu/EMTLoadingIndicator', branch: 'master'
end
end
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,6 @@ SPEC CHECKSUMS:
ViewRow: 8da541e9c019f3be63f4e28f311a62cac2045ecf
XCGLogger: 1943831ef907df55108b0b18657953f868de973b

PODFILE CHECKSUM: ab912fdb584a9cf431173e68f4a75f5bfab11b9d
PODFILE CHECKSUM: c8e7399a61c9e13fe183fc1a9db6a8b1c31b6793

COCOAPODS: 1.15.2
4 changes: 3 additions & 1 deletion ...oarding/Steps/Permissions/OnboardingPermissions/OnboardingPermissionsNavigationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct OnboardingPermissionsNavigationView: View {
let onboardingServer: Server?

var body: some View {
Group {
VStack {
if let permission = OnboardingPermissionHandler.notDeterminedPermissions.first, permission == .location {
LocationPermissionView(permission: permission) {
Current.onboardingObservation.complete()
Expand All @@ -24,6 +24,8 @@ struct OnboardingPermissionsNavigationView: View {
flowEnd
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color(uiColor: .systemBackground))
.onDisappear {
if Current.location.permissionStatus == .denied {
useLocalConnectionAsRemoteIfNeeded()
Expand Down
2 changes: 0 additions & 2 deletions Sources/App/Settings/CarPlay/CarPlayConfigurationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ struct CarPlayConfigurationView: View {
})
}
}
.preferredColorScheme(.dark)
.navigationViewStyle(.stack)
}

Expand Down Expand Up @@ -144,7 +143,6 @@ struct CarPlayConfigurationView: View {
.aspectRatio(contentMode: .fit)
.frame(maxWidth: .infinity, alignment: .center)
.frame(height: 150)
.padding()
.listRowBackground(Color.clear)
}

Expand Down
28 changes: 14 additions & 14 deletions Sources/App/Settings/MagicItem/Add/MagicItemAddView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ struct MagicItemAddView: View {

var body: some View {
NavigationView {
VStack {
pickerView
List {
switch viewModel.selectedItemType {
case .actions:
actionsList
case .scripts:
scriptsPerServerList
case .scenes:
scenesPerServerList
case .entities:
entitiesPerServerList
}
List {
switch viewModel.selectedItemType {
case .actions:
actionsList
case .scripts:
scriptsPerServerList
case .scenes:
scenesPerServerList
case .entities:
entitiesPerServerList
}
.searchable(text: $viewModel.searchText)
}
.searchable(text: $viewModel.searchText)
.safeAreaInset(edge: .top, content: {
pickerView
})
.onAppear {
autoSelectItemType()
viewModel.loadContent()
Expand Down
1 change: 0 additions & 1 deletion Sources/App/Settings/SettingsRootDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ enum SettingsRootDataSource {
$0.hidden = .isCatalyst
$0.presentationMode = .presentModally(controllerProvider: ControllerProvider.callback {
let controller = CarPlayConfigurationView().embeddedInHostingController()
controller.overrideUserInterfaceStyle = .dark
return controller
}, onDismiss: { _ in

Expand Down
16 changes: 14 additions & 2 deletions Sources/App/WebView/WebViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,24 @@ final class WebViewController: UIViewController, WKNavigationDelegate, WKUIDeleg
NSLayoutConstraint.activate([
stackView.rightAnchor.constraint(equalTo: statusBarView.rightAnchor, constant: -DesignSystem.Spaces.half),
stackView.topAnchor.constraint(equalTo: statusBarView.topAnchor, constant: DesignSystem.Spaces.half),
buttonStack.leftAnchor.constraint(equalTo: statusBarView.leftAnchor, constant: 68),
buttonStack.topAnchor.constraint(equalTo: statusBarView.topAnchor),
buttonStack.heightAnchor.constraint(equalToConstant: 27),
openInSafariButton.widthAnchor.constraint(equalToConstant: 11),
openInSafariButton.heightAnchor.constraint(equalToConstant: 11),
])

// Magic numbers to position it nicely in macOS bar
if #available(macOS 26.0, *) {
NSLayoutConstraint.activate([
buttonStack.leftAnchor.constraint(equalTo: statusBarView.leftAnchor, constant: 78),
buttonStack.heightAnchor.constraint(equalToConstant: 30),
])
} else {
NSLayoutConstraint.activate([
buttonStack.leftAnchor.constraint(equalTo: statusBarView.leftAnchor, constant: 68),
buttonStack.heightAnchor.constraint(equalToConstant: 27),
])
}

statusBarButtonsStack = stackView
}

Expand Down
Loading
Loading