Merge branch 'dev' into dev-ivan

# Conflicts:
#	Cartfile.resolved

Author: ivalkou

Cartfile.resolved

@@ -4,7 +4,5 @@ github "LoopKit/G4ShareSpy" "e62d296067180c6659166272ff9cc406f470ec9e"
 github "LoopKit/LoopKit" "16276559436956e2f7cb343b73b767779f9f477f"
 github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
 github "LoopKit/dexcom-share-client-swift" "c4f3d48e56e5b3ad786486ccd1bbc753034096d2"
-github "dm61/LoopKit" "abde9e9fd9b228b39b7bf5e3507e93af5900c027"
-github "i-schuetz/SwiftCharts" "list"
-github "ivalkou/NightscoutAPIClient" "6e36bd3318e2a563bb9a97bf74b30bdb3b593b8a"
-github "ps2/rileylink_ios" "9495dd910e0e433198eff9c5decb37c8ea7a0a78"
+github "i-schuetz/SwiftCharts" "0.6.5"
+github "ps2/rileylink_ios" "92314a08f26e94e271961a629e4d7b898e4e2e4d"

Loop/Managers/LoopDataManager.swift

@@ -95,7 +95,7 @@ final class LoopDataManager {
         // Observe changes
         notificationObservers = [
             NotificationCenter.default.addObserver(
-                forName: .CarbEntriesDidUpdate,
+                forName: CarbStore.carbEntriesDidUpdate,
                 object: carbStore,
                 queue: nil
             ) { (note) -> Void in
@@ -108,7 +108,7 @@ final class LoopDataManager {
                 }
             },
             NotificationCenter.default.addObserver(
-                forName: .GlucoseSamplesDidChange,
+                forName: GlucoseStore.glucoseSamplesDidChange,
                 object: glucoseStore,
                 queue: nil
             ) { (note) in

WatchApp Extension/Controllers/CarbEntryListController.swift

@@ -46,7 +46,7 @@ class CarbEntryListController: WKInterfaceController, IdentifiableClass {
 
     override func willActivate() {
         observers = [
-            NotificationCenter.default.addObserver(forName: .CarbEntriesDidUpdate, object: loopManager.carbStore, queue: nil) { [weak self] (note) in
+            NotificationCenter.default.addObserver(forName: CarbStore.carbEntriesDidUpdate, object: loopManager.carbStore, queue: nil) { [weak self] (note) in
                 self?.log.default("Received CarbEntriesDidUpdate notification: %{public}@. Updating list", String(describing: note.userInfo ?? [:]))
 
                 DispatchQueue.main.async {

WatchApp Extension/Controllers/ChartHUDController.swift

@@ -118,7 +118,7 @@ final class ChartHUDController: HUDInterfaceController, WKCrownDelegate {
         super.willActivate()
 
         observers = [
-            NotificationCenter.default.addObserver(forName: .GlucoseSamplesDidChange, object: loopManager.glucoseStore, queue: nil) { [weak self] (note) in
+            NotificationCenter.default.addObserver(forName: GlucoseStore.glucoseSamplesDidChange, object: loopManager.glucoseStore, queue: nil) { [weak self] (note) in
                 self?.log.default("Received GlucoseSamplesDidChange notification: %{public}@. Updating chart", String(describing: note.userInfo ?? [:]))
 
                 DispatchQueue.main.async {