Просмотр исходного кода

Merge pull request #430 from loopandlearn/reset-remote

Optimize RemoteViewController updates and refresh view on tab selection
Marion Barker 1 год назад
Родитель
Сommit
9cdef1c3da
1 измененных файлов с 11 добавлено и 12 удалено
  1. 11 12
      LoopFollow/Remote/RemoteViewController.swift

+ 11 - 12
LoopFollow/Remote/RemoteViewController.swift

@@ -3,8 +3,6 @@
 // Created by Jonas Björkert.
 
 import Combine
-import Foundation
-import HealthKit
 import SwiftUI
 import UIKit
 
@@ -15,17 +13,13 @@ class RemoteViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        cancellable = Publishers.CombineLatest(
-            Storage.shared.remoteType.$value.removeDuplicates(),
-            Storage.shared.device.$value.removeDuplicates()
-        )
-        .sink { [weak self] _, _ in
-            DispatchQueue.main.async {
-                self?.updateView()
+        cancellable = Storage.shared.device.$value
+            .removeDuplicates()
+            .sink { [weak self] _ in
+                DispatchQueue.main.async {
+                    self?.updateView()
+                }
             }
-        }
-
-        updateView()
     }
 
     private func updateView() {
@@ -91,6 +85,11 @@ class RemoteViewController: UIViewController {
         }
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        updateView()
+    }
+
     deinit {
         cancellable?.cancel()
     }