diff --git a/ShareClient.xcodeproj/project.pbxproj b/ShareClient.xcodeproj/project.pbxproj index e0332a9..cf78f89 100644 --- a/ShareClient.xcodeproj/project.pbxproj +++ b/ShareClient.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 4325E9CF210E6A0A00969CE5 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9CE210E6A0A00969CE5 /* HKUnit.swift */; }; 4325E9D1210E6A3D00969CE5 /* TimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D0210E6A3D00969CE5 /* TimeInterval.swift */; }; 4325E9D3210E6ADA00969CE5 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D2210E6ADA00969CE5 /* IdentifiableClass.swift */; }; 4325E9D5210E6B4400969CE5 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D4210E6B4300969CE5 /* UIColor.swift */; }; @@ -28,7 +27,6 @@ 43AB51362133177800B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; }; 43AB51372133177800B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; }; 43C418AF1CE0488900405B6A /* ShareClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418AE1CE0488900405B6A /* ShareClient.swift */; }; - A9ED4D93225EB4D30080DEBA /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9CE210E6A0A00969CE5 /* HKUnit.swift */; }; A9ED4D94225EB4D30080DEBA /* TimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4325E9D0210E6A3D00969CE5 /* TimeInterval.swift */; }; A9ED4D95225EB4D30080DEBA /* ShareClientManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A8EC9C210E68CE00A81379 /* ShareClientManager.swift */; }; A9ED4D96225EB4D30080DEBA /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB51352133177800B3D58D /* LocalizedString.swift */; }; @@ -64,7 +62,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 4325E9CE210E6A0A00969CE5 /* HKUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HKUnit.swift; sourceTree = ""; }; 4325E9D0210E6A3D00969CE5 /* TimeInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeInterval.swift; sourceTree = ""; }; 4325E9D2210E6ADA00969CE5 /* IdentifiableClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = ""; }; 4325E9D4210E6B4300969CE5 /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = ""; }; @@ -435,7 +432,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4325E9CF210E6A0A00969CE5 /* HKUnit.swift in Sources */, 4325E9D1210E6A3D00969CE5 /* TimeInterval.swift in Sources */, B40BF26823ABD55200A43CEE /* OSLog.swift in Sources */, 43A8EC9D210E68CE00A81379 /* ShareClientManager.swift in Sources */, @@ -464,7 +460,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A9ED4D93225EB4D30080DEBA /* HKUnit.swift in Sources */, A9ED4D94225EB4D30080DEBA /* TimeInterval.swift in Sources */, A9ED4D95225EB4D30080DEBA /* ShareClientManager.swift in Sources */, A9ED4D96225EB4D30080DEBA /* LocalizedString.swift in Sources */, @@ -549,7 +544,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.6; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; LOCALIZED_STRING_MACRO_NAMES = ( NSLocalizedString, @@ -613,7 +608,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.6; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; LOCALIZED_STRING_MACRO_NAMES = ( NSLocalizedString, diff --git a/ShareClient/HKUnit.swift b/ShareClient/HKUnit.swift deleted file mode 100644 index e3f0dde..0000000 --- a/ShareClient/HKUnit.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// HKUnit.swift -// xDripG5 -// -// Created by Nate Racklyeft on 8/6/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -import HealthKit - - -extension HKUnit { - static let milligramsPerDeciliter: HKUnit = { - return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci)) - }() -} diff --git a/ShareClient/ShareClientManager.swift b/ShareClient/ShareClientManager.swift index 49167be..d6369ed 100644 --- a/ShareClient/ShareClientManager.swift +++ b/ShareClient/ShareClientManager.swift @@ -10,8 +10,14 @@ import HealthKit public class ShareClientManager: CGMManager { + public var inSignalLoss: Bool = false + + public var isInoperable: Bool { + cgmManagerStatus.isInoperable + } + - public static let pluginIdentifier = "DexShareClient" + public let pluginIdentifier = "DexShareClient" public init() { shareService = ShareService(keychainManager: keychain) @@ -133,9 +139,7 @@ public class ShareClientManager: CGMManager { // MARK: - AlertResponder implementation extension ShareClientManager { - public func acknowledgeAlert(alertIdentifier: Alert.AlertIdentifier, completion: @escaping (Error?) -> Void) { - completion(nil) - } + public func acknowledgeAlert(alertIdentifier: LoopKit.Alert.AlertIdentifier) async throws { } } // MARK: - AlertSoundVendor implementation diff --git a/ShareClient/ShareGlucose+GlucoseKit.swift b/ShareClient/ShareGlucose+GlucoseKit.swift index 87f04d1..a9729d3 100644 --- a/ShareClient/ShareGlucose+GlucoseKit.swift +++ b/ShareClient/ShareGlucose+GlucoseKit.swift @@ -7,8 +7,8 @@ // import Foundation -import HealthKit import LoopKit +import LoopAlgorithm enum GlucoseLimits { static var minimum: UInt16 = 40 @@ -20,8 +20,8 @@ extension ShareGlucose: GlucoseValue { return timestamp } - public var quantity: HKQuantity { - return HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(min(max(glucose, GlucoseLimits.minimum), GlucoseLimits.maximum))) + public var quantity: LoopQuantity { + return LoopQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(min(max(glucose, GlucoseLimits.minimum), GlucoseLimits.maximum))) } } @@ -35,7 +35,7 @@ extension ShareGlucose: GlucoseDisplayable { return GlucoseTrend(rawValue: Int(trend)) } - public var trendRate: HKQuantity? { + public var trendRate: LoopQuantity? { return nil } diff --git a/ShareClientUI/ShareClientManager+UI.swift b/ShareClientUI/ShareClientManager+UI.swift index 517215e..00e83b7 100644 --- a/ShareClientUI/ShareClientManager+UI.swift +++ b/ShareClientUI/ShareClientManager+UI.swift @@ -8,7 +8,6 @@ import SwiftUI import LoopKit import LoopKitUI -import HealthKit import ShareClient extension ShareClientManager: CGMManagerUI { diff --git a/ShareClientUI/ShareClientSettingsViewController.swift b/ShareClientUI/ShareClientSettingsViewController.swift index 44e01d3..a0c47d3 100644 --- a/ShareClientUI/ShareClientSettingsViewController.swift +++ b/ShareClientUI/ShareClientSettingsViewController.swift @@ -7,7 +7,7 @@ import UIKit import Combine -import HealthKit +import LoopAlgorithm import LoopKit import LoopKitUI import ShareClient @@ -20,7 +20,7 @@ public class ShareClientSettingsViewController: UITableViewController { private lazy var cancellables = Set() - private var glucoseUnit: HKUnit { + private var glucoseUnit: LoopUnit { displayGlucosePreference.unit }