From 28a928f87d13f901dd726c60bf1858033aec60b8 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Thu, 19 Dec 2019 12:13:46 -0400 Subject: [PATCH 01/15] created ShareClient plugin --- ShareClient.xcodeproj/project.pbxproj | 152 ++++++++++++++++++ ShareClient/OSLog.swift | 51 ++++++ ShareClientPlugin/Info.plist | 30 ++++ .../ShareClientPlugin-Bridging-Header.h | 4 + ShareClientPlugin/ShareClientPlugin.swift | 31 ++++ 5 files changed, 268 insertions(+) create mode 100644 ShareClient/OSLog.swift create mode 100644 ShareClientPlugin/Info.plist create mode 100644 ShareClientPlugin/ShareClientPlugin-Bridging-Header.h create mode 100644 ShareClientPlugin/ShareClientPlugin.swift diff --git a/ShareClient.xcodeproj/project.pbxproj b/ShareClient.xcodeproj/project.pbxproj index ba6a52f..6f6dcc2 100644 --- a/ShareClient.xcodeproj/project.pbxproj +++ b/ShareClient.xcodeproj/project.pbxproj @@ -44,6 +44,9 @@ A9ED4D9E225EB4D30080DEBA /* ShareClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 432B0E8B1CDFC3C50045347B /* ShareClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9ED4DA0225EB4D30080DEBA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 43AB5125213315D300B3D58D /* Localizable.strings */; }; A9ED4DAF225EB93A0080DEBA /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ED4DAE225EB9390080DEBA /* HealthKit.framework */; }; + B40BF26623ABD4E700A43CEE /* ShareClientPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40BF26523ABD4E700A43CEE /* ShareClientPlugin.swift */; }; + B40BF26823ABD55200A43CEE /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40BF26723ABD55200A43CEE /* OSLog.swift */; }; + B40BF26923ABD55200A43CEE /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40BF26723ABD55200A43CEE /* OSLog.swift */; }; C17D3CC62184CC26003458C8 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A8EC7B210E661400A81379 /* LoopKit.framework */; }; /* End PBXBuildFile section */ @@ -62,6 +65,13 @@ remoteGlobalIDString = 432B0E871CDFC3C50045347B; remoteInfo = ShareClient; }; + B40BF26A23ABD5E100A43CEE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 432B0E7F1CDFC3C50045347B /* Project object */; + proxyType = 1; + remoteGlobalIDString = 43A8EC81210E664300A81379; + remoteInfo = ShareClientUI; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -112,6 +122,11 @@ 43C418AE1CE0488900405B6A /* ShareClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareClient.swift; sourceTree = ""; }; A9ED4DA4225EB4D30080DEBA /* ShareClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ShareClient.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A9ED4DAE225EB9390080DEBA /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HealthKit.framework; sourceTree = DEVELOPER_DIR; }; + B40BF25E23ABD47400A43CEE /* ShareClientPlugin.loopplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ShareClientPlugin.loopplugin; sourceTree = BUILT_PRODUCTS_DIR; }; + B40BF26023ABD47400A43CEE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B40BF26423ABD4E600A43CEE /* ShareClientPlugin-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ShareClientPlugin-Bridging-Header.h"; sourceTree = ""; }; + B40BF26523ABD4E700A43CEE /* ShareClientPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareClientPlugin.swift; sourceTree = ""; }; + B40BF26723ABD55200A43CEE /* OSLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -153,6 +168,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B40BF25B23ABD47400A43CEE /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -163,6 +185,7 @@ 432B0E8A1CDFC3C50045347B /* ShareClient */, 432B0E961CDFC3C50045347B /* ShareClientTests */, 43A8EC83210E664300A81379 /* ShareClientUI */, + B40BF25F23ABD47400A43CEE /* ShareClientPlugin */, 432B0E891CDFC3C50045347B /* Products */, 43A8EC7A210E661300A81379 /* Frameworks */, ); @@ -175,6 +198,7 @@ 432B0E921CDFC3C50045347B /* ShareClientTests.xctest */, 43A8EC82210E664300A81379 /* ShareClientUI.framework */, A9ED4DA4225EB4D30080DEBA /* ShareClient.framework */, + B40BF25E23ABD47400A43CEE /* ShareClientPlugin.loopplugin */, ); name = Products; sourceTree = ""; @@ -191,6 +215,7 @@ 4325E9D0210E6A3D00969CE5 /* TimeInterval.swift */, 432B0E8B1CDFC3C50045347B /* ShareClient.h */, 432B0E8D1CDFC3C50045347B /* Info.plist */, + B40BF26723ABD55200A43CEE /* OSLog.swift */, ); path = ShareClient; sourceTree = ""; @@ -239,6 +264,16 @@ path = Common; sourceTree = ""; }; + B40BF25F23ABD47400A43CEE /* ShareClientPlugin */ = { + isa = PBXGroup; + children = ( + B40BF26023ABD47400A43CEE /* Info.plist */, + B40BF26523ABD4E700A43CEE /* ShareClientPlugin.swift */, + B40BF26423ABD4E600A43CEE /* ShareClientPlugin-Bridging-Header.h */, + ); + path = ShareClientPlugin; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -343,6 +378,24 @@ productReference = A9ED4DA4225EB4D30080DEBA /* ShareClient.framework */; productType = "com.apple.product-type.framework"; }; + B40BF25D23ABD47400A43CEE /* ShareClientPlugin */ = { + isa = PBXNativeTarget; + buildConfigurationList = B40BF26323ABD47400A43CEE /* Build configuration list for PBXNativeTarget "ShareClientPlugin" */; + buildPhases = ( + B40BF25A23ABD47400A43CEE /* Sources */, + B40BF25B23ABD47400A43CEE /* Frameworks */, + B40BF25C23ABD47400A43CEE /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + B40BF26B23ABD5E100A43CEE /* PBXTargetDependency */, + ); + name = ShareClientPlugin; + productName = ShareClientPlugin; + productReference = B40BF25E23ABD47400A43CEE /* ShareClientPlugin.loopplugin */; + productType = "com.apple.product-type.bundle"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -366,6 +419,11 @@ LastSwiftMigration = 1000; ProvisioningStyle = Automatic; }; + B40BF25D23ABD47400A43CEE = { + CreatedOnToolsVersion = 11.0; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + }; }; }; buildConfigurationList = 432B0E821CDFC3C50045347B /* Build configuration list for PBXProject "ShareClient" */; @@ -394,6 +452,7 @@ A9ED4D91225EB4D30080DEBA /* ShareClient-watchOS */, 432B0E911CDFC3C50045347B /* ShareClientTests */, 43A8EC81210E664300A81379 /* ShareClientUI */, + B40BF25D23ABD47400A43CEE /* ShareClientPlugin */, ); }; /* End PBXProject section */ @@ -430,6 +489,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B40BF25C23ABD47400A43CEE /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -462,6 +528,7 @@ files = ( 4325E9CF210E6A0A00969CE5 /* HKUnit.swift in Sources */, 4325E9D1210E6A3D00969CE5 /* TimeInterval.swift in Sources */, + B40BF26823ABD55200A43CEE /* OSLog.swift in Sources */, 43A8EC9D210E68CE00A81379 /* ShareClientManager.swift in Sources */, 43AB51362133177800B3D58D /* LocalizedString.swift in Sources */, 43A8EC9B210E68BA00A81379 /* ShareGlucose+GlucoseKit.swift in Sources */, @@ -506,6 +573,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B40BF25A23ABD47400A43CEE /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B40BF26923ABD55200A43CEE /* OSLog.swift in Sources */, + B40BF26623ABD4E700A43CEE /* ShareClientPlugin.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -519,6 +595,11 @@ target = 432B0E871CDFC3C50045347B /* ShareClient */; targetProxy = A9E521F6225E949400EDDEF2 /* PBXContainerItemProxy */; }; + B40BF26B23ABD5E100A43CEE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 43A8EC81210E664300A81379 /* ShareClientUI */; + targetProxy = B40BF26A23ABD5E100A43CEE /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -886,6 +967,68 @@ }; name = Release; }; + B40BF26123ABD47400A43CEE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = ShareClientPlugin/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.ShareClientPlugin; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "ShareClientPlugin/ShareClientPlugin-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 1; + WRAPPER_EXTENSION = loopplugin; + }; + name = Debug; + }; + B40BF26223ABD47400A43CEE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = ShareClientPlugin/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.ShareClientPlugin; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "ShareClientPlugin/ShareClientPlugin-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 1; + WRAPPER_EXTENSION = loopplugin; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -934,6 +1077,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + B40BF26323ABD47400A43CEE /* Build configuration list for PBXNativeTarget "ShareClientPlugin" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B40BF26123ABD47400A43CEE /* Debug */, + B40BF26223ABD47400A43CEE /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 432B0E7F1CDFC3C50045347B /* Project object */; diff --git a/ShareClient/OSLog.swift b/ShareClient/OSLog.swift new file mode 100644 index 0000000..e572460 --- /dev/null +++ b/ShareClient/OSLog.swift @@ -0,0 +1,51 @@ +// +// OSLog.swift +// ShareClient +// +// Created by Nathaniel Hamming on 2019-12-19. +// Copyright © 2019 Mark Wilson. All rights reserved. +// + +import os.log + + +extension OSLog { + convenience init(category: String) { + self.init(subsystem: "com.loopkit.ShareClient", category: category) + } + + func debug(_ message: StaticString, _ args: CVarArg...) { + log(message, type: .debug, args) + } + + func info(_ message: StaticString, _ args: CVarArg...) { + log(message, type: .info, args) + } + + func `default`(_ message: StaticString, _ args: CVarArg...) { + log(message, type: .default, args) + } + + func error(_ message: StaticString, _ args: CVarArg...) { + log(message, type: .error, args) + } + + private func log(_ message: StaticString, type: OSLogType, _ args: [CVarArg]) { + switch args.count { + case 0: + os_log(message, log: self, type: type) + case 1: + os_log(message, log: self, type: type, args[0]) + case 2: + os_log(message, log: self, type: type, args[0], args[1]) + case 3: + os_log(message, log: self, type: type, args[0], args[1], args[2]) + case 4: + os_log(message, log: self, type: type, args[0], args[1], args[2], args[3]) + case 5: + os_log(message, log: self, type: type, args[0], args[1], args[2], args[3], args[4]) + default: + os_log(message, log: self, type: type, args) + } + } +} diff --git a/ShareClientPlugin/Info.plist b/ShareClientPlugin/Info.plist new file mode 100644 index 0000000..797c568 --- /dev/null +++ b/ShareClientPlugin/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + NSHumanReadableCopyright + Copyright © 2019 Mark Wilson. All rights reserved. + NSPrincipalClass + ShareClientPlugin + com.loopkit.Loop.CGMManagerDisplayName + Dexcom Share + com.loopkit.Loop.CGMManagerIdentifier + ShareClient + + diff --git a/ShareClientPlugin/ShareClientPlugin-Bridging-Header.h b/ShareClientPlugin/ShareClientPlugin-Bridging-Header.h new file mode 100644 index 0000000..1b2cb5d --- /dev/null +++ b/ShareClientPlugin/ShareClientPlugin-Bridging-Header.h @@ -0,0 +1,4 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + diff --git a/ShareClientPlugin/ShareClientPlugin.swift b/ShareClientPlugin/ShareClientPlugin.swift new file mode 100644 index 0000000..3009fa3 --- /dev/null +++ b/ShareClientPlugin/ShareClientPlugin.swift @@ -0,0 +1,31 @@ +// +// ShareClientPlugin.swift +// ShareClientPlugin +// +// Created by Nathaniel Hamming on 2019-12-19. +// Copyright © 2019 Mark Wilson. All rights reserved. +// + +import Foundation +import LoopKitUI +import ShareClient +import ShareClientUI +import os.log + +class ShareClientPlugin: NSObject, LoopUIPlugin { + + private let log = OSLog(category: "ShareClientPlugin") + + public var pumpManagerType: PumpManagerUI.Type? { + return nil + } + + public var cgmManagerType: CGMManagerUI.Type? { + return ShareClientManager.self + } + + override init() { + super.init() + log.default("ShareClientPlugin Instantiated") + } +} From bee96cdd35968f45e6b370b90ac0548859d63ae7 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Fri, 28 Feb 2020 15:01:06 -0400 Subject: [PATCH 02/15] updating project target to 13.0 (#6) --- ShareClient.xcodeproj/project.pbxproj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ShareClient.xcodeproj/project.pbxproj b/ShareClient.xcodeproj/project.pbxproj index 6f6dcc2..9cfbce8 100644 --- a/ShareClient.xcodeproj/project.pbxproj +++ b/ShareClient.xcodeproj/project.pbxproj @@ -431,6 +431,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, fr, @@ -689,7 +690,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.1; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LOCALIZED_STRING_MACRO_NAMES = ( NSLocalizedString, CFLocalizedString, @@ -749,7 +750,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.1; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LOCALIZED_STRING_MACRO_NAMES = ( NSLocalizedString, CFLocalizedString, @@ -933,8 +934,8 @@ PRODUCT_NAME = ShareClient; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SUPPORTED_PLATFORMS = "watchos watchsimulator"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; }; @@ -981,7 +982,6 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareClientPlugin/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.15; @@ -1013,7 +1013,6 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareClientPlugin/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.15; From d82dec21ac852ae37d72a1816051fe15815adaa4 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Mon, 11 May 2020 16:03:42 -0700 Subject: [PATCH 03/15] Add default implementation for DeviceAlertResponder, DeviceAlertSoundVendor (#7) --- ShareClient/ShareClientManager.swift | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ShareClient/ShareClientManager.swift b/ShareClient/ShareClientManager.swift index 8d9d6f9..319430a 100644 --- a/ShareClient/ShareClientManager.swift +++ b/ShareClient/ShareClientManager.swift @@ -10,6 +10,7 @@ import HealthKit public class ShareClientManager: CGMManager { + public static var managerIdentifier = "DexShareClient" public init() { @@ -119,3 +120,15 @@ public class ShareClientManager: CGMManager { ].joined(separator: "\n") } } + +// MARK: - DeviceAlertResponder implementation +extension ShareClientManager { + public func acknowledgeAlert(alertIdentifier: DeviceAlert.AlertIdentifier) { } +} + +// MARK: - DeviceAlertSoundVendor implementation +extension ShareClientManager { + public func getSoundBaseURL() -> URL? { return nil } + public func getSounds() -> [DeviceAlert.Sound] { return [] } +} + From 5e79825be24887a7799fee14ec79ec166923d5b9 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Tue, 9 Jun 2020 14:38:13 -0700 Subject: [PATCH 04/15] Rename DeviceAlert -> Alert (#8) --- ShareClient/ShareClientManager.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ShareClient/ShareClientManager.swift b/ShareClient/ShareClientManager.swift index 319430a..567949a 100644 --- a/ShareClient/ShareClientManager.swift +++ b/ShareClient/ShareClientManager.swift @@ -121,14 +121,14 @@ public class ShareClientManager: CGMManager { } } -// MARK: - DeviceAlertResponder implementation +// MARK: - AlertResponder implementation extension ShareClientManager { - public func acknowledgeAlert(alertIdentifier: DeviceAlert.AlertIdentifier) { } + public func acknowledgeAlert(alertIdentifier: Alert.AlertIdentifier) { } } -// MARK: - DeviceAlertSoundVendor implementation +// MARK: - AlertSoundVendor implementation extension ShareClientManager { public func getSoundBaseURL() -> URL? { return nil } - public func getSounds() -> [DeviceAlert.Sound] { return [] } + public func getSounds() -> [Alert.Sound] { return [] } } From bb49ed5e625f4912d6b1f1cbdaf7488845ffa53c Mon Sep 17 00:00:00 2001 From: Darin Krauss Date: Mon, 15 Jun 2020 11:41:50 -0700 Subject: [PATCH 05/15] LOOP-1361 Capture manually entered BG reading (#9) - https://tidepool.atlassian.net/browse/LOOP-1361 --- ShareClient/ShareClientManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShareClient/ShareClientManager.swift b/ShareClient/ShareClientManager.swift index 567949a..be3cad1 100644 --- a/ShareClient/ShareClientManager.swift +++ b/ShareClient/ShareClientManager.swift @@ -97,7 +97,7 @@ public class ShareClientManager: CGMManager { } let newGlucose = glucose.filterDateRange(startDate, nil) let newSamples = newGlucose.filter({ $0.isStateValid }).map { - return NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, syncIdentifier: "\(Int($0.startDate.timeIntervalSince1970))", device: self.device) + return NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, wasUserEntered: false, syncIdentifier: "\(Int($0.startDate.timeIntervalSince1970))", device: self.device) } self.latestBackfill = newGlucose.first From 131c93151d5ba837deb3f49d313e9686b2647637 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Wed, 24 Jun 2020 14:46:27 -0300 Subject: [PATCH 06/15] nate/feature/LOOP-1207/cgm-status-report-facility (#10) * conforming to CGMManagerStatusReport with placeholders * refactor to CGMManagerUI and SensorDisplayable protocols --- ShareClient/ShareGlucose+GlucoseKit.swift | 5 +++++ ShareClientUI/ShareClientManager+UI.swift | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ShareClient/ShareGlucose+GlucoseKit.swift b/ShareClient/ShareGlucose+GlucoseKit.swift index b40c86f..18b65b7 100644 --- a/ShareClient/ShareGlucose+GlucoseKit.swift +++ b/ShareClient/ShareGlucose+GlucoseKit.swift @@ -34,6 +34,11 @@ extension ShareGlucose: SensorDisplayable { public var isLocal: Bool { return false } + + // TODO Placeholder. This functionality will come with LOOP-1311 + public var glucoseValueType: GlucoseValueType? { + return nil + } } extension SensorDisplayable { diff --git a/ShareClientUI/ShareClientManager+UI.swift b/ShareClientUI/ShareClientManager+UI.swift index dcac4a0..b696325 100644 --- a/ShareClientUI/ShareClientManager+UI.swift +++ b/ShareClientUI/ShareClientManager+UI.swift @@ -24,4 +24,14 @@ extension ShareClientManager: CGMManagerUI { public var smallImage: UIImage? { return nil } + + // TODO Placeholder. This functionality will come with LOOP-1311 + public var cgmStatusHighlight: DeviceStatusHighlight? { + return nil + } + + // TODO Placeholder. This functionality will come with LOOP-1311 + public var progressPercentCompleted: Double? { + return nil + } } From 96c04d6481003a00138ab376c79e95a335e69b1e Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Fri, 26 Jun 2020 08:25:35 -0300 Subject: [PATCH 07/15] DeviceStatusHighlight was moved. updating (#11) --- ShareClientUI/ShareClientManager+UI.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShareClientUI/ShareClientManager+UI.swift b/ShareClientUI/ShareClientManager+UI.swift index b696325..4cc4161 100644 --- a/ShareClientUI/ShareClientManager+UI.swift +++ b/ShareClientUI/ShareClientManager+UI.swift @@ -5,11 +5,11 @@ // Copyright © 2018 LoopKit Authors. All rights reserved. // +import LoopKit import LoopKitUI import HealthKit import ShareClient - extension ShareClientManager: CGMManagerUI { public static func setupViewController() -> (UIViewController & CGMManagerSetupViewController & CompletionNotifying)? { return ShareClientSetupViewController() From 07f0a8957b873b6e52e86cc08ad16ebd495a38d3 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Mon, 6 Jul 2020 14:55:43 -0300 Subject: [PATCH 08/15] nate/feature/LOOP-1293/display-mock-cgm-status-progress (#12) * refactor to device status progress * renaming request --- ShareClientUI/ShareClientManager+UI.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShareClientUI/ShareClientManager+UI.swift b/ShareClientUI/ShareClientManager+UI.swift index 4cc4161..3423b53 100644 --- a/ShareClientUI/ShareClientManager+UI.swift +++ b/ShareClientUI/ShareClientManager+UI.swift @@ -31,7 +31,7 @@ extension ShareClientManager: CGMManagerUI { } // TODO Placeholder. This functionality will come with LOOP-1311 - public var progressPercentCompleted: Double? { + public var cgmLifecycleProgress: DeviceLifecycleProgress? { return nil } } From 93da570cff1870fccf43b2e31e948feb81c1911e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Tue, 4 Aug 2020 16:12:18 -0500 Subject: [PATCH 09/15] Update bundle identifiers to LoopKit verison --- ShareClient.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShareClient.xcodeproj/project.pbxproj b/ShareClient.xcodeproj/project.pbxproj index 078a722..2206f5d 100644 --- a/ShareClient.xcodeproj/project.pbxproj +++ b/ShareClient.xcodeproj/project.pbxproj @@ -1019,7 +1019,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.ShareClientPlugin; + PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.ShareClientPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1049,7 +1049,7 @@ MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.ShareClientPlugin; + PRODUCT_BUNDLE_IDENTIFIER = com.loopkit.ShareClientPlugin; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; From e7791488e60469a7748b6e8a61f7267edd5e8bc5 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 6 Aug 2020 11:42:45 -0500 Subject: [PATCH 10/15] Update travis build to xcode 11.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f532350..8665de7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode11 +osx_image: xcode11.6 before_script: - carthage bootstrap From e59763001a100816761e3480697c228fc2cefa27 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 6 Aug 2020 11:58:13 -0500 Subject: [PATCH 11/15] Point carthage to tidepool merge branches --- Cartfile | 2 +- Cartfile.resolved | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index 05195c5..842f676 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "LoopKit/LoopKit" "dev" +github "LoopKit/LoopKit" "merge-from-tidepool" diff --git a/Cartfile.resolved b/Cartfile.resolved index d656185..55aad32 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1,2 @@ -github "LoopKit/LoopKit" "8bc6e4b4ed4d8a7e98d8dcf539238b98c83ed3d1" +github "LoopKit/LoopKit" "564d8554d43f65034d341e0edf0ffd5bec7223eb" +github "i-schuetz/SwiftCharts" "0.6.5" From 4814070cc2ece870a5edb2451076830853b40731 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Mon, 10 Aug 2020 09:00:05 -0300 Subject: [PATCH 12/15] color palette available to plugin (#13) --- ShareClientUI/ShareClientManager+UI.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ShareClientUI/ShareClientManager+UI.swift b/ShareClientUI/ShareClientManager+UI.swift index 3423b53..4a52e03 100644 --- a/ShareClientUI/ShareClientManager+UI.swift +++ b/ShareClientUI/ShareClientManager+UI.swift @@ -5,17 +5,18 @@ // Copyright © 2018 LoopKit Authors. All rights reserved. // +import SwiftUI import LoopKit import LoopKitUI import HealthKit import ShareClient extension ShareClientManager: CGMManagerUI { - public static func setupViewController() -> (UIViewController & CGMManagerSetupViewController & CompletionNotifying)? { + public static func setupViewController(glucoseTintColor: Color, guidanceColors: GuidanceColors) -> (UIViewController & CGMManagerSetupViewController & CompletionNotifying)? { return ShareClientSetupViewController() } - public func settingsViewController(for glucoseUnit: HKUnit) -> (UIViewController & CompletionNotifying) { + public func settingsViewController(for glucoseUnit: HKUnit, glucoseTintColor: Color, guidanceColors: GuidanceColors) -> (UIViewController & CompletionNotifying) { let settings = ShareClientSettingsViewController(cgmManager: self, glucoseUnit: glucoseUnit, allowsDeletion: true) let nav = SettingsNavigationViewController(rootViewController: settings) return nav From a888409b78152671715926cfaac6d7e65cf545cc Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Tue, 22 Sep 2020 18:01:44 -0300 Subject: [PATCH 13/15] nate/fix/LOOP-1927/manual-glucose-entry (#15) * updates to align with renaming in LoopKit * removed glucose range categorization * clean up --- ShareClient/ShareClientManager.swift | 2 +- ShareClient/ShareGlucose+GlucoseKit.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ShareClient/ShareClientManager.swift b/ShareClient/ShareClientManager.swift index be3cad1..088aaa2 100644 --- a/ShareClient/ShareClientManager.swift +++ b/ShareClient/ShareClientManager.swift @@ -61,7 +61,7 @@ public class ShareClientManager: CGMManager { public let shouldSyncToRemoteService = false - public var sensorState: SensorDisplayable? { + public var glucoseDisplay: GlucoseDisplayable? { return latestBackfill } diff --git a/ShareClient/ShareGlucose+GlucoseKit.swift b/ShareClient/ShareGlucose+GlucoseKit.swift index 18b65b7..97ec9e2 100644 --- a/ShareClient/ShareGlucose+GlucoseKit.swift +++ b/ShareClient/ShareGlucose+GlucoseKit.swift @@ -22,7 +22,7 @@ extension ShareGlucose: GlucoseValue { } -extension ShareGlucose: SensorDisplayable { +extension ShareGlucose: GlucoseDisplayable { public var isStateValid: Bool { return glucose >= 39 } @@ -36,12 +36,12 @@ extension ShareGlucose: SensorDisplayable { } // TODO Placeholder. This functionality will come with LOOP-1311 - public var glucoseValueType: GlucoseValueType? { + public var glucoseRangeCategory: GlucoseRangeCategory? { return nil } } -extension SensorDisplayable { +extension GlucoseDisplayable { public var stateDescription: String { if isStateValid { return LocalizedString("OK", comment: "Sensor state description for the valid state") From ef0959c2cef3ee1cbd686d258b024ba40b01f581 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Tue, 6 Oct 2020 23:04:42 -0500 Subject: [PATCH 14/15] Bump loopkit revs for carthage --- Cartfile.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 55aad32..329f958 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "LoopKit/LoopKit" "564d8554d43f65034d341e0edf0ffd5bec7223eb" +github "LoopKit/LoopKit" "3af6d00519a72d9b1b46bb41ebbadc7865d21e57" github "i-schuetz/SwiftCharts" "0.6.5" From babe5e72057aef2f063f5927a3989f4f18e6d3e6 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 7 Oct 2020 22:08:50 -0500 Subject: [PATCH 15/15] point to dev --- Cartfile | 2 +- Cartfile.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index 842f676..05195c5 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "LoopKit/LoopKit" "merge-from-tidepool" +github "LoopKit/LoopKit" "dev" diff --git a/Cartfile.resolved b/Cartfile.resolved index 329f958..d5db1f4 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "LoopKit/LoopKit" "3af6d00519a72d9b1b46bb41ebbadc7865d21e57" +github "LoopKit/LoopKit" "7ed70cb9bffc340d36234c4a1d93fc64d5362f67" github "i-schuetz/SwiftCharts" "0.6.5"