diff --git a/.gitignore b/.gitignore index 28599c1f8..7f76a428f 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,8 @@ fastlane/report.xml fastlane/screenshots # Sensitive details about remote backup -RemoteSettings.plist \ No newline at end of file +RemoteSettings.plist + +# OS +.DS_Store + diff --git a/.travis.yml b/.travis.yml index 4f7f27be3..e9ad3e32c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,13 @@ language: objective-c -osx_image: xcode7.3 -# xcode_sdk: iphonesimulator9.3 +osx_image: xcode8 +# xcode_sdk: iphonesimulator10.0 # xcode_project: Loop.xcodeproj # xcode_scheme: Loop before_script: # - carthage bootstrap - - cp Loop/RemoteSettings-template.plist Loop/RemoteSettings.plist script: # Build the app target - - xctool -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + - xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty # Run the test target - - xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone 6' test | xcpretty - - xctool -project Loop.xcodeproj -scheme DoseMathTests -sdk iphonesimulator9.3 test + - xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone SE' test | xcpretty + - xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone SE' test | xcpretty diff --git a/Cartfile b/Cartfile index 38c38b78a..96477f1d5 100644 --- a/Cartfile +++ b/Cartfile @@ -1,6 +1,7 @@ -github "loudnate/LoopKit" ~> 0.3.4 -github "loudnate/xDripG5" ~> 0.5.0 -github "loudnate/SwiftCharts" "loudnate/naterade" -github "mddub/dexcom-share-client-swift" ~> 0.1 -github "ps2/rileylink_ios" ~> 0.6.0 -github "amplitude/Amplitude-iOS" "mpurland-framework" +github "LoopKit/LoopKit" ~> 1.1.0 +github "LoopKit/xDripG5" ~> 0.8.0 +github "i-schuetz/SwiftCharts" ~> 0.5.0 +github "mddub/dexcom-share-client-swift" ~> 0.2.0 +github "mddub/G4ShareSpy" ~> 0.3.0 +github "ps2/rileylink_ios" ~> 0.12.6 +github "amplitude/Amplitude-iOS" ~> 3.8.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index 8387b8fdd..014185427 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ -github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7" -github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3" -github "loudnate/LoopKit" "v0.3.4" -github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085" -github "mddub/dexcom-share-client-swift" "v0.1.3" -github "loudnate/xDripG5" "0.5.0" -github "ps2/rileylink_ios" "v0.6.0" +github "amplitude/Amplitude-iOS" "v3.8.5" +github "mddub/G4ShareSpy" "v0.3.0" +github "LoopKit/LoopKit" "v1.1.0" +github "i-schuetz/SwiftCharts" "0.5" +github "mddub/dexcom-share-client-swift" "v0.2.0" +github "ps2/rileylink_ios" "v0.12.6" +github "LoopKit/xDripG5" "v0.8.0" diff --git a/Carthage/Build/iOS/Amplitude.framework/Amplitude b/Carthage/Build/iOS/Amplitude.framework/Amplitude new file mode 100755 index 000000000..3639d4f7f Binary files /dev/null and b/Carthage/Build/iOS/Amplitude.framework/Amplitude differ diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPARCMacros.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPARCMacros.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h similarity index 97% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h index aef079a1d..b5de4235b 100644 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h +++ b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h @@ -18,6 +18,7 @@ extern const int kAMPEventRemoveBatchSize; extern const int kAMPEventUploadPeriodSeconds; extern const long kAMPMinTimeBetweenSessionsMillis; extern const int kAMPMaxStringLength; +extern const int kAMPMaxPropertyKeys; extern NSString *const IDENTIFY_EVENT; extern NSString *const AMP_OP_ADD; diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDatabaseHelper.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDatabaseHelper.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDeviceInfo.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDeviceInfo.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPIdentify.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPIdentify.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPLocationManagerDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPLocationManagerDelegate.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h similarity index 95% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h index d116ca01c..7b4b1bdaa 100644 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h +++ b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h @@ -9,7 +9,7 @@ /** `AMPRevenue` objects are a wrapper for revenue data, which get passed to the `logRevenueV2` method to send to Amplitude servers. - **Note:** productId and price are required fields. If quantity is not specified, then defaults to 1. + **Note:** price is a required field. If quantity is not specified, then defaults to 1. **Note:** Revenue amount is calculated as price * quantity. @@ -32,9 +32,7 @@ */ /** - The product identifier for the transaction. - - @warning: required field + The product identifier for the transaction (optional). */ @property (nonatomic, strong, readonly) NSString *productId; @@ -99,7 +97,7 @@ */ /** - Set a value for the product identifier. This field is required for all revenue being logged. + Set a value for the product identifier. @param productIdentifier The value for the product identifier. Empty strings are ignored. diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPURLConnection.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPURLConnection.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude+SSLPinning.h b/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude+SSLPinning.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude.h b/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h new file mode 100644 index 000000000..196fa3f2d --- /dev/null +++ b/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h @@ -0,0 +1,24 @@ +#import + +//! Project version number for Amplitude. +FOUNDATION_EXPORT double AmplitudeVersionNumber; + +//! Project version string for Amplitude. +FOUNDATION_EXPORT const unsigned char AmplitudeVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPCertificatePinning.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPCertificatePinning.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLConnectionDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLConnectionDelegate.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLSessionDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h similarity index 100% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Headers/ISPPinnedNSURLSessionDelegate.h rename to Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h diff --git a/Carthage/Build/iOS/Amplitude.framework/Info.plist b/Carthage/Build/iOS/Amplitude.framework/Info.plist new file mode 100644 index 000000000..c44f5af4f Binary files /dev/null and b/Carthage/Build/iOS/Amplitude.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap b/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap new file mode 100644 index 000000000..3a871d152 --- /dev/null +++ b/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Amplitude { + umbrella header "AmplitudeFramework.h" + + export * + module * { export * } +} \ No newline at end of file diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework b/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework deleted file mode 100755 index 58675749a..000000000 Binary files a/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework and /dev/null differ diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AmplitudeFramework.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AmplitudeFramework.h deleted file mode 100644 index 23823f4e7..000000000 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AmplitudeFramework.h +++ /dev/null @@ -1,24 +0,0 @@ -#import - -//! Project version number for AmplitudeFramework. -FOUNDATION_EXPORT double AmplitudeFrameworkVersionNumber; - -//! Project version string for AmplitudeFramework. -FOUNDATION_EXPORT const unsigned char AmplitudeFrameworkVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Modules/module.modulemap b/Carthage/Build/iOS/AmplitudeFramework.framework/Modules/module.modulemap deleted file mode 100644 index 064b57f76..000000000 --- a/Carthage/Build/iOS/AmplitudeFramework.framework/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module AmplitudeFramework { - umbrella header "AmplitudeFramework.h" - - export * - module * { export * } -} diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit b/Carthage/Build/iOS/CarbKit.framework/CarbKit index 4280528b6..bb90f35a6 100755 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit and b/Carthage/Build/iOS/CarbKit.framework/CarbKit differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib index 5c87b18bb..f7bc951dc 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib index 85198843a..889ee81a7 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib index 07857c3d2..c5e9d4a26 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib index 956d636e2..129efb8dc 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib index 6b1f2831b..162aeafcf 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h index 37240755b..b69d63518 100644 --- a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h +++ b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,17 +106,19 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; -@import HealthKit; @import Foundation; +@import HealthKit; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class HKUnit; @class UITableView; -@class NSIndexPath; @class UITableViewCell; @class UIStoryboardSegue; @class NSBundle; @@ -145,14 +162,15 @@ SWIFT_CLASS("_TtC7CarbKit28CarbEntryTableViewController") @interface HKQuantitySample (SWIFT_EXTENSION(CarbKit)) @property (nonatomic, readonly, copy) NSString * _Nullable foodType; @property (nonatomic, readonly) BOOL createdByCurrentApp; +@property (nonatomic, readonly, copy) NSString * _Nullable externalId; @end -@interface NSUserDefaults (SWIFT_EXTENSION(CarbKit)) +@interface UITableViewCell (SWIFT_EXTENSION(CarbKit)) @end -@interface UITableViewCell (SWIFT_EXTENSION(CarbKit)) +@interface NSUserDefaults (SWIFT_EXTENSION(CarbKit)) @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/CarbKit.framework/Info.plist b/Carthage/Build/iOS/CarbKit.framework/Info.plist index c7bc285c6..541014d35 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Info.plist and b/Carthage/Build/iOS/CarbKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc index aaca97938..31fc2b834 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule index 82a27976a..eedd1f6d2 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc index d93049e33..941de7b08 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule index ea4c67894..5bfeb0c61 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc index ab0cdda33..40bd781e0 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule index 3c9811bc8..e1296ec07 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc index af82d5bf5..4b215e3aa 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule index 8ef4a28b9..6efc1ec9b 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto b/Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto deleted file mode 100755 index f116de09f..000000000 Binary files a/Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto and /dev/null differ diff --git a/Carthage/Build/iOS/CommonCrypto.framework/Info.plist b/Carthage/Build/iOS/CommonCrypto.framework/Info.plist deleted file mode 100644 index c44f91864..000000000 Binary files a/Carthage/Build/iOS/CommonCrypto.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/CommonCrypto.framework/Modules/module.modulemap b/Carthage/Build/iOS/CommonCrypto.framework/Modules/module.modulemap deleted file mode 100644 index 125b77209..000000000 --- a/Carthage/Build/iOS/CommonCrypto.framework/Modules/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -module CommonCrypto [system] { - header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/CommonCrypto/CommonCrypto.h" - export * -} diff --git a/Carthage/Build/iOS/Crypto.framework/Crypto b/Carthage/Build/iOS/Crypto.framework/Crypto index cf15f2135..5d85958a0 100755 Binary files a/Carthage/Build/iOS/Crypto.framework/Crypto and b/Carthage/Build/iOS/Crypto.framework/Crypto differ diff --git a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h b/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h index 53063f52e..abf4334f5 100644 --- a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h +++ b/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h @@ -2,15 +2,23 @@ // Crypto.h // Crypto // -// Created by Sam Soffes on 4/21/15. -// Copyright (c) 2015 Sam Soffes. All rights reserved. +// Created by Nate Racklyeft on 9/13/16. +// Copyright © 2016 Pete Schwamb. All rights reserved. // -@import Foundation; -//@import CommonCrypto; +#import //! Project version number for Crypto. FOUNDATION_EXPORT double CryptoVersionNumber; //! Project version string for Crypto. FOUNDATION_EXPORT const unsigned char CryptoVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + +@interface NSString (Crypto) + +@property (nonatomic, nonnull, readonly) NSString *sha1; + +@end diff --git a/Carthage/Build/iOS/Crypto.framework/Info.plist b/Carthage/Build/iOS/Crypto.framework/Info.plist index fbab31be7..f14f7d04b 100644 Binary files a/Carthage/Build/iOS/Crypto.framework/Info.plist and b/Carthage/Build/iOS/Crypto.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftdoc deleted file mode 100644 index 5e026e774..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftmodule deleted file mode 100644 index 12686827e..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftdoc deleted file mode 100644 index b91807deb..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftmodule deleted file mode 100644 index c5941d6d8..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/arm64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftdoc deleted file mode 100644 index 914e539b1..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftmodule deleted file mode 100644 index f8b9a30a4..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/i386.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 3e7a9ebf4..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 3ecd8fb6b..000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Modules/Crypto.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap b/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap index 0b0838b09..9d53a1b38 100644 --- a/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap +++ b/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap @@ -4,7 +4,3 @@ framework module Crypto { export * module * { export * } } - -module Crypto.Swift { - header "Crypto-Swift.h" -} diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy new file mode 100755 index 000000000..bac9c7a06 Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy differ diff --git a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto-Swift.h b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h similarity index 83% rename from Carthage/Build/iOS/Crypto.framework/Headers/Crypto-Swift.h rename to Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h index d5064b8ae..61a199d2e 100644 --- a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto-Swift.h +++ b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,22 +106,12 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" - -@interface NSData (SWIFT_EXTENSION(Crypto)) -@property (nonatomic, readonly, strong) NSData * _Nonnull MD2; -@property (nonatomic, readonly, strong) NSData * _Nonnull MD4; -@property (nonatomic, readonly, strong) NSData * _Nonnull MD5; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA1; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA224; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA256; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA384; -@property (nonatomic, readonly, strong) NSData * _Nonnull SHA512; -@end - #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy.h b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy.h new file mode 100644 index 000000000..3ef4c98e9 --- /dev/null +++ b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy.h @@ -0,0 +1,19 @@ +// +// G4ShareSpy.h +// G4ShareSpy +// +// Created by Mark on 7/21/16. +// Copyright © 2016 Mark Wilson. All rights reserved. +// + +#import + +//! Project version number for G4ShareSpy. +FOUNDATION_EXPORT double G4ShareSpyVersionNumber; + +//! Project version string for G4ShareSpy. +FOUNDATION_EXPORT const unsigned char G4ShareSpyVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Info.plist b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist similarity index 51% rename from Carthage/Build/iOS/AmplitudeFramework.framework/Info.plist rename to Carthage/Build/iOS/G4ShareSpy.framework/Info.plist index 1d0f56b75..b20fd4f68 100644 Binary files a/Carthage/Build/iOS/AmplitudeFramework.framework/Info.plist and b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc new file mode 100644 index 000000000..1a90185d7 Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule new file mode 100644 index 000000000..312a29ee5 Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc new file mode 100644 index 000000000..65142c96f Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule new file mode 100644 index 000000000..febd9985a Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc new file mode 100644 index 000000000..d28076f8d Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule new file mode 100644 index 000000000..46a4fc6eb Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc new file mode 100644 index 000000000..7ccd7ac74 Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule new file mode 100644 index 000000000..19df53cb8 Binary files /dev/null and b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/module.modulemap b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/module.modulemap new file mode 100644 index 000000000..be22cea6a --- /dev/null +++ b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/module.modulemap @@ -0,0 +1,10 @@ +framework module G4ShareSpy { + umbrella header "G4ShareSpy.h" + + export * + module * { export * } +} + +module G4ShareSpy.Swift { + header "G4ShareSpy-Swift.h" +} diff --git a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit index 21bb42a30..8158ce973 100755 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit and b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h index 562f14731..f2ff5d2d6 100644 --- a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h +++ b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import HealthKit; #endif diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist index cf23607f4..9e7dab5cf 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist and b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc index ec049cba4..aee543692 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule index 1ff92db9e..94f814451 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc index 4d59b772c..477e62dc6 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule index 0d9833b90..b1849c2c0 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc index c87e77be3..79a164bf8 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule index 6dd051487..28e60a22a 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc index 9c747c11f..9ba235118 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule index 23a1ebcf3..106929198 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib index 3a3b40d04..3aaa9f574 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib index c237abcad..5331045ee 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h index 1ec9bf430..d281feea1 100644 --- a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h +++ b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,20 +106,23 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; +@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class UITableView; -@class NSIndexPath; @class UITableViewCell; @class NSBundle; @class NSCoder; -SWIFT_CLASS("_TtC10InsulinKit28ReservoirTableViewController") -@interface ReservoirTableViewController : UITableViewController +SWIFT_CLASS("_TtC10InsulinKit34InsulinDeliveryTableViewController") +@interface InsulinDeliveryTableViewController : UITableViewController - (void)viewDidLoad; - (void)viewWillAppear:(BOOL)animated; - (void)viewDidAppear:(BOOL)animated; @@ -115,6 +133,7 @@ SWIFT_CLASS("_TtC10InsulinKit28ReservoirTableViewController") - (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (BOOL)tableView:(UITableView * _Nonnull)tableView canEditRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (void)tableView:(UITableView * _Nonnull)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; +- (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (nonnull instancetype)initWithStyle:(UITableViewStyle)style OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil OBJC_DESIGNATED_INITIALIZER; - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; diff --git a/Carthage/Build/iOS/InsulinKit.framework/Info.plist b/Carthage/Build/iOS/InsulinKit.framework/Info.plist index 3d0177604..8423968c7 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Info.plist and b/Carthage/Build/iOS/InsulinKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit index 3b066d603..647923c91 100755 Binary files a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit and b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom index f8bf41b43..5b1a010ac 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom and b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist index 41ccc9985..6326325ef 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist and b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc index 34dac9781..44b1857f5 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule index a1edae649..cde84c06d 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc index 98ab995ec..1610d1b46 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule index 83e37ee11..e6df2d2f3 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc index 827f3ffd5..edabedbff 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule index e0f3059fa..8a19fbef5 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc index bf3d5d8c1..4cae4d12b 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule index dfe8dbafe..d4d2f69b9 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Assets.car b/Carthage/Build/iOS/LoopKit.framework/Assets.car new file mode 100644 index 000000000..3dcd1df34 Binary files /dev/null and b/Carthage/Build/iOS/LoopKit.framework/Assets.car differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib new file mode 100644 index 000000000..49463fe8f Binary files /dev/null and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib index a85491c3f..e33f2a811 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h index 62f53acb3..21d7130ed 100644 --- a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h +++ b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,20 +106,40 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; +@import Foundation; @import CoreGraphics; @import HealthKit; -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class NSCoder; +@class NSBundle; + +SWIFT_CLASS("_TtC7LoopKit29CommandResponseViewController") +@interface CommandResponseViewController : UIViewController +- (nonnull instancetype)initWithCommand:(NSString * _Nonnull (^ _Nonnull)(void (^ _Nonnull)(NSString * _Nonnull)))command OBJC_DESIGNATED_INITIALIZER; +- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; +- (void)loadView; +- (void)viewDidLoad; +- (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil SWIFT_UNAVAILABLE; +@end + +@class UIActivityViewController; + +@interface CommandResponseViewController (SWIFT_EXTENSION(LoopKit)) +- (id _Nonnull)activityViewControllerPlaceholderItem:(UIActivityViewController * _Nonnull)activityViewController; +- (id _Nullable)activityViewController:(UIActivityViewController * _Nonnull)activityViewController itemForActivityType:(UIActivityType _Nonnull)activityType; +- (NSString * _Nonnull)activityViewController:(UIActivityViewController * _Nonnull)activityViewController subjectForActivityType:(UIActivityType _Nullable)activityType; +@end + @class UIBarButtonItem; -@class NSTimeZone; @class UITableView; -@class NSIndexPath; @class UITableViewCell; SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") @@ -115,8 +150,8 @@ SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") - (void)setEditing:(BOOL)editing animated:(BOOL)animated; - (void)viewWillDisappear:(BOOL)animated; - (UIBarButtonItem * _Nonnull)insertButtonItem; -@property (nonatomic, strong) NSTimeZone * _Nonnull timeZone; -@property (nonatomic, copy) NSString * _Nonnull unitString; +@property (nonatomic, copy) NSTimeZone * _Nonnull timeZone; +@property (nonatomic, copy) NSString * _Nonnull unitDisplayString; - (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView; - (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section; - (BOOL)tableView:(UITableView * _Nonnull)tableView canEditRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; @@ -129,6 +164,8 @@ SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") - (void)tableView:(UITableView * _Nonnull)tableView didDeselectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (NSIndexPath * _Nonnull)tableView:(UITableView * _Nonnull)tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath * _Nonnull)sourceIndexPath toProposedIndexPath:(NSIndexPath * _Nonnull)proposedDestinationIndexPath; +- (nonnull instancetype)initWithStyle:(UITableViewStyle)style SWIFT_UNAVAILABLE; +- (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil SWIFT_UNAVAILABLE; @end @@ -159,52 +196,65 @@ SWIFT_CLASS("_TtC7LoopKit39GlucoseRangeScheduleTableViewController") @interface GlucoseRangeScheduleTableViewController : DailyValueScheduleTableViewController @property (nonatomic, strong) HKUnit * _Nonnull unit; - (void)viewDidLoad; +- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView; - (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section; - (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (void)tableView:(UITableView * _Nonnull)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; - (void)tableView:(UITableView * _Nonnull)tableView moveRowAtIndexPath:(NSIndexPath * _Nonnull)sourceIndexPath toIndexPath:(NSIndexPath * _Nonnull)destinationIndexPath; +- (BOOL)tableView:(UITableView * _Nonnull)tableView canEditRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; +- (BOOL)tableView:(UITableView * _Nonnull)tableView canMoveRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; +- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForHeaderInSection:(NSInteger)section; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; @end -@interface HKQuantity (SWIFT_EXTENSION(LoopKit)) +@interface GlucoseRangeScheduleTableViewController (SWIFT_EXTENSION(LoopKit)) @end -@interface HKUnit (SWIFT_EXTENSION(LoopKit)) -+ (HKUnit * _Nonnull)milligramsPerDeciliterUnit; -+ (HKUnit * _Nonnull)millimolesPerLiterUnit; +@interface HKQuantity (SWIFT_EXTENSION(LoopKit)) +@end -/// A formatting helper for determining the preferred decimal style for a given unit -@property (nonatomic, readonly) NSInteger preferredMinimumFractionDigits; + +@interface HKQuantitySample (SWIFT_EXTENSION(LoopKit)) @end -@interface NSDate (SWIFT_EXTENSION(LoopKit)) +@interface HKQuantitySample (SWIFT_EXTENSION(LoopKit)) @end -@interface NSDate (SWIFT_EXTENSION(LoopKit)) -- (NSDate * _Nonnull)dateFlooredToTimeInterval:(NSTimeInterval)interval; -- (NSDate * _Nonnull)dateCeiledToTimeInterval:(NSTimeInterval)interval; +@interface HKUnit (SWIFT_EXTENSION(LoopKit)) ++ (HKUnit * _Nonnull)milligramsPerDeciliterUnit; ++ (HKUnit * _Nonnull)millimolesPerLiterUnit; +/** + A formatting helper for determining the preferred decimal style for a given unit +*/ +@property (nonatomic, readonly) NSInteger preferredMinimumFractionDigits; +/** + A presentation helper for the localized unit string +*/ +@property (nonatomic, readonly, copy) NSString * _Nonnull glucoseUnitDisplayString; @end @class UITextField; -@class NSBundle; SWIFT_CLASS("_TtC7LoopKit28TextFieldTableViewController") @interface TextFieldTableViewController : UITableViewController -@property (nonatomic, strong) NSIndexPath * _Nullable indexPath; +@property (nonatomic, copy) NSIndexPath * _Nullable indexPath; @property (nonatomic, copy) NSString * _Nullable placeholder; +@property (nonatomic, copy) NSString * _Nullable unit; @property (nonatomic, copy) NSString * _Nullable value; +@property (nonatomic, copy) NSString * _Nullable contextHelp; @property (nonatomic) UIKeyboardType keyboardType; - (nonnull instancetype)init; - (void)viewDidLoad; - (void)viewDidAppear:(BOOL)animated; - (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section; - (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; +- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForFooterInSection:(NSInteger)section; - (BOOL)textFieldShouldEndEditing:(UITextField * _Nonnull)textField; - (BOOL)textFieldShouldReturn:(UITextField * _Nonnull)textField; - (nonnull instancetype)initWithStyle:(UITableViewStyle)style OBJC_DESIGNATED_INITIALIZER; @@ -218,28 +268,39 @@ SWIFT_CLASS("_TtC7LoopKit28TextFieldTableViewController") @interface UIViewController (SWIFT_EXTENSION(LoopKit)) +/** + Convenience method to present an alert controller on the active view controller + \param title The title of the alert + + \param message The message of the alert + + \param animated Whether to animate the alert + + \param completion An optional closure to execute after the presentation finishes -/// Convenience method to present an alert controller on the active view controller -/// -/// \param title The title of the alert -/// -/// \param message The message of the alert -/// -/// \param animated Whether to animate the alert -/// -/// \param completion An optional closure to execute after the presentation finishes +*/ - (void)presentAlertControllerWithTitle:(NSString * _Nullable)title message:(NSString * _Nonnull)message animated:(BOOL)animated completion:(void (^ _Nullable)(void))completion; +/** + Convenience method to display an error object in an alert controller + \param error The error to display + + \param animated Whether to animate the alert + + \param completion An optional closure to execute after the presentation finishes + +*/ +- (void)presentAlertControllerWith:(NSError * _Nonnull)error animated:(BOOL)animated completion:(void (^ _Nullable)(void))completion; +/** + Convenience method to present a view controller on the active view controller. + If the receiver is not in a window, or already has a presented view controller, this method will + attempt to find the most appropriate view controller for presenting. + \param viewControllerToPresent The view controller to display over the view controller’s content + + \param animated Whether to animate the presentation + + \param completion An optional closure to execute after the presentation finishes -/// Convenience method to present a view controller on the active view controller. -/// -/// If the receiver is not in a window, or already has a presented view controller, this method will -/// attempt to find the most appropriate view controller for presenting. -/// -/// \param viewControllerToPresent The view controller to display over the view controller’s content -/// -/// \param animated Whether to animate the presentation -/// -/// \param completion An optional closure to execute after the presentation finishes +*/ - (void)presentViewControllerOnActiveViewController:(UIViewController * _Nonnull)viewControllerToPresent animated:(BOOL)animated completion:(void (^ _Nullable)(void))completion; @end diff --git a/Carthage/Build/iOS/LoopKit.framework/Info.plist b/Carthage/Build/iOS/LoopKit.framework/Info.plist index 01b3f8f3f..ee1389b34 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Info.plist and b/Carthage/Build/iOS/LoopKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/LoopKit.framework/LoopKit b/Carthage/Build/iOS/LoopKit.framework/LoopKit index 21cdcc639..979b88e1f 100755 Binary files a/Carthage/Build/iOS/LoopKit.framework/LoopKit and b/Carthage/Build/iOS/LoopKit.framework/LoopKit differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc index e65135575..7cfcc9b88 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule index a7502d68f..e692e6f04 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc index c0d1397c4..4fdc27927 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule index d04ecd829..494e8cc18 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc index c8006e5df..998e425a8 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule index 9e14a1e25..5588338b1 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc index a58c8a2e2..c791f9582 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule index c1e5bbe44..0af24f893 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib index 7ab75d4e3..8b5a7c866 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib index fd68c5553..ac858b048 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h index bd847d75a..501ca8fe8 100644 --- a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h +++ b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import Foundation; #endif @@ -98,14 +116,6 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" -@interface NSData (SWIFT_EXTENSION(MinimedKit)) -@end - - -@interface NSDateComponents (SWIFT_EXTENSION(MinimedKit)) -@end - - @interface NSDateFormatter (SWIFT_EXTENSION(MinimedKit)) @end diff --git a/Carthage/Build/iOS/MinimedKit.framework/Info.plist b/Carthage/Build/iOS/MinimedKit.framework/Info.plist index 938e0865b..b84000b8f 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Info.plist and b/Carthage/Build/iOS/MinimedKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit index ca07a956c..2caf183e3 100755 Binary files a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit and b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc index dbb6d000c..8f328dd79 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule index ab9d7dc0f..b21e2ce29 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc index f994dc758..e08750f40 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule index 5d69e24c7..a7975dc4b 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc index dfe14c034..c3308ea51 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule index 1410b3e34..049b2c3fa 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc index a884bb4d7..7fb5ae8c9 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule index 924e7dcfb..60d1056c2 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h index 8c1fdd030..73da02e85 100644 --- a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h +++ b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,8 +106,12 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import Foundation; +@import HealthKit; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" @@ -102,6 +121,10 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); @end +@interface HKUnit (SWIFT_EXTENSION(NightscoutUploadKit)) +@end + + @interface NSUserDefaults (SWIFT_EXTENSION(NightscoutUploadKit)) @end diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist index 4cf27af15..e9291b495 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc index b8fb2a62b..ec1511a93 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule index 6f9d1793b..d41b6ce1a 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc index f3fc985c2..62ab214de 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule index 32985da0f..6e4a40a53 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc index c06bf1e26..c339832cc 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule index 25ca8922a..1de3d3ae0 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc index f9eb98bd9..c90a6dd16 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule index 482958fe3..b8cd38f2b 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit index 21549689c..5dc822399 100755 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit and b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/ReceivingPacketCmd.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/ReceivingPacketCmd.h index cfc55dd86..57e8648a3 100644 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/ReceivingPacketCmd.h +++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/ReceivingPacketCmd.h @@ -13,5 +13,7 @@ @interface ReceivingPacketCmd : CmdBase @property (nonatomic, strong) RFPacket *receivedPacket; +@property (nonatomic, readonly) BOOL didReceiveResponse; +@property (nonatomic, readonly) NSData *rawReceivedData; @end diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h index da1cbac29..a21b9471f 100644 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h +++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h @@ -44,6 +44,7 @@ typedef NS_ENUM(NSUInteger, SubgRfspyVersionState) { #define CC111X_REG_MDMCFG2 0x0E #define CC111X_REG_MDMCFG1 0x0F #define CC111X_REG_MDMCFG0 0x10 +#define CC111X_REG_DEVIATN 0x11 #define CC111X_REG_AGCCTRL2 0x17 #define CC111X_REG_AGCCTRL1 0x18 #define CC111X_REG_AGCCTRL0 0x19 @@ -75,6 +76,8 @@ typedef NS_ENUM(NSUInteger, SubgRfspyVersionState) { @property (nonatomic, readonly) SubgRfspyVersionState firmwareState; +@property (nonatomic, readonly, nullable) NSString *bleFirmwareVersion; + @property (nonatomic, readonly, nullable) NSDate *lastIdle; @property (nonatomic) BOOL timerTickEnabled; @@ -90,7 +93,7 @@ typedef NS_ENUM(NSUInteger, SubgRfspyVersionState) { - (void) connectionStateDidChange:(nullable NSError *)error; -- (void) runSession:(void (^ _Nonnull)(RileyLinkCmdSession* _Nonnull))proc; +- (void) runSessionWithName:(nonnull NSString*)name usingBlock:(void (^ _Nonnull)(RileyLinkCmdSession* _Nonnull))proc; - (void) setCustomName:(nonnull NSString*)customName; - (void) enableIdleListeningOnChannel:(uint8_t)channel; - (void) disableIdleListening; diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h index 0451eda3e..e7d2d4601 100644 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h +++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h @@ -20,11 +20,12 @@ #define RILEYLINK_EVENT_RSSI_CHANGED @"RILEYLINK_EVENT_RSSI_CHANGED" #define RILEYLINK_EVENT_NAME_CHANGED @"RILEYLINK_EVENT_NAME_CHANGED" -#define RILEYLINK_SERVICE_UUID @"0235733b-99c5-4197-b856-69219c2a3845" -#define RILEYLINK_DATA_UUID @"c842e849-5028-42e2-867c-016adada9155" -#define RILEYLINK_RESPONSE_COUNT_UUID @"6e6c7910-b89e-43a5-a0fe-50c5e2b81f4a" -#define RILEYLINK_CUSTOM_NAME_UUID @"d93b2af0-1e28-11e4-8c21-0800200c9a66" -#define RILEYLINK_TIMER_TICK_UUID @"6e6c7910-b89e-43a5-78af-50c5e2b86f7e" +#define RILEYLINK_SERVICE_UUID @"0235733b-99c5-4197-b856-69219c2a3845" +#define RILEYLINK_DATA_UUID @"c842e849-5028-42e2-867c-016adada9155" +#define RILEYLINK_RESPONSE_COUNT_UUID @"6e6c7910-b89e-43a5-a0fe-50c5e2b81f4a" +#define RILEYLINK_CUSTOM_NAME_UUID @"d93b2af0-1e28-11e4-8c21-0800200c9a66" +#define RILEYLINK_TIMER_TICK_UUID @"6e6c7910-b89e-43a5-78af-50c5e2b86f7e" +#define RILEYLINK_FIRMWARE_VERSION_UUID @"30d99dc9-7c91-4295-a051-0a104d238cf2" @interface RileyLinkBLEManager : NSObject diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist index 772806393..435f9e714 100644 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit index fc7e5613c..51ed14f6f 100755 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h index 61e37598a..62b7d93f2 100644 --- a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h +++ b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,17 +106,16 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) -@import Foundation; @import UIKit; +@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" - -@interface NSData (SWIFT_EXTENSION(RileyLinkKit)) -@end - @class UINib; @class UISwitch; @class NSCoder; @@ -116,13 +130,14 @@ SWIFT_CLASS("_TtC12RileyLinkKit28RileyLinkDeviceTableViewCell") @end @class UITableView; -@class NSIndexPath; @class NSBundle; SWIFT_CLASS("_TtC12RileyLinkKit34RileyLinkDeviceTableViewController") @interface RileyLinkDeviceTableViewController : UITableViewController +- (nonnull instancetype)init SWIFT_UNAVAILABLE; - (void)viewDidLoad; - (void)viewWillAppear:(BOOL)animated; +- (void)viewWillDisappear:(BOOL)animated; - (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView; - (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section; - (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist index 5ef6677dc..dd04cdc45 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc index bcd8ffcc3..e4784933e 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule index b3f68517d..b8a8f6c15 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc index 4d0cd2394..f84156d95 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule index 8c28e9e8e..3ee185174 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc index 0df31c2c2..455d651b8 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule index 521a3ec8b..1470aa973 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc index 1433b7944..59c044424 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule index de42da2db..a887b72f3 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib index 9f5a3221c..281871764 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit index 1e5eeacde..fc6d1e8e2 100755 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib index 12fb69316..eb7bcd73b 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h index f6f83153b..61a199d2e 100644 --- a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h +++ b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) #endif diff --git a/Carthage/Build/iOS/ShareClient.framework/Info.plist b/Carthage/Build/iOS/ShareClient.framework/Info.plist index 85194c958..6645632b3 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Info.plist and b/Carthage/Build/iOS/ShareClient.framework/Info.plist differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc index bc49e956d..1a90185d7 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule index cb62ac98b..8074123db 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc index d6ffa0105..65142c96f 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule index 4c0eae745..9720ce3dd 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc index e226d82f8..d28076f8d 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule index 119f89ee6..1457786ee 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc index 472c75946..7ccd7ac74 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule index 30977dd61..4c211295a 100644 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/ShareClient.framework/ShareClient b/Carthage/Build/iOS/ShareClient.framework/ShareClient index ac6252b04..1f8366aff 100755 Binary files a/Carthage/Build/iOS/ShareClient.framework/ShareClient and b/Carthage/Build/iOS/ShareClient.framework/ShareClient differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h index c03e6be14..48880875d 100644 --- a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h +++ b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,6 +106,9 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) @import UIKit; @import CoreGraphics; @@ -103,6 +121,7 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); SWIFT_CLASS("_TtC11SwiftCharts14ChartAreasView") @interface ChartAreasView : UIView - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -113,8 +132,9 @@ SWIFT_CLASS("_TtC11SwiftCharts9ChartView") @end - -/// A UIView subclass for drawing charts +/** + A UIView subclass for drawing charts +*/ SWIFT_CLASS("_TtC11SwiftCharts13ChartBaseView") @interface ChartBaseView : ChartView - (void)drawRect:(CGRect)rect; @@ -129,12 +149,14 @@ SWIFT_CLASS("_TtC11SwiftCharts20ChartCandleStickView") - (nonnull instancetype)initWithLineX:(CGFloat)lineX width:(CGFloat)width top:(CGFloat)top bottom:(CGFloat)bottom innerRectTop:(CGFloat)innerRectTop innerRectBottom:(CGFloat)innerRectBottom fillColor:(UIColor * _Nonnull)fillColor strokeColor:(UIColor * _Nonnull)strokeColor strokeWidth:(CGFloat)strokeWidth OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)drawRect:(CGRect)rect; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end SWIFT_CLASS("_TtC11SwiftCharts14ChartLinesView") @interface ChartLinesView : UIView - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @class UITouch; @@ -157,6 +179,7 @@ SWIFT_CLASS("_TtC11SwiftCharts21ChartPointEllipseView") - (void)didMoveToSuperview; - (void)drawRect:(CGRect)rect; - (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -164,6 +187,7 @@ SWIFT_CLASS("_TtC11SwiftCharts23ChartPointTargetingView") @interface ChartPointTargetingView : UIView - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)didMoveToSuperview; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -174,6 +198,7 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointTextCircleView") - (void)didMoveToSuperview; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -182,6 +207,7 @@ SWIFT_CLASS("_TtC11SwiftCharts17ChartPointViewBar") - (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)didMoveToSuperview; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end @@ -189,6 +215,7 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarGreyOut") @interface ChartPointViewBarGreyOut : ChartPointViewBar - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)didMoveToSuperview; +- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration SWIFT_UNAVAILABLE; @end @@ -196,6 +223,7 @@ SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarStacked") @interface ChartPointViewBarStacked : ChartPointViewBar - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)drawRect:(CGRect)rect; +- (nonnull instancetype)initWithP1:(CGPoint)p1 p2:(CGPoint)p2 width:(CGFloat)width bgColor:(UIColor * _Nullable)bgColor animDuration:(float)animDuration SWIFT_UNAVAILABLE; @end @@ -227,6 +255,7 @@ SWIFT_CLASS("_TtC11SwiftCharts10InfoBubble") - (nonnull instancetype)initWithFrame:(CGRect)frame arrowWidth:(CGFloat)arrowWidth arrowHeight:(CGFloat)arrowHeight bgColor:(UIColor * _Nonnull)bgColor arrowX:(CGFloat)arrowX OBJC_DESIGNATED_INITIALIZER; - (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; - (void)drawRect:(CGRect)rect; +- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist index 9542eff64..44a3c3bdf 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist and b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc index 4da4d1f08..d73c32155 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule index 9598adf2a..44e958972 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc index 0994a2a3d..7de518b74 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule index f46efeb18..d6699a062 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc index fc25fd072..e640c3c77 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule index 1a2fa61cf..1dc46d359 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc index 745570f48..a24beca8a 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule index 186049941..432e90766 100644 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts index 944f529fe..fe89e778f 100755 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts and b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h index ca0c189f9..d2729bf59 100644 --- a/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h +++ b/Carthage/Build/iOS/xDripG5.framework/Headers/xDripG5-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 2.2 (swiftlang-703.0.18.8 clang-703.0.31) +// Generated by Apple Swift version 3.0 (swiftlang-800.0.46.2 clang-800.0.38) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4))); typedef int swift_int2 __attribute__((__ext_vector_type__(2))); typedef int swift_int3 __attribute__((__ext_vector_type__(3))); typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); +typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); +typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #if !defined(SWIFT_PASTE) @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_METATYPE) # define SWIFT_METATYPE(X) Class #endif +#if !defined(SWIFT_CLASS_PROPERTY) +# if __has_feature(objc_class_property) +# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ +# else +# define SWIFT_CLASS_PROPERTY(...) +# endif +#endif #if defined(__has_attribute) && __has_attribute(objc_runtime_name) # define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) @@ -48,6 +58,11 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #else # define SWIFT_COMPILE_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +#else +# define SWIFT_METHOD_FAMILY(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -91,18 +106,17 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4))); # define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name) # endif #endif +#if !defined(SWIFT_UNAVAILABLE) +# define SWIFT_UNAVAILABLE __attribute__((unavailable)) +#endif #if defined(__has_feature) && __has_feature(modules) -@import Foundation; +@import HealthKit; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" -@interface NSData (SWIFT_EXTENSION(xDripG5)) -@end - - -@interface NSData (SWIFT_EXTENSION(xDripG5)) +@interface HKUnit (SWIFT_EXTENSION(xDripG5)) @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/xDripG5.framework/Info.plist b/Carthage/Build/iOS/xDripG5.framework/Info.plist index e50bee4fd..77861aff8 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Info.plist and b/Carthage/Build/iOS/xDripG5.framework/Info.plist differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc index 936f53d6e..e6a8cf276 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule index 1e3903e6b..7cfcc19d9 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc index 5ad4aa2dd..89ba4bf05 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule index 96df71535..439902afb 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc index ce9bd4aa7..232a8141d 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule index 0697576c7..512304b6c 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc index 2176a2fd8..0739ea1e5 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule index 4b45ae047..d21fe595e 100644 Binary files a/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/xDripG5.framework/xDripG5 b/Carthage/Build/iOS/xDripG5.framework/xDripG5 index 86f0852e0..74c19c282 100755 Binary files a/Carthage/Build/iOS/xDripG5.framework/xDripG5 and b/Carthage/Build/iOS/xDripG5.framework/xDripG5 differ diff --git a/Documentation/Assigning a bundle identifier.png b/Documentation/Assigning a bundle identifier.png index b6b400298..6b6782fe7 100644 Binary files a/Documentation/Assigning a bundle identifier.png and b/Documentation/Assigning a bundle identifier.png differ diff --git a/Documentation/Changing the display name.png b/Documentation/Changing the display name.png new file mode 100644 index 000000000..762bf9a50 Binary files /dev/null and b/Documentation/Changing the display name.png differ diff --git a/Documentation/Screenshots/Phone Bolus.png b/Documentation/Screenshots/Phone Bolus.png old mode 100755 new mode 100644 index c42a0f66b..6a3d49af7 Binary files a/Documentation/Screenshots/Phone Bolus.png and b/Documentation/Screenshots/Phone Bolus.png differ diff --git a/Documentation/Screenshots/Phone Graphs.png b/Documentation/Screenshots/Phone Graphs.png index 866c17a15..ead32d57a 100755 Binary files a/Documentation/Screenshots/Phone Graphs.png and b/Documentation/Screenshots/Phone Graphs.png differ diff --git a/Documentation/Screenshots/Phone Notification Bolus Failure.png b/Documentation/Screenshots/Phone Notification Bolus Failure.png old mode 100755 new mode 100644 index 8f51a6585..20bb82f02 Binary files a/Documentation/Screenshots/Phone Notification Bolus Failure.png and b/Documentation/Screenshots/Phone Notification Bolus Failure.png differ diff --git a/Documentation/Screenshots/Watch Carb Entry.png b/Documentation/Screenshots/Watch Carb Entry.png index c5990724f..18d625d7a 100755 Binary files a/Documentation/Screenshots/Watch Carb Entry.png and b/Documentation/Screenshots/Watch Carb Entry.png differ diff --git a/Documentation/Screenshots/Watch Menu.png b/Documentation/Screenshots/Watch Menu.png index 8d62b271f..be931067a 100644 Binary files a/Documentation/Screenshots/Watch Menu.png and b/Documentation/Screenshots/Watch Menu.png differ diff --git a/DoseMathTests/DoseMathTests.swift b/DoseMathTests/DoseMathTests.swift index ce1484a4f..9b9a43cdb 100644 --- a/DoseMathTests/DoseMathTests.swift +++ b/DoseMathTests/DoseMathTests.swift @@ -13,26 +13,26 @@ import LoopKit extension XCTestCase { - public var bundle: NSBundle { - return NSBundle(forClass: self.dynamicType) + public var bundle: Bundle { + return Bundle(for: type(of: self)) } - public func loadFixture(resourceName: String) -> T { - let path = bundle.pathForResource(resourceName, ofType: "json")! - return try! NSJSONSerialization.JSONObjectWithData(NSData(contentsOfFile: path)!, options: []) as! T + public func loadFixture(_ resourceName: String) -> T { + let path = bundle.path(forResource: resourceName, ofType: "json")! + return try! JSONSerialization.jsonObject(with: Data(contentsOf: URL(fileURLWithPath: path)), options: []) as! T } } -public typealias JSONDictionary = [String: AnyObject] +public typealias JSONDictionary = [String: Any] -extension NSDateFormatter { +extension DateFormatter { static func ISO8601LocalTimeDateFormatter() -> Self { let dateFormatter = self.init() dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss" - dateFormatter.locale = NSLocale(localeIdentifier: "en_US_POSIX") + dateFormatter.locale = Locale(identifier: "en_US_POSIX") return dateFormatter } @@ -40,10 +40,10 @@ extension NSDateFormatter { struct GlucoseFixtureValue: GlucoseValue { - let startDate: NSDate + let startDate: Date let quantity: HKQuantity - init(startDate: NSDate, quantity: HKQuantity) { + init(startDate: Date, quantity: HKQuantity) { self.startDate = startDate self.quantity = quantity } @@ -52,25 +52,25 @@ struct GlucoseFixtureValue: GlucoseValue { class RecommendTempBasalTests: XCTestCase { - private let maxBasalRate = 3.0 + fileprivate let maxBasalRate = 3.0 - func loadGlucoseValueFixture(resourceName: String) -> [GlucoseValue] { + func loadGlucoseValueFixture(_ resourceName: String) -> [GlucoseValue] { let fixture: [JSONDictionary] = loadFixture(resourceName) - let dateFormatter = NSDateFormatter.ISO8601LocalTimeDateFormatter() + let dateFormatter = DateFormatter.ISO8601LocalTimeDateFormatter() return fixture.map { return GlucoseFixtureValue( - startDate: dateFormatter.dateFromString($0["date"] as! String)!, + startDate: dateFormatter.date(from: $0["date"] as! String)!, quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double) ) } } - func loadBasalRateScheduleFixture(resourceName: String) -> BasalRateSchedule { + func loadBasalRateScheduleFixture(_ resourceName: String) -> BasalRateSchedule { let fixture: [JSONDictionary] = loadFixture(resourceName) let items = fixture.map { - return RepeatingScheduleValue(startTime: NSTimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) + return RepeatingScheduleValue(startTime: TimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) } return BasalRateSchedule(dailyItems: items)! @@ -81,7 +81,7 @@ class RecommendTempBasalTests: XCTestCase { } var glucoseTargetRange: GlucoseRangeSchedule { - return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: NSTimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))])! + return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)! } var insulinSensitivitySchedule: InsulinSensitivitySchedule { @@ -119,11 +119,11 @@ class RecommendTempBasalTests: XCTestCase { // Cancel existing temp basal let lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 0.125, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -136,7 +136,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testStartLowEndInRange() { @@ -152,7 +152,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, atDate: glucose.first!.startDate, @@ -167,11 +167,11 @@ class RecommendTempBasalTests: XCTestCase { XCTAssertNil(dose) let lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -185,7 +185,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testCorrectLowAtMin() { @@ -201,15 +201,15 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Ignore due to existing dose var lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 0.125, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -225,11 +225,11 @@ class RecommendTempBasalTests: XCTestCase { // Cancel existing dose lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -242,15 +242,15 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Continue existing dose lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -21)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 9)), value: 0.125, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -263,7 +263,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Allow predictive temp below range dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -279,11 +279,11 @@ class RecommendTempBasalTests: XCTestCase { XCTAssertNil(dose) lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -21)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 9)), value: 0.125, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -297,7 +297,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testStartHighEndLow() { @@ -313,7 +313,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testStartLowEndHigh() { @@ -329,7 +329,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Allow predictive temp below range dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -345,11 +345,11 @@ class RecommendTempBasalTests: XCTestCase { XCTAssertNil(dose) let lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose, @@ -363,7 +363,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 0), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 0), dose!.duration) } func testFlatAndHigh() { @@ -379,7 +379,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(3.0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testHighAndFalling() { @@ -395,7 +395,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(1.425, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testInRangeAndRising() { @@ -411,7 +411,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(1.475, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testHighAndRising() { @@ -427,7 +427,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqual(3.0, dose!.rate) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Use mmol sensitivity value let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiterUnit(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])! @@ -442,7 +442,7 @@ class RecommendTempBasalTests: XCTestCase { ) XCTAssertEqualWithAccuracy(2.975, dose!.rate, accuracy: 1.0 / 40.0) - XCTAssertEqual(NSTimeInterval(minutes: 30), dose!.duration) + XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) } func testNoInputGlucose() { @@ -461,25 +461,25 @@ class RecommendTempBasalTests: XCTestCase { class RecommendBolusTests: XCTestCase { - private let maxBolus = 10.0 + fileprivate let maxBolus = 10.0 - func loadGlucoseValueFixture(resourceName: String) -> [GlucoseValue] { + func loadGlucoseValueFixture(_ resourceName: String) -> [GlucoseValue] { let fixture: [JSONDictionary] = loadFixture(resourceName) - let dateFormatter = NSDateFormatter.ISO8601LocalTimeDateFormatter() + let dateFormatter = DateFormatter.ISO8601LocalTimeDateFormatter() return fixture.map { return GlucoseFixtureValue( - startDate: dateFormatter.dateFromString($0["date"] as! String)!, + startDate: dateFormatter.date(from: $0["date"] as! String)!, quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: $0["amount"] as! Double) ) } } - func loadBasalRateScheduleFixture(resourceName: String) -> BasalRateSchedule { + func loadBasalRateScheduleFixture(_ resourceName: String) -> BasalRateSchedule { let fixture: [JSONDictionary] = loadFixture(resourceName) let items = fixture.map { - return RepeatingScheduleValue(startTime: NSTimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) + return RepeatingScheduleValue(startTime: TimeInterval(minutes: $0["minutes"] as! Double), value: $0["rate"] as! Double) } return BasalRateSchedule(dailyItems: items)! @@ -490,7 +490,7 @@ class RecommendBolusTests: XCTestCase { } var glucoseTargetRange: GlucoseRangeSchedule { - return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: NSTimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))])! + return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliterUnit(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], workoutRange: nil)! } var insulinSensitivitySchedule: InsulinSensitivitySchedule { @@ -528,11 +528,11 @@ class RecommendBolusTests: XCTestCase { // Don't consider net-negative temp basal let lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 0.01, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendBolusFromPredictedGlucose(glucose, @@ -638,11 +638,11 @@ class RecommendBolusTests: XCTestCase { // Less existing temp var lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -11)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: 19)), value: 1.225, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendBolusFromPredictedGlucose(glucose, @@ -658,11 +658,11 @@ class RecommendBolusTests: XCTestCase { // But not a finished temp lastTempBasal = DoseEntry( - type: .TempBasal, - startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -35)), - endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -5)), + type: .tempBasal, + startDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -35)), + endDate: glucose.first!.startDate.addingTimeInterval(TimeInterval(minutes: -5)), value: 1.225, - unit: .UnitsPerHour + unit: .unitsPerHour ) dose = DoseMath.recommendBolusFromPredictedGlucose(glucose, diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist index 3b7334539..8a2d35459 100644 --- a/DoseMathTests/Info.plist +++ b/DoseMathTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.6.0 + 1.1 CFBundleSignature ???? CFBundleVersion diff --git a/LICENSE.md b/LICENSE.md index 257ff9113..333c3ab97 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,8 @@ # Loop is released under the MIT license (MIT) +With exceptions for frameworks and graphics, noted below. Copyright (c) 2015 Nathan Racklyeft +Copyright (c) 2016 LoopKit Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -28,10 +30,15 @@ SOFTWARE. Copyright (c) 2014 Amplitude +## G4ShareSpy.framework + +Copyright (c) 2016 Mark Wilson + ## LoopKit.framework *Including CarbKit.framework, GlucoseKit.framework, and InsulinKit.framework* Copyright (c) 2015 Nathan Racklyeft +Copyright (c) 2016 LoopKit Authors ## RileyLinkKit.framework *Including MinimedKit.framework, NightscoutUploadKit.framework, and RileyLinkBLEKit.framework* @@ -49,6 +56,7 @@ Copyright (c) 2016 Mark Wilson ## xDripG5.framework Copyright (c) 2015 Nathan Racklyeft +Copyright (c) 2016 LoopKit Authors > Permission is hereby granted, free of charge, to any person obtaining a copy > of this software and associated documentation files (the "Software"), to deal @@ -275,4 +283,14 @@ SwiftCharts is Copyright (c) 2015 Ivan Schütz and released as open source under > WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > See the License for the specific language governing permissions and > limitations under the License. -> \ No newline at end of file +> + +# Graphics licensed under CC BY-SA 4.0 + +## "Carbs Fork" + +Designed by Sara Krugman + +(C) 2015 Boston University and Tidepool Project + +https://creativecommons.org/licenses/by-sa/4.0/ diff --git a/Loop.xcconfig b/Loop.xcconfig new file mode 100644 index 000000000..3b48714f3 --- /dev/null +++ b/Loop.xcconfig @@ -0,0 +1,11 @@ +// +// Loop.xcconfig +// Loop +// +// Created by Nate Racklyeft on 9/3/16. +// Copyright © 2016 Nathan Racklyeft. All rights reserved. +// + +// Change this on first setup to your own unique organization identifier in +// reverse-domain name syntax. +MAIN_APP_BUNDLE_IDENTIFIER = com.loudnate diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index 3ca077d24..46e42affb 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -3,14 +3,18 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 48; objects = { /* Begin PBXBuildFile section */ + 4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */; }; + 4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */; }; + 4302F4E51D4EA75100F0FCAF /* DoseStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */; }; + 430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; }; + 430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */; }; + 4313EDE01D8A6BF90060FA79 /* ChartContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */; }; 4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */; }; 4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315D2891CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift */; }; - 4315D2901CA6332F00589052 /* RemoteSettings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 43E344A71B9EAA8300C85C07 /* RemoteSettings.plist */; }; - 4328E0181CFBE1DA00E199AA /* ContextInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0131CFBE1DA00E199AA /* ContextInterfaceController.swift */; }; 4328E01A1CFBE1DA00E199AA /* StatusInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0151CFBE1DA00E199AA /* StatusInterfaceController.swift */; }; 4328E01B1CFBE1DA00E199AA /* BolusInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0161CFBE1DA00E199AA /* BolusInterfaceController.swift */; }; 4328E01E1CFBE25F00E199AA /* AddCarbsInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E01D1CFBE25F00E199AA /* AddCarbsInterfaceController.swift */; }; @@ -26,17 +30,19 @@ 432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */; }; 4331E0781C85302200FBE832 /* CGPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4331E0771C85302200FBE832 /* CGPoint.swift */; }; 4331E07A1C85650D00FBE832 /* ChartAxisValueDoubleLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */; }; + 4337615F1D52F487004A3647 /* GlucoseHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */; }; + 433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */; }; + 433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */; }; 4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */; }; 4346D1F01C781BEA00ABAFE3 /* SwiftCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */; }; 4346D1F61C78501000ABAFE3 /* ChartPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1F51C78501000ABAFE3 /* ChartPoint.swift */; }; - 434F24C91CFCA8940004498F /* TransmitterGlucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F24C81CFCA8940004498F /* TransmitterGlucose.swift */; }; - 434F24CB1CFCB7AB0004498F /* GlucoseRxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F24CA1CFCB7AB0004498F /* GlucoseRxMessage.swift */; }; 434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54561D287FDB002A9274 /* NibLoadable.swift */; }; 434F54591D28805E002A9274 /* ButtonTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 434F54581D28805E002A9274 /* ButtonTableViewCell.xib */; }; 434F545B1D2880D4002A9274 /* AuthenticationTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 434F545A1D2880D4002A9274 /* AuthenticationTableViewCell.xib */; }; 434F545F1D288345002A9274 /* ShareService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F545E1D288345002A9274 /* ShareService.swift */; }; 434F54611D28859B002A9274 /* ServiceCredential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54601D28859B002A9274 /* ServiceCredential.swift */; }; 434F54631D28DD80002A9274 /* ValidatingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */; }; + 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 434FB6451D68F1CD007B9C70 /* Amplitude.framework */; }; 434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */; }; 434FF1EE1CF27EEF000DB779 /* UITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */; }; 43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43523EDA1CC35083001850F1 /* RileyLinkKit.framework */; }; @@ -47,7 +53,7 @@ 4354003A1C9FB81100D5819C /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92501C541832001FFDE1 /* UIColor.swift */; }; 43649A631C7A347F00523D7F /* CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43649A621C7A347F00523D7F /* CollectionType.swift */; }; 436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0DA41D236A2A00104B24 /* LoopError.swift */; }; - 436FACEC1D0BA246004E2427 /* SegmentedControlTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACEB1D0BA246004E2427 /* SegmentedControlTableViewCell.swift */; }; + 436A0E7B1D7DE13400D6475D /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */; }; 436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */; }; 43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43776F8F1B8022E90074EA36 /* AppDelegate.swift */; }; 43776F971B8022E90074EA36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F951B8022E90074EA36 /* Main.storyboard */; }; @@ -63,13 +69,20 @@ 437CEEC81CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */; }; 437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */; }; 437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */; }; + 437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */; }; + 43846AD51D8FA67800799272 /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 43846AD41D8FA67800799272 /* Base.lproj */; }; + 43846AD91D8FA84B00799272 /* gallery.ckcomplication in Resources */ = {isa = PBXBuildFile; fileRef = 43846AD81D8FA84B00799272 /* gallery.ckcomplication */; }; + 43846ADB1D91057000799272 /* ContextUpdatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846ADA1D91057000799272 /* ContextUpdatable.swift */; }; + 43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */; }; 438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849E91D297CB6003B3F23 /* NightscoutService.swift */; }; 438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */; }; 438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849ED1D2A1EBB003B3F23 /* MLabService.swift */; }; + 438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 438A95A71D8B9B24009D12E1 /* xDripG5.framework */; }; + 438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */; }; + 438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */; }; 438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */; }; 439897351CD2F7DE00223065 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; }; 439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897361CD2F80600223065 /* AnalyticsManager.swift */; }; - 439897391CD2F82C00223065 /* AmplitudeFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 439897381CD2F82C00223065 /* AmplitudeFramework.framework */; }; 4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */; }; 43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A567681C94880B00334FAC /* LoopDataManager.swift */; }; 43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */; }; @@ -84,14 +97,14 @@ 43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; }; 43B371881CE597D10013C5A6 /* ShareClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43B371871CE597D10013C5A6 /* ShareClient.framework */; }; 43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C094491CACCC73001F6403 /* NotificationManager.swift */; }; - 43C418B31CE0550100405B6A /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E344A51B9E1B3300C85C07 /* NSBundle.swift */; }; + 43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C246A71D89990F0031F8D1 /* Crypto.framework */; }; 43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */; }; + 43C6407C1DA051850093E25D /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; }; 43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CA93361CB98079000026B5 /* MinimedKit.framework */; }; - 43CE7CDE1CA8B63E003CC1B0 /* NSDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */; }; + 43CB2B2B1D924D450079823D /* WCSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CB2B2A1D924D450079823D /* WCSession.swift */; }; + 43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDD1CA8B63E003CC1B0 /* Data.swift */; }; 43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */; }; 43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0521C93EC8200B3C386 /* DeviceDataManager.swift */; }; - 43DBF0551C93ED3000B3C386 /* DeviceDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0541C93ED3000B3C386 /* DeviceDataManager.swift */; }; - 43DBF0571C93F6EB00B3C386 /* ReservoirTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0561C93F6EB00B3C386 /* ReservoirTableViewController.swift */; }; 43DBF0591C93F73800B3C386 /* CarbEntryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */; }; 43DE92591C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */; }; 43DE925A1C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */; }; @@ -115,26 +128,34 @@ 43E2D8F51D20C0DB004DA55F /* recommend_temp_basal_start_low_end_high.json in Resources */ = {isa = PBXBuildFile; fileRef = 43E2D8EA1D20C0DB004DA55F /* recommend_temp_basal_start_low_end_high.json */; }; 43E2D8F61D20C0DB004DA55F /* recommend_temp_basal_start_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = 43E2D8EB1D20C0DB004DA55F /* recommend_temp_basal_start_low_end_in_range.json */; }; 43E2D9151D20C5A2004DA55F /* KeychainManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E2D8C91D20B9E7004DA55F /* KeychainManagerTests.swift */; }; - 43E2D9161D222684004DA55F /* InsulinKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43F78D4A1C914197002152D1 /* InsulinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 43E2D9171D2226BD004DA55F /* LoopKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 43E2D9181D222759004DA55F /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4A1C914197002152D1 /* InsulinKit.framework */; }; 43E2D9191D222759004DA55F /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; }; 43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */; }; 43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */; }; - 43E344A61B9E1B3300C85C07 /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E344A51B9E1B3300C85C07 /* NSBundle.swift */; }; - 43E344A81B9EAA8400C85C07 /* RemoteSettings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 43E344A71B9EAA8300C85C07 /* RemoteSettings.plist */; }; + 43E397A31D56B9E40028E321 /* Glucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E397A21D56B9E40028E321 /* Glucose.swift */; }; + 43EA285F1D50ED3D001BC233 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; }; + 43EA28601D50ED4D001BC233 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; }; + 43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; }; 43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EB40851C82646A00472A8C /* StatusChartManager.swift */; }; - 43EB40C21C83F84900472A8C /* StatusChartHighlightLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EB40C11C83F84900472A8C /* StatusChartHighlightLayer.swift */; }; - 43EDDBF31C361C75007D89B5 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43EDDBF11C361C75007D89B5 /* xDripG5.framework */; }; + 43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */; }; + 43F41C351D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */; }; + 43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C361D3BF32400C11ED6 /* UIAlertController.swift */; }; 43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */; }; + 43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */; }; 43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F5C2C81B929C09003EB13D /* HealthKit.framework */; }; 43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */; }; + 43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */; }; 43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F78D251C8FC000002152D1 /* DoseMath.swift */; }; 43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D481C914197002152D1 /* CarbKit.framework */; }; 43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D491C914197002152D1 /* GlucoseKit.framework */; }; - 43F78D4E1C914197002152D1 /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4A1C914197002152D1 /* InsulinKit.framework */; }; 43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; }; + 43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; }; + 4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */; }; + 4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */; }; C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; }; + C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; }; + C17884631D51A7A400405663 /* BatteryIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17884621D51A7A400405663 /* BatteryIndicator.swift */; }; + C18C8C511D5A351900E043FB /* NightscoutDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -211,16 +232,20 @@ dstSubfolderSpec = 10; files = ( 43E2D9171D2226BD004DA55F /* LoopKit.framework in CopyFiles */, - 43E2D9161D222684004DA55F /* InsulinKit.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewController.swift; sourceTree = ""; }; + 4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDeliveryTableViewController.swift; sourceTree = ""; }; + 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DoseStore.swift; sourceTree = ""; }; + 430DA58D1D4AEC230097D1CA /* NSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSBundle.swift; sourceTree = ""; }; + 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySentryPumpStatusMessageBody.swift; sourceTree = ""; }; + 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartContentView.swift; sourceTree = ""; }; 4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryEditTableViewController.swift; sourceTree = ""; }; 4315D2891CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DiagnosticLogger+LoopKit.swift"; sourceTree = ""; }; - 4328E0131CFBE1DA00E199AA /* ContextInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextInterfaceController.swift; sourceTree = ""; }; 4328E0151CFBE1DA00E199AA /* StatusInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusInterfaceController.swift; sourceTree = ""; }; 4328E0161CFBE1DA00E199AA /* BolusInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BolusInterfaceController.swift; sourceTree = ""; }; 4328E01D1CFBE25F00E199AA /* AddCarbsInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddCarbsInterfaceController.swift; sourceTree = ""; }; @@ -235,18 +260,20 @@ 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteDataManager.swift; sourceTree = ""; }; 4331E0771C85302200FBE832 /* CGPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGPoint.swift; sourceTree = ""; }; 4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartAxisValueDoubleLog.swift; sourceTree = ""; }; + 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseHUDView.swift; sourceTree = ""; }; + 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PumpIDTableViewController.swift; sourceTree = ""; }; + 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandResponseViewController.swift; sourceTree = ""; }; 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartTableViewCell.swift; sourceTree = ""; }; 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCharts.framework; path = Carthage/Build/iOS/SwiftCharts.framework; sourceTree = ""; }; 4346D1F51C78501000ABAFE3 /* ChartPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPoint.swift; sourceTree = ""; }; 434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RileyLinkBLEKit.framework; path = Carthage/Build/iOS/RileyLinkBLEKit.framework; sourceTree = ""; }; - 434F24C81CFCA8940004498F /* TransmitterGlucose.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransmitterGlucose.swift; sourceTree = ""; }; - 434F24CA1CFCB7AB0004498F /* GlucoseRxMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseRxMessage.swift; sourceTree = ""; }; 434F54561D287FDB002A9274 /* NibLoadable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NibLoadable.swift; sourceTree = ""; }; 434F54581D28805E002A9274 /* ButtonTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ButtonTableViewCell.xib; sourceTree = ""; }; 434F545A1D2880D4002A9274 /* AuthenticationTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AuthenticationTableViewCell.xib; sourceTree = ""; }; 434F545E1D288345002A9274 /* ShareService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareService.swift; sourceTree = ""; }; 434F54601D28859B002A9274 /* ServiceCredential.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCredential.swift; sourceTree = ""; }; 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidatingIndicatorView.swift; sourceTree = ""; }; + 434FB6451D68F1CD007B9C70 /* Amplitude.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Amplitude.framework; path = Carthage/Build/iOS/Amplitude.framework; sourceTree = ""; }; 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = ""; }; 434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewCell.swift; sourceTree = ""; }; 43523EDA1CC35083001850F1 /* RileyLinkKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RileyLinkKit.framework; path = Carthage/Build/iOS/RileyLinkKit.framework; sourceTree = ""; }; @@ -254,7 +281,7 @@ 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetBolusUserInfo.swift; sourceTree = ""; }; 43649A621C7A347F00523D7F /* CollectionType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionType.swift; sourceTree = ""; }; 436A0DA41D236A2A00104B24 /* LoopError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopError.swift; sourceTree = ""; }; - 436FACEB1D0BA246004E2427 /* SegmentedControlTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SegmentedControlTableViewCell.swift; sourceTree = ""; }; + 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSNumberFormatter.swift; sourceTree = ""; }; 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDataSource.swift; sourceTree = ""; }; 43776F8C1B8022E90074EA36 /* Loop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Loop.app; sourceTree = BUILT_PRODUCTS_DIR; }; 43776F8F1B8022E90074EA36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; @@ -271,13 +298,21 @@ 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReservoirVolumeHUDView.swift; sourceTree = ""; }; 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatteryLevelHUDView.swift; sourceTree = ""; }; 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = ""; }; + 437D9BA11D7B5203007245E8 /* Loop.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Loop.xcconfig; sourceTree = ""; }; + 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionTableViewController.swift; sourceTree = ""; }; + 43846AD41D8FA67800799272 /* Base.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Base.lproj; sourceTree = ""; }; + 43846AD81D8FA84B00799272 /* gallery.ckcomplication */ = {isa = PBXFileReference; lastKnownFileType = folder; path = gallery.ckcomplication; sourceTree = ""; }; + 43846ADA1D91057000799272 /* ContextUpdatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextUpdatable.swift; sourceTree = ""; }; + 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsScatterDownTrianglesLayer.swift; sourceTree = ""; }; 438849E91D297CB6003B3F23 /* NightscoutService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutService.swift; sourceTree = ""; }; 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmplitudeService.swift; sourceTree = ""; }; 438849ED1D2A1EBB003B3F23 /* MLabService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLabService.swift; sourceTree = ""; }; + 438A95A71D8B9B24009D12E1 /* xDripG5.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = xDripG5.framework; path = Carthage/Build/iOS/xDripG5.framework; sourceTree = ""; }; + 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionInputEffect.swift; sourceTree = ""; }; + 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionInputEffectTableViewCell.swift; sourceTree = ""; }; 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopStateView.swift; sourceTree = ""; }; 439897341CD2F7DE00223065 /* NSTimeInterval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSTimeInterval.swift; sourceTree = ""; }; 439897361CD2F80600223065 /* AnalyticsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AnalyticsManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - 439897381CD2F82C00223065 /* AmplitudeFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AmplitudeFramework.framework; path = Carthage/Build/iOS/AmplitudeFramework.framework; sourceTree = ""; }; 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDateFormatter.swift; sourceTree = ""; }; 43A567681C94880B00334FAC /* LoopDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = LoopDataManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwitchTableViewCell.swift; sourceTree = ""; }; @@ -294,14 +329,15 @@ 43B371851CE583890013C5A6 /* BasalStateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasalStateView.swift; sourceTree = ""; }; 43B371871CE597D10013C5A6 /* ShareClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShareClient.framework; path = Carthage/Build/iOS/ShareClient.framework; sourceTree = ""; }; 43C094491CACCC73001F6403 /* NotificationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = ""; }; + 43C246A71D89990F0031F8D1 /* Crypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crypto.framework; path = Carthage/Build/iOS/Crypto.framework; sourceTree = ""; }; 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ShareGlucose+GlucoseKit.swift"; sourceTree = ""; }; + 43C6407B1DA051850093E25D /* InsulinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InsulinKit.framework; path = Carthage/Build/iOS/InsulinKit.framework; sourceTree = ""; }; 43CA93361CB98079000026B5 /* MinimedKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MinimedKit.framework; path = Carthage/Build/iOS/MinimedKit.framework; sourceTree = ""; }; - 43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDate.swift; sourceTree = ""; }; + 43CB2B2A1D924D450079823D /* WCSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WCSession.swift; sourceTree = ""; }; + 43CE7CDD1CA8B63E003CC1B0 /* Data.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = ""; }; 43D533BB1CFD1DD7009E3085 /* WatchApp Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WatchApp Extension.entitlements"; sourceTree = ""; }; 43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = BolusViewController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 43DBF0521C93EC8200B3C386 /* DeviceDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = DeviceDataManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - 43DBF0541C93ED3000B3C386 /* DeviceDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceDataManager.swift; sourceTree = ""; }; - 43DBF0561C93F6EB00B3C386 /* ReservoirTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReservoirTableViewController.swift; sourceTree = ""; }; 43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryTableViewController.swift; sourceTree = ""; }; 43DE92501C541832001FFDE1 /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = ""; }; 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryUserInfo.swift; sourceTree = ""; }; @@ -328,26 +364,32 @@ 43E2D90F1D20C581004DA55F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = StatusTableViewController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSUserDefaults.swift; sourceTree = ""; }; - 43E344A51B9E1B3300C85C07 /* NSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSBundle.swift; sourceTree = ""; }; - 43E344A71B9EAA8300C85C07 /* RemoteSettings.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RemoteSettings.plist; sourceTree = ""; }; + 43E397A21D56B9E40028E321 /* Glucose.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Glucose.swift; sourceTree = ""; }; + 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseTrend.swift; sourceTree = ""; }; + 43EA28611D517E42001BC233 /* SensorDisplayable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SensorDisplayable.swift; sourceTree = ""; }; 43EB40851C82646A00472A8C /* StatusChartManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusChartManager.swift; sourceTree = ""; }; - 43EB40C11C83F84900472A8C /* StatusChartHighlightLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusChartHighlightLayer.swift; sourceTree = ""; }; - 43EDDBF01C361C75007D89B5 /* CommonCrypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CommonCrypto.framework; path = Carthage/Build/iOS/CommonCrypto.framework; sourceTree = ""; }; - 43EDDBF11C361C75007D89B5 /* xDripG5.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = xDripG5.framework; path = Carthage/Build/iOS/xDripG5.framework; sourceTree = ""; }; - 43EDDBF51C361D24007D89B5 /* CommonCrypto.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = CommonCrypto.framework.dSYM; path = Carthage/Build/iOS/CommonCrypto.framework.dSYM; sourceTree = ""; }; - 43EDDBF61C361D24007D89B5 /* xDripG5.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = xDripG5.framework.dSYM; path = Carthage/Build/iOS/xDripG5.framework.dSYM; sourceTree = ""; }; 43EDEE6B1CF2E12A00393BE3 /* Loop.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Loop.entitlements; sourceTree = ""; }; + 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartAxisValueDoubleUnit.swift; sourceTree = ""; }; + 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsTouchHighlightLayerViewCache.swift; sourceTree = ""; }; + 43F41C361D3BF32400C11ED6 /* UIAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIAlertController.swift; sourceTree = ""; }; 43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiagnosticLogger.swift; sourceTree = ""; }; + 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioSelectionTableViewController.swift; sourceTree = ""; }; 43F5C2C81B929C09003EB13D /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 43F5C2D41B92A4A6003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 43F5C2D61B92A4DC003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SettingsTableViewController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; + 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitleSubtitleTableViewCell.swift; sourceTree = ""; }; 43F78D251C8FC000002152D1 /* DoseMath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DoseMath.swift; sourceTree = ""; }; 43F78D481C914197002152D1 /* CarbKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CarbKit.framework; path = Carthage/Build/iOS/CarbKit.framework; sourceTree = ""; }; 43F78D491C914197002152D1 /* GlucoseKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GlucoseKit.framework; path = Carthage/Build/iOS/GlucoseKit.framework; sourceTree = ""; }; - 43F78D4A1C914197002152D1 /* InsulinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InsulinKit.framework; path = Carthage/Build/iOS/InsulinKit.framework; sourceTree = ""; }; 43F78D4B1C914197002152D1 /* LoopKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKit.framework; path = Carthage/Build/iOS/LoopKit.framework; sourceTree = ""; }; + 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LevelMaskView.swift; sourceTree = ""; }; + 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = G4ShareSpy.framework; path = Carthage/Build/iOS/G4ShareSpy.framework; sourceTree = ""; }; + 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GlucoseG4.swift; path = Loop/Models/GlucoseG4.swift; sourceTree = SOURCE_ROOT; }; C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = ""; }; + C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MealBolusNightscoutTreatment.swift; sourceTree = ""; }; + C17884621D51A7A400405663 /* BatteryIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatteryIndicator.swift; sourceTree = ""; }; + C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutDataManager.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -362,18 +404,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 43C6407C1DA051850093E25D /* InsulinKit.framework in Frameworks */, + 438A95A81D8B9B24009D12E1 /* xDripG5.framework in Frameworks */, + 43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */, + 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */, C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */, - 439897391CD2F82C00223065 /* AmplitudeFramework.framework in Frameworks */, 43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */, + 4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */, 43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */, 43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */, - 43F78D4E1C914197002152D1 /* InsulinKit.framework in Frameworks */, 43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */, 43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */, 43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */, 43B371881CE597D10013C5A6 /* ShareClient.framework in Frameworks */, 4346D1F01C781BEA00ABAFE3 /* SwiftCharts.framework in Frameworks */, - 43EDDBF31C361C75007D89B5 /* xDripG5.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -388,7 +432,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 43E2D9181D222759004DA55F /* InsulinKit.framework in Frameworks */, 43E2D9191D222759004DA55F /* LoopKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -408,7 +451,7 @@ children = ( 4328E01D1CFBE25F00E199AA /* AddCarbsInterfaceController.swift */, 4328E0161CFBE1DA00E199AA /* BolusInterfaceController.swift */, - 4328E0131CFBE1DA00E199AA /* ContextInterfaceController.swift */, + 43846ADA1D91057000799272 /* ContextUpdatable.swift */, 43A943891B926B7B0051FA24 /* NotificationController.swift */, 4328E0151CFBE1DA00E199AA /* StatusInterfaceController.swift */, ); @@ -422,6 +465,7 @@ 4328E0201CFBE2C500E199AA /* IdentifiableClass.swift */, 4328E0231CFBE2C500E199AA /* NSUserDefaults.swift */, 4328E0241CFBE2C500E199AA /* UIColor.swift */, + 43CB2B2A1D924D450079823D /* WCSession.swift */, 4328E0251CFBE2C500E199AA /* WKAlertAction.swift */, 4328E02E1CFBF81800E199AA /* WKInterfaceImage.swift */, ); @@ -431,19 +475,18 @@ 43757D131C06F26C00910CB9 /* Models */ = { isa = PBXGroup; children = ( + 43880F961D9D8052009061A8 /* ServiceAuthentication */, 43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */, - 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */, 4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */, - 434F24CA1CFCB7AB0004498F /* GlucoseRxMessage.swift */, + 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */, + 43E397A21D56B9E40028E321 /* Glucose.swift */, + 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */, 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */, 436A0DA41D236A2A00104B24 /* LoopError.swift */, - 438849ED1D2A1EBB003B3F23 /* MLabService.swift */, - 438849E91D297CB6003B3F23 /* NightscoutService.swift */, - 437CCADF1D285C7B0075D2C3 /* ServiceAuthentication.swift */, - 434F54601D28859B002A9274 /* ServiceCredential.swift */, + 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */, + 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */, + 43EA28611D517E42001BC233 /* SensorDisplayable.swift */, 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */, - 434F545E1D288345002A9274 /* ShareService.swift */, - 434F24C81CFCA8940004498F /* TransmitterGlucose.swift */, 4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */, ); path = Models; @@ -459,6 +502,7 @@ 43E2D8D21D20BF42004DA55F /* DoseMathTests */, 968DCD53F724DE56FFE51920 /* Frameworks */, 43776F8D1B8022E90074EA36 /* Products */, + 437D9BA11D7B5203007245E8 /* Loop.xcconfig */, ); sourceTree = ""; }; @@ -477,9 +521,9 @@ 43776F8E1B8022E90074EA36 /* Loop */ = { isa = PBXGroup; children = ( + 43846AD81D8FA84B00799272 /* gallery.ckcomplication */, 43EDEE6B1CF2E12A00393BE3 /* Loop.entitlements */, 43F5C2D41B92A4A6003EB13D /* Info.plist */, - 43E344A71B9EAA8300C85C07 /* RemoteSettings.plist */, 43776F8F1B8022E90074EA36 /* AppDelegate.swift */, 43776F981B8022E90074EA36 /* Assets.xcassets */, 43E344A01B9E144300C85C07 /* Extensions */, @@ -493,6 +537,19 @@ path = Loop; sourceTree = ""; }; + 43880F961D9D8052009061A8 /* ServiceAuthentication */ = { + isa = PBXGroup; + children = ( + 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */, + 438849ED1D2A1EBB003B3F23 /* MLabService.swift */, + 438849E91D297CB6003B3F23 /* NightscoutService.swift */, + 437CCADF1D285C7B0075D2C3 /* ServiceAuthentication.swift */, + 434F54601D28859B002A9274 /* ServiceCredential.swift */, + 434F545E1D288345002A9274 /* ShareService.swift */, + ); + path = ServiceAuthentication; + sourceTree = ""; + }; 43A943731B926B7B0051FA24 /* WatchApp */ = { isa = PBXGroup; children = ( @@ -507,9 +564,9 @@ isa = PBXGroup; children = ( 43D533BB1CFD1DD7009E3085 /* WatchApp Extension.entitlements */, + 43846AD41D8FA67800799272 /* Base.lproj */, 43A943911B926B7B0051FA24 /* Info.plist */, 43A9438D1B926B7B0051FA24 /* ComplicationController.swift */, - 43DBF0541C93ED3000B3C386 /* DeviceDataManager.swift */, 43A943871B926B7B0051FA24 /* ExtensionDelegate.swift */, 43A9438F1B926B7B0051FA24 /* Assets.xcassets */, 4328E0121CFBE1B700E199AA /* Controllers */, @@ -533,6 +590,7 @@ children = ( 435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */, 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */, + 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */, 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */, 43DE925B1C547A20001FFDE1 /* WatchContext.swift */, ); @@ -570,16 +628,21 @@ 43E344A01B9E144300C85C07 /* Extensions */ = { isa = PBXGroup; children = ( + C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */, + C17884621D51A7A400405663 /* BatteryIndicator.swift */, 4331E0771C85302200FBE832 /* CGPoint.swift */, 4346D1F51C78501000ABAFE3 /* ChartPoint.swift */, 43649A621C7A347F00523D7F /* CollectionType.swift */, + 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */, 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */, 434F54561D287FDB002A9274 /* NibLoadable.swift */, - 43E344A51B9E1B3300C85C07 /* NSBundle.swift */, - 43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */, + 430DA58D1D4AEC230097D1CA /* NSBundle.swift */, + 43CE7CDD1CA8B63E003CC1B0 /* Data.swift */, 4398973A1CD2FC2000223065 /* NSDateFormatter.swift */, + 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */, 439897341CD2F7DE00223065 /* NSTimeInterval.swift */, 43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */, + 43F41C361D3BF32400C11ED6 /* UIAlertController.swift */, 43DE92501C541832001FFDE1 /* UIColor.swift */, 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */, 434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */, @@ -594,9 +657,14 @@ 43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */, 4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */, 43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */, - 43DBF0561C93F6EB00B3C386 /* ReservoirTableViewController.swift */, + 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */, + 4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */, + 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */, + 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */, + 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */, 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */, 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */, + 4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */, ); path = "View Controllers"; sourceTree = ""; @@ -611,14 +679,19 @@ 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */, 437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */, 434F54581D28805E002A9274 /* ButtonTableViewCell.xib */, + 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */, + 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */, + 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */, 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */, + 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */, 437CEEBB1CD6DE6A003C8C80 /* HUDView.swift */, + 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */, 437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */, 438DADC71CDE8F8B007697A5 /* LoopStateView.swift */, + 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */, 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */, - 436FACEB1D0BA246004E2427 /* SegmentedControlTableViewCell.swift */, - 43EB40C11C83F84900472A8C /* StatusChartHighlightLayer.swift */, 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */, + 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */, 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */, ); path = Views; @@ -635,6 +708,7 @@ 43E2D8C51D204678004DA55F /* KeychainManager.swift */, 43E2D8C71D208D5B004DA55F /* KeychainManager+Loop.swift */, 43A567681C94880B00334FAC /* LoopDataManager.swift */, + C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */, 43C094491CACCC73001F6403 /* NotificationManager.swift */, 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */, 43EB40851C82646A00472A8C /* StatusChartManager.swift */, @@ -655,22 +729,21 @@ 968DCD53F724DE56FFE51920 /* Frameworks */ = { isa = PBXGroup; children = ( - C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */, - 43B371871CE597D10013C5A6 /* ShareClient.framework */, - 439897381CD2F82C00223065 /* AmplitudeFramework.framework */, + 43C6407B1DA051850093E25D /* InsulinKit.framework */, + 438A95A71D8B9B24009D12E1 /* xDripG5.framework */, + 434FB6451D68F1CD007B9C70 /* Amplitude.framework */, 43F78D481C914197002152D1 /* CarbKit.framework */, - 43EDDBF01C361C75007D89B5 /* CommonCrypto.framework */, - 43EDDBF51C361D24007D89B5 /* CommonCrypto.framework.dSYM */, + 43C246A71D89990F0031F8D1 /* Crypto.framework */, + 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */, 43F78D491C914197002152D1 /* GlucoseKit.framework */, 43F5C2C81B929C09003EB13D /* HealthKit.framework */, - 43F78D4A1C914197002152D1 /* InsulinKit.framework */, 43F78D4B1C914197002152D1 /* LoopKit.framework */, 43CA93361CB98079000026B5 /* MinimedKit.framework */, + C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */, 434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */, 43523EDA1CC35083001850F1 /* RileyLinkKit.framework */, + 43B371871CE597D10013C5A6 /* ShareClient.framework */, 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */, - 43EDDBF11C361C75007D89B5 /* xDripG5.framework */, - 43EDDBF61C361D24007D89B5 /* xDripG5.framework.dSYM */, ); name = Frameworks; sourceTree = ""; @@ -778,11 +851,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0700; - ORGANIZATIONNAME = "Nathan Racklyeft"; + LastUpgradeCheck = 0800; + ORGANIZATIONNAME = "LoopKit Authors"; TargetAttributes = { 43776F8B1B8022E90074EA36 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0800; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 0; @@ -800,14 +874,19 @@ }; 43A943711B926B7B0051FA24 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0800; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 0; }; + com.apple.BackgroundModes.watchos.app = { + enabled = 0; + }; }; }; 43A9437D1B926B7B0051FA24 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0800; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 0; @@ -822,15 +901,17 @@ }; 43E2D8D01D20BF42004DA55F = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; }; 43E2D90A1D20C581004DA55F = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; TestTargetID = 43776F8B1B8022E90074EA36; }; }; }; buildConfigurationList = 43776F871B8022E90074EA36 /* Build configuration list for PBXProject "Loop" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -860,7 +941,7 @@ 43776F991B8022E90074EA36 /* Assets.xcassets in Resources */, 434F54591D28805E002A9274 /* ButtonTableViewCell.xib in Resources */, 43776F971B8022E90074EA36 /* Main.storyboard in Resources */, - 43E344A81B9EAA8400C85C07 /* RemoteSettings.plist in Resources */, + 43846AD91D8FA84B00799272 /* gallery.ckcomplication in Resources */, 434F545B1D2880D4002A9274 /* AuthenticationTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -878,8 +959,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 43846AD51D8FA67800799272 /* Base.lproj in Resources */, 43A943901B926B7B0051FA24 /* Assets.xcassets in Resources */, - 4315D2901CA6332F00589052 /* RemoteSettings.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -917,7 +998,6 @@ files = ( ); inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/CommonCrypto.framework", "$(SRCROOT)/Carthage/Build/iOS/xDripG5.framework", "$(SRCROOT)/Carthage/Build/iOS/CarbKit.framework", "$(SRCROOT)/Carthage/Build/iOS/GlucoseKit.framework", @@ -927,10 +1007,11 @@ "$(SRCROOT)/Carthage/Build/iOS/MinimedKit.framework", "$(SRCROOT)/Carthage/Build/iOS/RileyLinkBLEKit.framework", "$(SRCROOT)/Carthage/Build/iOS/RileyLinkKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/AmplitudeFramework.framework", + "$(SRCROOT)/Carthage/Build/iOS/Amplitude.framework", "$(SRCROOT)/Carthage/Build/iOS/ShareClient.framework", "$(SRCROOT)/Carthage/Build/iOS/NightscoutUploadKit.framework", "$(SRCROOT)/Carthage/Build/iOS/Crypto.framework", + "$(SRCROOT)/Carthage/Build/iOS/G4ShareSpy.framework", ); outputPaths = ( ); @@ -948,47 +1029,62 @@ 434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */, 4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */, 43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */, - 434F24C91CFCA8940004498F /* TransmitterGlucose.swift in Sources */, - 434F24CB1CFCB7AB0004498F /* GlucoseRxMessage.swift in Sources */, + 430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */, 43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */, 437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */, - 43CE7CDE1CA8B63E003CC1B0 /* NSDate.swift in Sources */, + 43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */, + 43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */, 43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */, + 4313EDE01D8A6BF90060FA79 /* ChartContentView.swift in Sources */, 43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */, 434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */, 437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */, 43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */, 43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */, + 43E397A31D56B9E40028E321 /* Glucose.swift in Sources */, + 4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */, 43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */, 43649A631C7A347F00523D7F /* CollectionType.swift in Sources */, 437CEEBE1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift in Sources */, + 43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */, + C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */, + 43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */, 435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */, 43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */, - 43E344A61B9E1B3300C85C07 /* NSBundle.swift in Sources */, 43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */, 43E2D8C81D208D5B004DA55F /* KeychainManager+Loop.swift in Sources */, 4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */, 437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */, - 436FACEC1D0BA246004E2427 /* SegmentedControlTableViewCell.swift in Sources */, 43DBF0591C93F73800B3C386 /* CarbEntryTableViewController.swift in Sources */, 43DE925C1C547A20001FFDE1 /* WatchContext.swift in Sources */, + 43F41C351D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */, 43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */, + C17884631D51A7A400405663 /* BatteryIndicator.swift in Sources */, 437CEEC81CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift in Sources */, 43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */, 434FF1EE1CF27EEF000DB779 /* UITableViewCell.swift in Sources */, + C18C8C511D5A351900E043FB /* NightscoutDataManager.swift in Sources */, 438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */, - 43EB40C21C83F84900472A8C /* StatusChartHighlightLayer.swift in Sources */, 437CCADC1D284B830075D2C3 /* ButtonTableViewCell.swift in Sources */, 4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */, + 43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */, 4331E0781C85302200FBE832 /* CGPoint.swift in Sources */, 43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */, 4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */, + 4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */, 437CCAE01D285C7B0075D2C3 /* ServiceAuthentication.swift in Sources */, + 4302F4E51D4EA75100F0FCAF /* DoseStore.swift in Sources */, + 430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */, + 4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */, 438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */, - 43DBF0571C93F6EB00B3C386 /* ReservoirTableViewController.swift in Sources */, 435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */, + 437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */, + 43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */, 437CEEBC1CD6DE6A003C8C80 /* HUDView.swift in Sources */, + 433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */, + 436A0E7B1D7DE13400D6475D /* NSNumberFormatter.swift in Sources */, 434F545F1D288345002A9274 /* ShareService.swift in Sources */, + 43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */, 4354003A1C9FB81100D5819C /* UIColor.swift in Sources */, 4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */, 4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */, @@ -996,13 +1092,19 @@ 437CEEC01CD6FCD8003C8C80 /* BasalRateHUDView.swift in Sources */, 43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */, 437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */, + 433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */, 43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */, + 438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */, 4331E07A1C85650D00FBE832 /* ChartAxisValueDoubleLog.swift in Sources */, 434F54611D28859B002A9274 /* ServiceCredential.swift in Sources */, 436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */, 439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */, 4346D1F61C78501000ABAFE3 /* ChartPoint.swift in Sources */, + 43EA28601D50ED4D001BC233 /* GlucoseTrend.swift in Sources */, + 4337615F1D52F487004A3647 /* GlucoseHUDView.swift in Sources */, 438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */, + 438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */, + 43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */, 43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */, 432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */, 438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */, @@ -1018,8 +1120,6 @@ buildActionMask = 2147483647; files = ( 435400311C9F744E00D5819C /* BolusSuggestionUserInfo.swift in Sources */, - 43DBF0551C93ED3000B3C386 /* DeviceDataManager.swift in Sources */, - 4328E0181CFBE1DA00E199AA /* ContextInterfaceController.swift in Sources */, 43A9438A1B926B7B0051FA24 /* NotificationController.swift in Sources */, 43A943881B926B7B0051FA24 /* ExtensionDelegate.swift in Sources */, 4328E0291CFBE2C500E199AA /* NSUserDefaults.swift in Sources */, @@ -1029,11 +1129,13 @@ 4328E02B1CFBE2C500E199AA /* WKAlertAction.swift in Sources */, 4328E0281CFBE2C500E199AA /* CLKComplicationTemplate.swift in Sources */, 4328E01E1CFBE25F00E199AA /* AddCarbsInterfaceController.swift in Sources */, + 43846ADB1D91057000799272 /* ContextUpdatable.swift in Sources */, + 43EA285F1D50ED3D001BC233 /* GlucoseTrend.swift in Sources */, 4328E0261CFBE2C500E199AA /* IdentifiableClass.swift in Sources */, + 43CB2B2B1D924D450079823D /* WCSession.swift in Sources */, 43DE925A1C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */, 4328E0301CFBFAEB00E199AA /* NSTimeInterval.swift in Sources */, 43A9438E1B926B7B0051FA24 /* ComplicationController.swift in Sources */, - 43C418B31CE0550100405B6A /* NSBundle.swift in Sources */, 4328E01A1CFBE1DA00E199AA /* StatusInterfaceController.swift in Sources */, 43DE925D1C547A20001FFDE1 /* WatchContext.swift in Sources */, 435400351C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */, @@ -1108,6 +1210,7 @@ /* Begin XCBuildConfiguration section */ 43776FB41B8022E90074EA36 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1119,12 +1222,15 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 28; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1142,12 +1248,13 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; - MAIN_APP_BUNDLE_IDENTIFIER = com.loudnate.Loop; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MAIN_APP_BUNDLE_IDENTIFIER = "$(inherited).Loop"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = "-Wall"; }; @@ -1155,6 +1262,7 @@ }; 43776FB51B8022E90074EA36 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1166,12 +1274,15 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 28; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1183,11 +1294,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; - MAIN_APP_BUNDLE_IDENTIFIER = com.loudnate.Loop; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MAIN_APP_BUNDLE_IDENTIFIER = "$(inherited).Loop"; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = "-Wall"; @@ -1197,10 +1309,11 @@ 43776FB71B8022E90074EA36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -1216,10 +1329,11 @@ 43776FB81B8022E90074EA36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -1237,6 +1351,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -1253,6 +1368,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -1267,10 +1383,11 @@ 43A9439A1B926B7B0051FA24 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1286,10 +1403,11 @@ 43A9439B1B926B7B0051FA24 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + DEVELOPMENT_TEAM = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme index 663240430..f30916852 100644 --- a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme +++ b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - - - - - diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme index f13ca05cf..efc730405 100644 --- a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme +++ b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - - - - - Bool { + private(set) lazy var dataManager = DeviceDataManager() + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { window?.tintColor = UIColor.tintColor - NotificationManager.authorize() + NotificationManager.authorize(delegate: self) AnalyticsManager.sharedManager.application(application, didFinishLaunchingWithOptions: launchOptions) + if let navVC = window?.rootViewController as? UINavigationController, + let statusVC = navVC.viewControllers.first as? StatusTableViewController { + statusVC.dataManager = dataManager + } + return true } - func applicationWillResignActive(application: UIApplication) { + func applicationWillResignActive(_ application: UIApplication) { // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. } - func applicationDidEnterBackground(application: UIApplication) { + func applicationDidEnterBackground(_ application: UIApplication) { // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. } - func applicationWillEnterForeground(application: UIApplication) { + func applicationWillEnterForeground(_ application: UIApplication) { // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. } - func applicationDidBecomeActive(application: UIApplication) { + func applicationDidBecomeActive(_ application: UIApplication) { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - DeviceDataManager.sharedManager.transmitter?.resumeScanning() + dataManager.transmitter?.resumeScanning() } - func applicationWillTerminate(application: UIApplication) { + func applicationWillTerminate(_ application: UIApplication) { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - func applicationShouldRequestHealthAuthorization(application: UIApplication) { + func applicationShouldRequestHealthAuthorization(_ application: UIApplication) { } - // MARK: - Notifications + // MARK: - 3D Touch - func application(application: UIApplication, didReceiveLocalNotification notification: UILocalNotification) { - if application.applicationState == .Active { - if let message = notification.alertBody { - window?.rootViewController?.presentAlertControllerWithTitle(notification.alertTitle, message: message, animated: true, completion: nil) - } - } + func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) { + completionHandler(false) } +} - func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forLocalNotification notification: UILocalNotification, withResponseInfo responseInfo: [NSObject : AnyObject], completionHandler: () -> Void) { - switch identifier { - case NotificationManager.Action.RetryBolus.rawValue?: - if let units = notification.userInfo?[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double, - startDate = notification.userInfo?[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? NSDate where - startDate.timeIntervalSinceNow >= NSTimeInterval(minutes: -5) +extension AppDelegate: UNUserNotificationCenterDelegate { + func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) { + switch response.actionIdentifier { + case NotificationManager.Action.RetryBolus.rawValue: + if let units = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.BolusAmount.rawValue] as? Double, + let startDate = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.BolusStartDate.rawValue] as? Date, + startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5) { AnalyticsManager.sharedManager.didRetryBolus() - DeviceDataManager.sharedManager.enactBolus(units) { (error) in + dataManager.enactBolus(units: units) { (error) in if error != nil { - NotificationManager.sendBolusFailureNotificationForAmount(units, atDate: startDate) + NotificationManager.sendBolusFailureNotificationForAmount(units, atStartDate: startDate) } completionHandler() @@ -85,13 +91,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate { default: break } - + completionHandler() } - // MARK: - 3D Touch - - func application(application: UIApplication, performActionForShortcutItem shortcutItem: UIApplicationShortcutItem, completionHandler: (Bool) -> Void) { - completionHandler(false) + func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) { + completionHandler([.badge, .sound, .alert]) } } diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/29@2x-1.png deleted file mode 100644 index 3fc4c0d77..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x-1.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/29@2x.png deleted file mode 100644 index f3754790d..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/29@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/29@3x.png deleted file mode 100644 index 3f89cfae4..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/29@3x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@1x.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@1x.png deleted file mode 100644 index fda39d98e..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@1x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@2x-1.png deleted file mode 100644 index 183904a85..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x-1.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@2x.png deleted file mode 100644 index 2be00105b..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@3x.png deleted file mode 100644 index 6595aa834..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@3x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/60@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/60@2x.png deleted file mode 100644 index 6595aa834..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/60@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/60@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/60@3x.png deleted file mode 100644 index 1705ee048..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/60@3x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/76@1x.png b/Loop/Assets.xcassets/AppIcon.appiconset/76@1x.png deleted file mode 100644 index cd15c5326..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/76@1x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/76@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/76@2x.png deleted file mode 100644 index a982384b4..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/76@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/83.5@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/83.5@2x.png deleted file mode 100644 index 0f623c313..000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/83.5@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json b/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json index 3ca2983a7..ec38b33a9 100644 --- a/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,80 +1,105 @@ { "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20@3x.png", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "29@2x.png", + "filename" : "Icon-29@2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "29@3x.png", + "filename" : "Icon-29@3x.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "40@2x.png", + "filename" : "Icon-40@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "40@3x.png", + "filename" : "Icon-40@3x.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "60@2x.png", + "filename" : "Icon-60@2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "60@3x.png", + "filename" : "Icon-60@3x.png", "scale" : "3x" }, { + "size" : "20x20", "idiom" : "ipad", + "filename" : "Icon-20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20@2x-1.png", + "scale" : "2x" + }, + { "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "29@2x-1.png", + "filename" : "Icon-29@2x-1.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "40@1x.png", + "filename" : "Icon-40.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "40@2x-1.png", + "filename" : "Icon-40@2x-1.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "76@1x.png", + "filename" : "Icon-76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "76@2x.png", + "filename" : "Icon-76@2x.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "83.5@2x.png", + "filename" : "Icon-83.5@2x.png", "scale" : "2x" } ], diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20.png new file mode 100644 index 000000000..f2da6f6d7 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png new file mode 100644 index 000000000..7bf573b32 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png new file mode 100644 index 000000000..7bf573b32 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png new file mode 100644 index 000000000..e6454a2e2 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29.png new file mode 100644 index 000000000..804594487 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png new file mode 100644 index 000000000..0be6ed649 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png new file mode 100644 index 000000000..0be6ed649 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png new file mode 100644 index 000000000..7390ffa97 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 000000000..294f7ba75 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png new file mode 100644 index 000000000..1df0f29b6 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 000000000..1df0f29b6 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png new file mode 100644 index 000000000..b4e9fbb06 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 000000000..cf2432256 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 000000000..b6e68e9df Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 000000000..ff0d7ee4a Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 000000000..2e05d19a8 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 000000000..dbba465ae Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Loop/Assets.xcassets/battery/battery.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery.imageset/Contents.json new file mode 100644 index 000000000..898b4aa55 --- /dev/null +++ b/Loop/Assets.xcassets/battery/battery.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "battery.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf b/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf new file mode 100644 index 000000000..ca8bffbb6 Binary files /dev/null and b/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf differ diff --git a/Loop/Assets.xcassets/battery/battery_0.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_0.imageset/Contents.json deleted file mode 100644 index 394637428..000000000 --- a/Loop/Assets.xcassets/battery/battery_0.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "battery_0@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_0.imageset/battery_0@2x.png b/Loop/Assets.xcassets/battery/battery_0.imageset/battery_0@2x.png deleted file mode 100644 index 09e2ebfd7..000000000 Binary files a/Loop/Assets.xcassets/battery/battery_0.imageset/battery_0@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/battery/battery_100.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_100.imageset/Contents.json deleted file mode 100644 index 89e1fb18c..000000000 --- a/Loop/Assets.xcassets/battery/battery_100.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "battery_100@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_100.imageset/battery_100@2x.png b/Loop/Assets.xcassets/battery/battery_100.imageset/battery_100@2x.png deleted file mode 100644 index 37ad1a6f6..000000000 Binary files a/Loop/Assets.xcassets/battery/battery_100.imageset/battery_100@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/battery/battery_25.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_25.imageset/Contents.json deleted file mode 100644 index d55cea55b..000000000 --- a/Loop/Assets.xcassets/battery/battery_25.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "battery_25@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_25.imageset/battery_25@2x.png b/Loop/Assets.xcassets/battery/battery_25.imageset/battery_25@2x.png deleted file mode 100644 index 0e72d4623..000000000 Binary files a/Loop/Assets.xcassets/battery/battery_25.imageset/battery_25@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/battery/battery_50.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_50.imageset/Contents.json deleted file mode 100644 index 08fd5a46b..000000000 --- a/Loop/Assets.xcassets/battery/battery_50.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "battery_50@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_50.imageset/battery_50@2x.png b/Loop/Assets.xcassets/battery/battery_50.imageset/battery_50@2x.png deleted file mode 100644 index 05b2bdaf2..000000000 Binary files a/Loop/Assets.xcassets/battery/battery_50.imageset/battery_50@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/battery/battery_75.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_75.imageset/Contents.json deleted file mode 100644 index 8b58057f7..000000000 --- a/Loop/Assets.xcassets/battery/battery_75.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "battery_75@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_75.imageset/battery_75@2x.png b/Loop/Assets.xcassets/battery/battery_75.imageset/battery_75@2x.png deleted file mode 100644 index 8bf86a19b..000000000 Binary files a/Loop/Assets.xcassets/battery/battery_75.imageset/battery_75@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json new file mode 100644 index 000000000..a089e3549 --- /dev/null +++ b/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "battery_mask.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf b/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf new file mode 100644 index 000000000..a58075369 Binary files /dev/null and b/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf differ diff --git a/Loop/Assets.xcassets/battery/battery_unknown.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_unknown.imageset/Contents.json deleted file mode 100644 index 1e0bfe994..000000000 --- a/Loop/Assets.xcassets/battery/battery_unknown.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "battery_unknown@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/battery/battery_unknown.imageset/battery_unknown@2x.png b/Loop/Assets.xcassets/battery/battery_unknown.imageset/battery_unknown@2x.png deleted file mode 100644 index a778ae850..000000000 Binary files a/Loop/Assets.xcassets/battery/battery_unknown.imageset/battery_unknown@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/bolus.imageset/Contents.json b/Loop/Assets.xcassets/bolus.imageset/Contents.json new file mode 100644 index 000000000..2b1e3ca6c --- /dev/null +++ b/Loop/Assets.xcassets/bolus.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "bolus.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/bolus.imageset/bolus.pdf b/Loop/Assets.xcassets/bolus.imageset/bolus.pdf new file mode 100644 index 000000000..c9e69b5cf Binary files /dev/null and b/Loop/Assets.xcassets/bolus.imageset/bolus.pdf differ diff --git a/Loop/Assets.xcassets/carbs.imageset/Contents.json b/Loop/Assets.xcassets/carbs.imageset/Contents.json new file mode 100644 index 000000000..1e4fc587f --- /dev/null +++ b/Loop/Assets.xcassets/carbs.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "carbs.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/carbs.imageset/carbs.pdf b/Loop/Assets.xcassets/carbs.imageset/carbs.pdf new file mode 100644 index 000000000..327ec631b Binary files /dev/null and b/Loop/Assets.xcassets/carbs.imageset/carbs.pdf differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json new file mode 100644 index 000000000..aba98e7f1 --- /dev/null +++ b/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "reservoir.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf b/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf new file mode 100644 index 000000000..9f1765ba9 Binary files /dev/null and b/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/Contents.json deleted file mode 100644 index 795a5ba30..000000000 --- a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "reservoir_0@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/reservoir_0@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/reservoir_0@2x.png deleted file mode 100644 index 75faceec7..000000000 Binary files a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/reservoir_0@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/Contents.json deleted file mode 100644 index bb4d75e81..000000000 --- a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "reservoir_100@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/reservoir_100@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/reservoir_100@2x.png deleted file mode 100644 index d7504b87d..000000000 Binary files a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/reservoir_100@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/Contents.json deleted file mode 100644 index 3e8bde606..000000000 --- a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "reservoir_25@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/reservoir_25@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/reservoir_25@2x.png deleted file mode 100644 index d8bdee37d..000000000 Binary files a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/reservoir_25@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/Contents.json deleted file mode 100644 index 5e0ee1539..000000000 --- a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "reservoir_50@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/reservoir_50@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/reservoir_50@2x.png deleted file mode 100644 index 4be21f0d3..000000000 Binary files a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/reservoir_50@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/Contents.json deleted file mode 100644 index c409f7a5c..000000000 --- a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "reservoir_75@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/reservoir_75@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/reservoir_75@2x.png deleted file mode 100644 index 296b4b592..000000000 Binary files a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/reservoir_75@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json new file mode 100644 index 000000000..98eba7389 --- /dev/null +++ b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "reservoir_mask.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf new file mode 100644 index 000000000..3d5339917 Binary files /dev/null and b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf differ diff --git a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/Contents.json deleted file mode 100644 index 3d3207a1e..000000000 --- a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "reservoir_unknown@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/reservoir_unknown@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/reservoir_unknown@2x.png deleted file mode 100644 index a8bbec8e9..000000000 Binary files a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/reservoir_unknown@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/settings.imageset/Contents.json b/Loop/Assets.xcassets/settings.imageset/Contents.json new file mode 100644 index 000000000..d5ccdb99c --- /dev/null +++ b/Loop/Assets.xcassets/settings.imageset/Contents.json @@ -0,0 +1,40 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "settings.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "settings@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "settings@3x.png", + "scale" : "3x" + }, + { + "idiom" : "universal", + "scale" : "1x", + "height-class" : "compact" + }, + { + "idiom" : "universal", + "filename" : "settings_compact@2x.png", + "height-class" : "compact", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "settings_compact@3x.png", + "height-class" : "compact", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/settings.imageset/settings.png b/Loop/Assets.xcassets/settings.imageset/settings.png new file mode 100644 index 000000000..14fc3623d Binary files /dev/null and b/Loop/Assets.xcassets/settings.imageset/settings.png differ diff --git a/Loop/Assets.xcassets/settings.imageset/settings@2x.png b/Loop/Assets.xcassets/settings.imageset/settings@2x.png new file mode 100644 index 000000000..2ed175772 Binary files /dev/null and b/Loop/Assets.xcassets/settings.imageset/settings@2x.png differ diff --git a/Loop/Assets.xcassets/settings.imageset/settings@3x.png b/Loop/Assets.xcassets/settings.imageset/settings@3x.png new file mode 100644 index 000000000..6ee011f3c Binary files /dev/null and b/Loop/Assets.xcassets/settings.imageset/settings@3x.png differ diff --git a/Loop/Assets.xcassets/settings.imageset/settings_compact@2x.png b/Loop/Assets.xcassets/settings.imageset/settings_compact@2x.png new file mode 100644 index 000000000..ccac27347 Binary files /dev/null and b/Loop/Assets.xcassets/settings.imageset/settings_compact@2x.png differ diff --git a/Loop/Assets.xcassets/settings.imageset/settings_compact@3x.png b/Loop/Assets.xcassets/settings.imageset/settings_compact@3x.png new file mode 100644 index 000000000..07fe7deb7 Binary files /dev/null and b/Loop/Assets.xcassets/settings.imageset/settings_compact@3x.png differ diff --git a/Loop/Assets.xcassets/workout-selected.imageset/Contents.json b/Loop/Assets.xcassets/workout-selected.imageset/Contents.json new file mode 100644 index 000000000..3f89e16b4 --- /dev/null +++ b/Loop/Assets.xcassets/workout-selected.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "workout-selected.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf b/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf new file mode 100644 index 000000000..a340acb01 Binary files /dev/null and b/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf differ diff --git a/Loop/Assets.xcassets/workout.imageset/Contents.json b/Loop/Assets.xcassets/workout.imageset/Contents.json new file mode 100644 index 000000000..2abbf97ee --- /dev/null +++ b/Loop/Assets.xcassets/workout.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "workout.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Loop/Assets.xcassets/workout.imageset/workout.pdf b/Loop/Assets.xcassets/workout.imageset/workout.pdf new file mode 100644 index 000000000..251c7b3b3 Binary files /dev/null and b/Loop/Assets.xcassets/workout.imageset/workout.pdf differ diff --git a/Loop/Base.lproj/LaunchScreen.storyboard b/Loop/Base.lproj/LaunchScreen.storyboard index 5fad61ef4..9e724c069 100644 --- a/Loop/Base.lproj/LaunchScreen.storyboard +++ b/Loop/Base.lproj/LaunchScreen.storyboard @@ -1,21 +1,22 @@ - + - + + - + - + @@ -35,9 +36,9 @@ - + - + diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard index 0ae1d7901..7389695ac 100644 --- a/Loop/Base.lproj/Main.storyboard +++ b/Loop/Base.lproj/Main.storyboard @@ -1,10 +1,11 @@ - - + + - + + @@ -12,31 +13,28 @@ - + - + - + - + - - - + - + - + @@ -48,64 +46,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -131,14 +94,11 @@ - - - + @@ -148,7 +108,137 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -158,7 +248,7 @@ - + @@ -168,35 +258,31 @@ - + - - + + - + - + - - - - + + + + + - + - + @@ -223,39 +313,90 @@ - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + + + - + - - - - + + + + - + @@ -265,85 +406,110 @@ - - - + + + + - - + + + - - + + + - + + - - - + + + + - + - + - - + + - + - + @@ -352,37 +518,86 @@ - - + + - + - + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + @@ -391,19 +606,25 @@ - + - + + + + + + + - + @@ -414,53 +635,53 @@ + - + + - + - + - + - + - + @@ -474,22 +695,25 @@ + + + + - + - + - + @@ -500,9 +724,9 @@ @@ -518,14 +742,13 @@ - + - +