Skip to content

Commit d1de79b

Browse files
authored
Scout watch connectivity (#3447)
1 parent 3fa8963 commit d1de79b

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

HomeAssistant.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@
714714
4285C5512D355F9900DADE45 /* WidgetCreationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4285C5502D355F9900DADE45 /* WidgetCreationView.swift */; };
715715
4285C5532D35658000DADE45 /* TileCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4285C5522D35658000DADE45 /* TileCard.swift */; };
716716
4285C5552D3568A100DADE45 /* WidgetAddItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4285C5542D3568A100DADE45 /* WidgetAddItemView.swift */; };
717-
428830EB2C6E3A8D0012373D /* WatchHomeCoordinatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428830EA2C6E3A8D0012373D /* WatchHomeCoordinatorView.swift */; };
717+
428830EB2C6E3A8D0012373D /* WatchHomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428830EA2C6E3A8D0012373D /* WatchHomeView.swift */; };
718718
428830ED2C6E3A9A0012373D /* WatchHomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428830EC2C6E3A9A0012373D /* WatchHomeViewModel.swift */; };
719719
4289DDAA2C85AB4C003591C2 /* AssistAppIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 425FF0552C8216B3000AA641 /* AssistAppIntent.swift */; };
720720
4289DDAB2C85AB56003591C2 /* ControlAssistValueProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42E65F072C8079FE00C4A6F2 /* ControlAssistValueProvider.swift */; };
@@ -2069,7 +2069,7 @@
20692069
4285C5502D355F9900DADE45 /* WidgetCreationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetCreationView.swift; sourceTree = "<group>"; };
20702070
4285C5522D35658000DADE45 /* TileCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileCard.swift; sourceTree = "<group>"; };
20712071
4285C5542D3568A100DADE45 /* WidgetAddItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetAddItemView.swift; sourceTree = "<group>"; };
2072-
428830EA2C6E3A8D0012373D /* WatchHomeCoordinatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchHomeCoordinatorView.swift; sourceTree = "<group>"; };
2072+
428830EA2C6E3A8D0012373D /* WatchHomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchHomeView.swift; sourceTree = "<group>"; };
20732073
428830EC2C6E3A9A0012373D /* WatchHomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchHomeViewModel.swift; sourceTree = "<group>"; };
20742074
4289DDAE2C85D5C4003591C2 /* ControlScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlScene.swift; sourceTree = "<group>"; };
20752075
4289DDB02C85D629003591C2 /* ControlScenesValueProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlScenesValueProvider.swift; sourceTree = "<group>"; };
@@ -4283,7 +4283,7 @@
42834283
isa = PBXGroup;
42844284
children = (
42854285
4207EB742C87547000286A2D /* MagicItemRow */,
4286-
428830EA2C6E3A8D0012373D /* WatchHomeCoordinatorView.swift */,
4286+
428830EA2C6E3A8D0012373D /* WatchHomeView.swift */,
42874287
428830EC2C6E3A9A0012373D /* WatchHomeViewModel.swift */,
42884288
);
42894289
path = Home;
@@ -7545,7 +7545,7 @@
75457545
426490772C0F2403002155CC /* WatchAudioRecorder.swift in Sources */,
75467546
423F45212C19D89100766A99 /* AssistDefaultComplication.swift in Sources */,
75477547
428830ED2C6E3A9A0012373D /* WatchHomeViewModel.swift in Sources */,
7548-
428830EB2C6E3A8D0012373D /* WatchHomeCoordinatorView.swift in Sources */,
7548+
428830EB2C6E3A8D0012373D /* WatchHomeView.swift in Sources */,
75497549
1178AB00263E2DF7007BA9D0 /* WKInterfaceLabel+Additions.swift in Sources */,
75507550
42EB030A2C6E4D0E00A184A6 /* WatchMagicViewRow.swift in Sources */,
75517551
11FA9321263FA7AC0015F1FC /* NotificationSubControllerMap.swift in Sources */,

Sources/Extensions/Watch/Home/WatchHomeCoordinatorView.swift renamed to Sources/Extensions/Watch/Home/WatchHomeView.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ struct WatchHomeView: View {
2525
)
2626
})
2727
.onAppear {
28+
viewModel.fetchNetworkInfo(completion: nil)
2829
viewModel.initialRoutine()
2930
}
3031
}
@@ -101,14 +102,6 @@ struct WatchHomeView: View {
101102
}
102103
.id(viewModel.refreshListID)
103104
.navigationTitle("")
104-
.onChange(of: scenePhase) { newScenePhase in
105-
switch newScenePhase {
106-
case .active:
107-
viewModel.fetchNetworkInfo(completion: nil)
108-
default:
109-
break
110-
}
111-
}
112105
}
113106

114107
private var navReloadButton: some View {

Sources/Extensions/Watch/Home/WatchHomeViewModel.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ final class WatchHomeViewModel: ObservableObject {
2525
// are different, the list won't refresh. This is a workaround to force a refresh
2626
@Published var refreshListID: UUID = .init()
2727

28-
private let watchConfigCacheKey = "watch-config"
29-
private let magicItemsInfoCacheKey = "magic-items-info"
30-
3128
func fetchNetworkInfo(completion: (() -> Void)? = nil) {
3229
NEHotspotNetwork.fetchCurrent { hotspotNetwork in
3330
WatchUserDefaults.shared.set(hotspotNetwork?.ssid, key: .watchSSID)

0 commit comments

Comments
 (0)