Revert watch changes for watchOS 26 and adapt notifications and UI in a different way (#3881)

Author: bgoncal

HomeAssistant.xcodeproj/project.pbxproj

@@ -6,7 +6,7 @@ import UserNotifications
 import WatchKit
 import XCGLogger
 
-class ExtensionDelegate: NSObject, WKApplicationDelegate {
+class ExtensionDelegate: NSObject, WKExtensionDelegate {
     // MARK: Fileprivate
 
     fileprivate var watchConnectivityBackgroundPromise: Guarantee<Void>
@@ -20,7 +20,7 @@ class ExtensionDelegate: NSObject, WKApplicationDelegate {
         super.init()
     }
 
-    // MARK: - WKApplicationDelegate -
+    // MARK: - WKExtensionDelegate -
 
     func applicationDidFinishLaunching() {
         // Perform any final initialization of your application.
@@ -31,7 +31,7 @@ class ExtensionDelegate: NSObject, WKApplicationDelegate {
 
         let options: UNAuthorizationOptions = [.alert, .badge, .sound, .criticalAlert, .providesAppNotificationSettings]
 
-        WKApplication.shared().registerForRemoteNotifications()
+        WKExtension.shared().registerForRemoteNotifications()
 
         UNUserNotificationCenter.current().requestAuthorization(options: options) { granted, error in
             Current.Log.verbose("Requested notifications access \(granted), \(String(describing: error))")

Sources/Extensions/Watch/ExtensionDelegate.swift

@@ -0,0 +1,30 @@
+#if os(watchOS)
+import Shared
+import SwiftUI
+
+private struct CircularGlassOrLegacyBackgroundModifier: ViewModifier {
+    func body(content: Content) -> some View {
+        Group {
+            if #available(watchOS 26.0, *) {
+                content
+                    .frame(width: 30, height: 30)
+                    .padding(DesignSystem.Spaces.half)
+                    .glassEffect(.clear.interactive(), in: .circle)
+            } else {
+                content
+                    .padding(DesignSystem.Spaces.half)
+                    .background(.black)
+                    .clipShape(.circle)
+            }
+        }
+    }
+}
+
+extension View {
+    /// Applies a circular glass effect on watchOS 26+, otherwise falls back to padding + black background.
+    func circularGlassOrLegacyBackground() -> some View {
+        modifier(CircularGlassOrLegacyBackgroundModifier())
+    }
+}
+
+#endif

Sources/Extensions/Watch/Home/CircularGlassOrLegacyBackground.swift

@@ -8,6 +8,7 @@ struct WatchHomeView: View {
 
     var body: some View {
         navigation
+            ._statusBarHidden(true)
             .onReceive(NotificationCenter.default.publisher(for: AssistDefaultComplication.launchNotification)) { _ in
                 showAssist = true
             }
@@ -53,15 +54,6 @@ struct WatchHomeView: View {
         NavigationStack {
             content
                 .persistentSystemOverlays(.hidden)
-                .toolbar {
-                    reloadToolbarButton
-                    if viewModel.showAssist {
-                        assistToolbarButton
-                    }
-                    if viewModel.isLoading {
-                        toolbarLoadingState
-                    }
-                }
         }
     }
 
@@ -74,12 +66,21 @@ struct WatchHomeView: View {
     @ViewBuilder
     private var content: some View {
         List {
-            inlineLoader
+            listHeader
             listContent
             footer
         }
+        // Removing the safe area so our fake navigation bar buttons (header) can be place correctly
+        .ignoresSafeArea([.all], edges: .top)
         .id(viewModel.refreshListID)
         .navigationTitle("")
+        .modify { view in
+            if #available(watchOS 11.0, *) {
+                view.toolbarVisibility(.hidden, for: .navigationBar)
+            } else {
+                view
+            }
+        }
     }
 
     @ViewBuilder
@@ -93,19 +94,21 @@ struct WatchHomeView: View {
     }
 
     @ViewBuilder
-    private var inlineReloadButton: some View {
-        if viewModel.watchConfig.items.isEmpty || viewModel.showError {
-            reloadButton
-        }
-    }
-
-    @ViewBuilder
-    private var inlineLoader: some View {
-        // Loader is displayed in list when watchOS 10 is not available
-        if viewModel.isLoading, #unavailable(watchOS 10.0) {
-            loadingState
-                .listRowBackground(Color.clear)
+    private var listHeader: some View {
+        HStack {
+            navReloadButton
+            Spacer()
+            if viewModel.isLoading {
+                toolbarLoadingState
+            }
+            if viewModel.showAssist {
+                Spacer()
+                assistHeaderButton
+            } else {
+                Spacer()
+            }
         }
+        .listRowBackground(Color.clear)
     }
 
     @ViewBuilder
@@ -122,35 +125,24 @@ struct WatchHomeView: View {
 
     @ViewBuilder
     private var mainContent: some View {
-        assistButtonForOlderDevices
         ForEach(viewModel.watchConfig.items, id: \.serverUniqueId) { item in
             WatchMagicViewRow(
                 item: item,
                 itemInfo: viewModel.info(for: item)
             )
         }
-        reloadButton
     }
 
-    @available(watchOS 10, *)
-    private var reloadToolbarButton: some ToolbarContent {
-        ToolbarItem(placement: .topBarLeading) {
-            navReloadButton
-        }
-    }
-
-    @available(watchOS 10, *)
-    private var assistToolbarButton: some ToolbarContent {
-        ToolbarItem(placement: .topBarTrailing) {
-            assistButton
-                .modify { view in
-                    if #available(watchOS 11, *) {
-                        view.handGestureShortcut(.primaryAction)
-                    } else {
-                        view
-                    }
+    private var assistHeaderButton: some View {
+        assistButton
+            .modify { view in
+                if #available(watchOS 11, *) {
+                    view.handGestureShortcut(.primaryAction)
+                } else {
+                    view
                 }
-        }
+            }
+            .circularGlassOrLegacyBackground()
     }
 
     private var assistButton: some View {
@@ -169,6 +161,7 @@ struct WatchHomeView: View {
                 color: color
             ))
         })
+        .buttonStyle(.plain)
         .modify { view in
             if #available(watchOS 26.0, *) {
                 view
@@ -179,30 +172,19 @@ struct WatchHomeView: View {
         }
     }
 
-    @available(watchOS 10, *)
     private var navReloadButton: some View {
         Button {
             viewModel.requestConfig()
         } label: {
-            Image(systemSymbol: .arrowCirclepath)
+            Image(systemSymbol: .arrowCounterclockwise)
         }
+        .buttonStyle(.plain)
+        .circularGlassOrLegacyBackground()
     }
 
-    @available(watchOS 10, *)
-    private var toolbarLoadingState: some ToolbarContent {
-        ToolbarItem(placement: .bottomBar) {
-            loadingState
-                .modify { view in
-                    if #available(watchOS 26.0, *) {
-                        view
-                            .glassEffect(in: .circle)
-                    } else {
-                        view
-                            .padding()
-                            .background(.black)
-                    }
-                }
-        }
+    private var toolbarLoadingState: some View {
+        loadingState
+            .circularGlassOrLegacyBackground()
     }
 
     private var loadingState: some View {
@@ -238,35 +220,4 @@ struct WatchHomeView: View {
             .foregroundStyle(.secondary.opacity(0.5))
         }
     }
-
-    @ViewBuilder
-    private var reloadButton: some View {
-        // When watchOS 10 is available, reload is on toolbar
-        if #unavailable(watchOS 10.0) {
-            Button {
-                viewModel.requestConfig()
-            } label: {
-                Group {
-                    if #available(watchOS 10.0, *) {
-                        Label(L10n.reloadLabel, systemSymbol: .arrowCirclepath)
-                    } else {
-                        Label(L10n.reloadLabel, systemSymbol: .arrowTriangle2CirclepathCircle)
-                    }
-                }
-                .frame(maxWidth: .infinity, alignment: .center)
-                .font(.footnote)
-            }
-            .listRowBackground(Color.clear)
-        }
-    }
-
-    @ViewBuilder
-    private var assistButtonForOlderDevices: some View {
-        if #unavailable(watchOS 10),
-           viewModel.watchConfig.assist.showAssist,
-           !viewModel.watchConfig.assist.serverId.isEmpty,
-           !viewModel.watchConfig.assist.pipelineId.isEmpty {
-            assistButton
-        }
-    }
 }

Sources/Extensions/Watch/Home/WatchHomeView.swift

@@ -0,0 +1,14 @@
+import Foundation
+import Shared
+import SwiftUI
+
+final class HostingController: WKHostingController<WatchHomeView> {
+    override init() {
+        super.init()
+        MaterialDesignIcons.register()
+    }
+
+    override var body: WatchHomeView {
+        WatchHomeView()
+    }
+}