Add new menus

Model/Accounts/InstancesModel.swift

@@ -2,7 +2,7 @@ import Defaults
 import Foundation
 
 final class InstancesModel: ObservableObject {
-    var all: [Instance] {
+    static var all: [Instance] {
         Defaults[.instances]
     }
 

Model/MenuModel.swift

@@ -0,0 +1,18 @@
+import Combine
+import Foundation
+
+final class MenuModel: ObservableObject {
+    @Published var accounts: AccountsModel? { didSet { registerChildModel(accounts) } }
+    @Published var navigation: NavigationModel? { didSet { registerChildModel(navigation) } }
+    @Published var player: PlayerModel? { didSet { registerChildModel(player) } }
+
+    private var cancellables = [AnyCancellable]()
+
+    func registerChildModel<T: ObservableObject>(_ model: T?) {
+        guard !model.isNil else {
+            return
+        }
+
+        cancellables.append(model!.objectWillChange.sink { [weak self] _ in self?.objectWillChange.send() })
+    }
+}

Model/Player/PlayerModel.swift

@@ -43,7 +43,6 @@ final class PlayerModel: ObservableObject {
     @Published var restoredSegments = [Segment]()
 
     var accounts: AccountsModel
-    var instances: InstancesModel
 
     var composition = AVMutableComposition()
 
@@ -67,9 +66,8 @@ final class PlayerModel: ObservableObject {
         #endif
     }}
 
-    init(accounts: AccountsModel? = nil, instances: InstancesModel? = nil) {
+    init(accounts: AccountsModel? = nil, instances _: InstancesModel? = nil) {
         self.accounts = accounts ?? AccountsModel()
-        self.instances = instances ?? InstancesModel()
 
         addItemDidPlayToEndTimeObserver()
         addFrequentTimeObserver()
@@ -81,6 +79,10 @@ final class PlayerModel: ObservableObject {
         presentingPlayer = true
     }
 
+    func togglePlayer() {
+        presentingPlayer.toggle()
+    }
+
     var isPlaying: Bool {
         player.timeControlStatus == .playing
     }

Model/Player/PlayerStreams.swift

@@ -22,7 +22,7 @@ extension PlayerModel {
         availableStreams = []
         var instancesWithLoadedStreams = [Instance]()
 
-        instances.all.forEach { instance in
+        InstancesModel.all.forEach { instance in
             fetchStreams(instance.anonymous.video(video.videoID), instance: instance, video: video) { _ in
                 self.completeIfAllInstancesLoaded(
                     instance: instance,
@@ -59,7 +59,7 @@ extension PlayerModel {
         instancesWithLoadedStreams.append(instance)
         rebuildTVMenu()
 
-        if instances.all.count == instancesWithLoadedStreams.count {
+        if InstancesModel.all.count == instancesWithLoadedStreams.count {
             completionHandler(streams.sorted { $0.kind < $1.kind })
         }
     }