diff --git a/.gitignore b/.gitignore index 95e915d310..5a750a7dba 100644 --- a/.gitignore +++ b/.gitignore @@ -50,11 +50,8 @@ Pods/ # Carthage # # Add this line if you want to avoid checking in source code from Carthage dependencies. -Carthage/Checkouts/ -Carthage/Build/tvOS/ -Carthage/Build/iOS/*.bcsymbolmap -Carthage/Build/iOS/*.dSYM -Carthage/Build/watchOS/ +Carthage/ +.gitmodules # fastlane # diff --git a/.travis.yml b/.travis.yml index 4434aec29c..6418ed5685 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: objective-c -osx_image: xcode9.3 +osx_image: xcode9.4 # xcode_sdk: iphonesimulator11 # xcode_project: Loop.xcodeproj # xcode_scheme: Loop before_script: -# - carthage bootstrap + - set -o pipefail && xcodebuild -project Loop.xcodeproj -target Cartfile script: # Build the app target - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty diff --git a/Cartfile b/Cartfile index 4f8e32a7af..2d3f130fe4 100644 --- a/Cartfile +++ b/Cartfile @@ -1,7 +1,7 @@ -github "LoopKit/LoopKit" == 1.5.6 -github "LoopKit/CGMBLEKit" == 2.1 +github "LoopKit/LoopKit" "dev" +github "LoopKit/CGMBLEKit" "dev" github "i-schuetz/SwiftCharts" == 0.6.1 github "mddub/dexcom-share-client-swift" == 0.4.1 github "mddub/G4ShareSpy" == 0.3.3 -github "ps2/rileylink_ios" == 2.0.0 +github "ps2/rileylink_ios" "dev" github "LoopKit/Amplitude-iOS" "decreepify" diff --git a/Cartfile.resolved b/Cartfile.resolved index 5b46c41bb2..7ac7fc8d67 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270" -github "LoopKit/CGMBLEKit" "v2.1.0" -github "LoopKit/LoopKit" "v1.5.6" -github "i-schuetz/SwiftCharts" "6b55a26a7b0b95e49202ddc1db5404702fce114f" +github "LoopKit/CGMBLEKit" "1f9d0f221b886f12bcb2c46dc0b551589b623210" +github "LoopKit/LoopKit" "7082c64333113ad83238e483e83029c161ac35bb" +github "i-schuetz/SwiftCharts" "0.6.1" github "mddub/G4ShareSpy" "v0.3.3" github "mddub/dexcom-share-client-swift" "v0.4.1" -github "ps2/rileylink_ios" "v2.0.0" +github "ps2/rileylink_ios" "4a714a59d399aeb2984cbbe0434f02e6b59cfec5" diff --git a/Carthage/Build/.Amplitude-iOS.version b/Carthage/Build/.Amplitude-iOS.version deleted file mode 100644 index 6c790cc4b2..0000000000 --- a/Carthage/Build/.Amplitude-iOS.version +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - - ], - "tvOS" : [ - - ], - "commitish" : "2137d5fd44bf630ed33e1e72d7af6d8f8612f270", - "iOS" : [ - { - "name" : "Amplitude", - "hash" : "5f7cea951cf973d78073e75b87cd222891b181a3879b081a42f057d983b7c389" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.CGMBLEKit.version b/Carthage/Build/.CGMBLEKit.version deleted file mode 100644 index 0e5d1875f6..0000000000 --- a/Carthage/Build/.CGMBLEKit.version +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - { - "name" : "CGMBLEKit", - "hash" : "ade5de40f0722c07387d73c66678eefb12db2e028e0eb3ced4810ab415469e16" - } - ], - "tvOS" : [ - - ], - "commitish" : "v2.1.0", - "iOS" : [ - { - "name" : "CGMBLEKit", - "hash" : "48dd66b1f45d9e92de8553d4e9f24cb9fb1ff2b1fdf7be0d2b8fda10d1ec8ea7" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.G4ShareSpy.version b/Carthage/Build/.G4ShareSpy.version deleted file mode 100644 index 5f2d85a2a6..0000000000 --- a/Carthage/Build/.G4ShareSpy.version +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - - ], - "tvOS" : [ - - ], - "commitish" : "v0.3.3", - "iOS" : [ - { - "name" : "G4ShareSpy", - "hash" : "058f1119e227d680500b4adec40a5263cf61104be2580549218f6b5876edc20f" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.LoopKit.version b/Carthage/Build/.LoopKit.version deleted file mode 100644 index 6777a46027..0000000000 --- a/Carthage/Build/.LoopKit.version +++ /dev/null @@ -1,30 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - - ], - "tvOS" : [ - - ], - "commitish" : "v1.5.6", - "iOS" : [ - { - "name" : "GlucoseKit", - "hash" : "1ef4ccb9582a5a31643443c4e5c8d0fef7ef760c30cd09f545508e6a8458ae92" - }, - { - "name" : "InsulinKit", - "hash" : "15de73844cdbc5e2e1277ab01ac5d39c8085f5aeb6718aab4a8257c1943c902e" - }, - { - "name" : "LoopKit", - "hash" : "4fc0c5f661d96f375b30647728c1a2ff2164cd41ce046bbb86f8dc86bf9b76a8" - }, - { - "name" : "CarbKit", - "hash" : "aed7066da389d043482db40034f6d63b220b15852d0f6fe7ef9739ee8835b87f" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.SwiftCharts.version b/Carthage/Build/.SwiftCharts.version deleted file mode 100644 index b050a4083a..0000000000 --- a/Carthage/Build/.SwiftCharts.version +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - - ], - "tvOS" : [ - { - "name" : "SwiftCharts", - "hash" : "89105ffbd390eb5cad0e5a73421b7a6e85064b3b0d9f78153b64261cfb932425" - } - ], - "commitish" : "6b55a26a7b0b95e49202ddc1db5404702fce114f", - "iOS" : [ - { - "name" : "SwiftCharts", - "hash" : "09c973532129d22bb0757f475ed90e0e207e00b80d02e1ec01d6291fa6564636" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.dexcom-share-client-swift.version b/Carthage/Build/.dexcom-share-client-swift.version deleted file mode 100644 index bff096e2f7..0000000000 --- a/Carthage/Build/.dexcom-share-client-swift.version +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - - ], - "tvOS" : [ - - ], - "commitish" : "v0.4.1", - "iOS" : [ - { - "name" : "ShareClient", - "hash" : "1c64d1e57e896d8de9a262e02b58547e8a0b966090a4886c9dcbf34554dbdd7b" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.rileylink_ios.version b/Carthage/Build/.rileylink_ios.version deleted file mode 100644 index 61db1ce0fe..0000000000 --- a/Carthage/Build/.rileylink_ios.version +++ /dev/null @@ -1,41 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - { - "name" : "RileyLinkBLEKit", - "hash" : "c94d79d1403870df4539dd531024d5b44333642f28d49f8e9f4e26fbad42fd7a" - } - ], - "tvOS" : [ - - ], - "commitish" : "v2.0.0", - "iOS" : [ - { - "name" : "Crypto", - "hash" : "03768a89eb61f55cc386ae4586048ae851d61373da6868aab905db2a2586efc7" - }, - { - "name" : "RileyLinkKitUI", - "hash" : "dc1035fdadd445d12f383f01c10225b62aa7eca1f4da9016420d1835487628bb" - }, - { - "name" : "RileyLinkKit", - "hash" : "69fd21c5cd31ca8fe4611b01139780b1df32e71400a6fd91ebc865d85791b0a5" - }, - { - "name" : "NightscoutUploadKit", - "hash" : "d3fe0bc023a0a275dddec6bba616ff38239acf44ee71879e270a3f8690e4961d" - }, - { - "name" : "RileyLinkBLEKit", - "hash" : "a95573627d6ad9a853c620938e53e97d4c054553fde4af097a489038b020fd2f" - }, - { - "name" : "MinimedKit", - "hash" : "c5f8ad60aea1a15646ed78afcb485435b55cb6e5b54d7d299d2415e5fa74cf38" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/.xDripG5.version b/Carthage/Build/.xDripG5.version deleted file mode 100644 index f3e13aee79..0000000000 --- a/Carthage/Build/.xDripG5.version +++ /dev/null @@ -1,18 +0,0 @@ -{ - "Mac" : [ - - ], - "watchOS" : [ - - ], - "tvOS" : [ - - ], - "commitish" : "v0.8.1", - "iOS" : [ - { - "name" : "xDripG5", - "hash" : "059ee2ce1d7af004081638169f8525567da11acffc16edba50a5ad9224a5307e" - } - ] -} \ No newline at end of file diff --git a/Carthage/Build/iOS/Amplitude.framework/Amplitude b/Carthage/Build/iOS/Amplitude.framework/Amplitude deleted file mode 100755 index a761b896f9..0000000000 Binary files a/Carthage/Build/iOS/Amplitude.framework/Amplitude and /dev/null differ diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h deleted file mode 100644 index eaf9024dd9..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h +++ /dev/null @@ -1,68 +0,0 @@ -// -// ARCMacros.h -// InnerBand -// -// For an explanation of why these work, see: -// -// http://raptureinvenice.com/arc-support-without-branches/ -// -// Created by John Blanco on 1/28/12. -// Copyright (c) 2012 Rapture In Venice. All rights reserved. -// -// NOTE: __bridge_tranfer is not included here because releasing would be inconsistent. -// Avoid it unless you're using ARC exclusively or managing it with __has_feature(objc_arc). -// - -#if !defined(__clang__) || __clang_major__ < 3 - #ifndef __bridge - #define __bridge - #endif - - #ifndef __bridge_retain - #define __bridge_retain - #endif - - #ifndef __bridge_retained - #define __bridge_retained - #endif - - #ifndef __autoreleasing - #define __autoreleasing - #endif - - #ifndef __strong - #define __strong - #endif - - #ifndef __unsafe_unretained - #define __unsafe_unretained - #endif - - #ifndef __weak - #define __weak - #endif -#endif - -#if __has_feature(objc_arc) - #define SAFE_ARC_PROP_RETAIN strong - #define SAFE_ARC_RETAIN(x) (x) - #define SAFE_ARC_RELEASE(x) - #define SAFE_ARC_AUTORELEASE(x) (x) - #define SAFE_ARC_BLOCK_COPY(x) (x) - #define SAFE_ARC_BLOCK_RELEASE(x) - #define SAFE_ARC_SUPER_DEALLOC() - #define SAFE_ARC_DISPATCH_RELEASE(x) (x) - #define SAFE_ARC_AUTORELEASE_POOL_START() @autoreleasepool { - #define SAFE_ARC_AUTORELEASE_POOL_END() } -#else - #define SAFE_ARC_PROP_RETAIN retain - #define SAFE_ARC_RETAIN(x) ([(x) retain]) - #define SAFE_ARC_RELEASE(x) ([(x) release]) - #define SAFE_ARC_AUTORELEASE(x) ([(x) autorelease]) - #define SAFE_ARC_BLOCK_COPY(x) (Block_copy(x)) - #define SAFE_ARC_BLOCK_RELEASE(x) (Block_release(x)) - #define SAFE_ARC_SUPER_DEALLOC() ([super dealloc]) - #define SAFE_ARC_DISPATCH_RELEASE(x) (dispatch_release(x)) - #define SAFE_ARC_AUTORELEASE_POOL_START() NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - #define SAFE_ARC_AUTORELEASE_POOL_END() [pool release]; -#endif diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h deleted file mode 100644 index 3015ab5524..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// AMPConstants.h -#import - -extern NSString *const kAMPLibrary; -extern NSString *const kAMPPlatform; -extern NSString *const kAMPOSName; -extern NSString *const kAMPVersion; -extern NSString *const kAMPEventLogDomain; -extern NSString *const kAMPEventLogUrl; -extern NSString *const kAMPDefaultInstance; -extern const int kAMPApiVersion; -extern const int kAMPDBVersion; -extern const int kAMPDBFirstVersion; -extern const int kAMPEventUploadThreshold; -extern const int kAMPEventUploadMaxBatchSize; -extern const int kAMPEventMaxCount; -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; -extern NSString *const AMP_OP_APPEND; -extern NSString *const AMP_OP_CLEAR_ALL; -extern NSString *const AMP_OP_PREPEND; -extern NSString *const AMP_OP_SET; -extern NSString *const AMP_OP_SET_ONCE; -extern NSString *const AMP_OP_UNSET; - -extern NSString *const AMP_REVENUE_PRODUCT_ID; -extern NSString *const AMP_REVENUE_QUANTITY; -extern NSString *const AMP_REVENUE_PRICE; -extern NSString *const AMP_REVENUE_REVENUE_TYPE; -extern NSString *const AMP_REVENUE_RECEIPT; diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h deleted file mode 100644 index d140b4eb90..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// AMPDatabaseHelper.h -// Amplitude -// -// Created by Daniel Jih on 9/9/15. -// Copyright (c) 2015 Amplitude. All rights reserved. -// - -@interface AMPDatabaseHelper : NSObject - -@property (nonatomic, strong, readonly) NSString *databasePath; - -+ (AMPDatabaseHelper*)getDatabaseHelper; -+ (AMPDatabaseHelper*)getDatabaseHelper:(NSString*) instanceName; -- (BOOL)createTables; -- (BOOL)dropTables; -- (BOOL)upgrade:(int) oldVersion newVersion:(int) newVersion; -- (BOOL)resetDB:(BOOL) deleteDB; -- (BOOL)deleteDB; - -- (BOOL)addEvent:(NSString*) event; -- (BOOL)addIdentify:(NSString*) identify; -- (NSMutableArray*)getEvents:(long long) upToId limit:(long long) limit; -- (NSMutableArray*)getIdentifys:(long long) upToId limit:(long long) limit; -- (int)getEventCount; -- (int)getIdentifyCount; -- (int)getTotalEventCount; -- (BOOL)removeEvents:(long long) maxId; -- (BOOL)removeIdentifys:(long long) maxIdentifyId; -- (BOOL)removeEvent:(long long) eventId; -- (BOOL)removeIdentify:(long long) identifyId; -- (long long)getNthEventId:(long long) n; -- (long long)getNthIdentifyId:(long long) n; - -- (BOOL)insertOrReplaceKeyValue:(NSString*) key value:(NSString*) value; -- (BOOL)insertOrReplaceKeyLongValue:(NSString*) key value:(NSNumber*) value; -- (NSString*)getValue:(NSString*) key; -- (NSNumber*)getLongValue:(NSString*) key; - -@end diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h deleted file mode 100644 index 945c2e5e7e..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPDeviceInfo.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// AMPDeviceInfo.h - -@interface AMPDeviceInfo : NSObject - --(id) init: (BOOL) disableIdfaTracking; -@property (readonly) NSString *appVersion; -@property (readonly) NSString *osName; -@property (readonly) NSString *osVersion; -@property (readonly) NSString *manufacturer; -@property (readonly) NSString *model; -@property (readonly) NSString *carrier; -@property (readonly) NSString *country; -@property (readonly) NSString *language; -@property (readonly) NSString *advertiserID; -@property (readonly) NSString *vendorID; - -+(NSString*) generateUUID; - -@end diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h deleted file mode 100644 index d9a6c16fb9..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPIdentify.h +++ /dev/null @@ -1,138 +0,0 @@ -// -// AMPIdentify.h -// Amplitude -// -// Created by Daniel Jih on 10/5/15. -// Copyright © 2015 Amplitude. All rights reserved. -// - -/** - `AMPIdentify` objects are a wrapper for user property operations, which get passed to the `identify` method to send to Amplitude servers. - - **Note:** if a user property is used in multiple operations on the same Identify object, only the first operation will be saved, and the rest will be ignored. - - Each method adds a user property operation to the Identify object, and returns the same Identify object, allowing you to chain multiple method calls together. - - Here is an example of how to use `AMPIdentify` to send user property operations: - - AMPIdentify *identify = [[AMPIdentify identify] add:@"karma" value:[NSNumber numberWithInt:1]]; - [[identify set:@"colors" value:@[@"rose", @"gold"]] append:@"ab-tests" value:@"campaign_a"]; - [[Amplitude instance] identify:identify]; - - See [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -@interface AMPIdentify : NSObject - -@property (nonatomic, strong, readonly) NSMutableDictionary *userPropertyOperations; - -/**----------------------------------------------------------------------------- - * @name Creating an AMPIdentify Object - * ----------------------------------------------------------------------------- - */ - -/** - Creates a nwe [AMPIdentify](#) object. - - @returns a new [AMPIdentify](#) object. - */ -+ (instancetype)identify; - -/**----------------------------------------------------------------------------- - * @name User Property Operations via Identify API - * ----------------------------------------------------------------------------- - */ - -/** - Increment a user property by a given value (can also be negative to decrement). - - If the user property does not have a value set yet, it will be initialized to 0 before being incremented. - - @param property The user property key - - @param value The amount by which to increment the user property. - - @returns the same [AMPIdentify](#) object, allowing you to chain multiple method calls together. - - @see [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -- (AMPIdentify*)add:(NSString*) property value:(NSObject*) value; - -/** - Append a value or values to a user property. - - If the user property does not have a value set yet, it will be initialized to an empty list before the new values are appended. If the user property has an existing value and it is not a list, the existing value will be converted into a list with the new values appended. - - @param property The user property key - - @param value A value or values to append. - - @returns the same [AMPIdentify](#) object, allowing you to chain multiple method calls together. - - @see [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -- (AMPIdentify*)append:(NSString*) property value:(NSObject*) value; - -/* - Internal method for clearing user properties. - - **Note:** $clearAll needs to be sent on its own Identify object. If there are already other operations, then don't add $clearAll. If $clearAll already in an Identify object, don't allow other operations to be added. - */ -- (AMPIdentify*)clearAll; - -/** - Prepend a value or values to a user property. Prepend means inserting the value or values at the front of a list. - - If the user property does not have a value set yet, it will be initialized to an empty list before the new values are prepended. If the user property has an existing value and it is not a list, the existing value will be converted into a list with the new values prepended. - - @param property The user property key - - @param value A value or values to prepend. - - @returns the same [AMPIdentify](#) object, allowing you to chain multiple method calls together. - - @see [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -- (AMPIdentify*)prepend:(NSString*) property value:(NSObject*) value; - -/** - Sets the value of a given user property. If the value already exists, it will be overwritten with the new value. - - @param property The user property key - - @param value A value or values to set. - - @returns the same [AMPIdentify](#) object, allowing you to chain multiple method calls together. - - @see [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -- (AMPIdentify*)set:(NSString*) property value:(NSObject*) value; - - -/** - Sets the value of a given user property only once. Subsequent `setOnce` operations on that user property will be ignored; however, that user property can still be modified through any of the other operations. - - This is useful for capturing properties such as initial_signup_date, initial_referrer, etc. - - @param property The user property key - - @param value A value or values to set once. - - @returns the same [AMPIdentify](#) object, allowing you to chain multiple method calls together. - - @see [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -- (AMPIdentify*)setOnce:(NSString*) property value:(NSObject*) value; - - -/** - Unset and remove user property. This user property will no longer show up in that user's profile. - - @param property The user property key to unset. - - @returns the same [AMPIdentify](#) object, allowing you to chain multiple method calls together. - - @see [User Properties and User Property Operations](https://github.com/amplitude/amplitude-ios#user-properties-and-user-property-operations) - */ -- (AMPIdentify*)unset:(NSString*) property; - -@end diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h deleted file mode 100644 index 314ff9a053..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPLocationManagerDelegate.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// AMPLocationManagerDelegate.h - -#import -#import - -@interface AMPLocationManagerDelegate : NSObject - -- (void)locationManager:(CLLocationManager*) manager didFailWithError:(NSError*) error; - -- (void)locationManager:(CLLocationManager*) manager didUpdateToLocation:(CLLocation*) newLocation fromLocation:(CLLocation*) oldLocation; - -- (void)locationManager:(CLLocationManager*) manager didChangeAuthorizationStatus:(CLAuthorizationStatus) status; - -@end diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h deleted file mode 100644 index 7b4b1bdaa5..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPRevenue.h +++ /dev/null @@ -1,168 +0,0 @@ -// -// AMPRevenue.h -// Amplitude -// -// Created by Daniel Jih on 04/18/16. -// Copyright © 2016 Amplitude. All rights reserved. -// - -/** - `AMPRevenue` objects are a wrapper for revenue data, which get passed to the `logRevenueV2` method to send to Amplitude servers. - - **Note:** price is a required field. If quantity is not specified, then defaults to 1. - - **Note:** Revenue amount is calculated as price * quantity. - - Each method updates a revenue property in the Revenue object, and returns the same Revenue object, allowing you to chain multiple method calls together. - - Here is an example of how to use `AMPRevenue` to send revenue data: - - AMPRevenue *revenue = [[[AMPRevenue revenue] setProductIdentifier:@"productIdentifier"] setQuantity:3]; - [revenue setPrice:[NSNumber numberWithDouble:3.99]]; - [[Amplitude instance] logRevenueV2:revenue]; - - See [Tracking Revenue](https://github.com/amplitude/Amplitude-iOS#tracking-revenue) for more information about logging Revenue. - */ - -@interface AMPRevenue : NSObject - -/**----------------------------------------------------------------------------- - * @name Required Revenue Fields - * ----------------------------------------------------------------------------- - */ - -/** - The product identifier for the transaction (optional). - */ -@property (nonatomic, strong, readonly) NSString *productId; - -/** - The price of product(s) in the transaction. - - @warning: required field - */ -@property (nonatomic, strong, readonly) NSNumber *price; - -/**----------------------------------------------------------------------------- - * @name Optional Revenue Fields - * ----------------------------------------------------------------------------- - */ - -/** - The quantity of product(s) purchased in the transaction. - - @warning: defaults to 1 - */ -@property (nonatomic, readonly) NSInteger quantity; - -/** - The revenue type for the transaction (optional). - */ -@property (nonatomic, strong, readonly) NSString *revenueType; - -/** - The receipt data for the transaction. Required if you want to verify the revenue event. - - @see [Revenue Validation](https://github.com/amplitude/amplitude-ios#revenue-verification) - */ -@property (nonatomic, strong, readonly) NSData *receipt; - -/** - Event properties for the revenue event. - - @see [Setting Event Properties](https://github.com/amplitude/amplitude-ios#setting-event-properties) - */ -@property (nonatomic, strong, readonly) NSDictionary *properties; - -/**----------------------------------------------------------------------------- - * @name Creating an AMPRevenue Object - * ----------------------------------------------------------------------------- - */ - -/** - Creates a new [AMPRevenue](#) object. - - @returns a new [AMPRevenue](#) object. - */ -+ (instancetype)revenue; - -/* - private internal method to verify that all required revenue fields are set - */ -- (BOOL) isValidRevenue; - -/**----------------------------------------------------------------------------- - * @name Setter Methods for Revenue Fields - * ----------------------------------------------------------------------------- - */ - -/** - Set a value for the product identifier. - - @param productIdentifier The value for the product identifier. Empty strings are ignored. - - @returns the same [AMPRevenue](#) object, allowing you to chain multiple method calls together. - */ -- (AMPRevenue*)setProductIdentifier:(NSString*) productIdentifier; - -/** - Set a value for the quantity. - - **Note** revenue amount is calculated as price * quantity. - - @param quantity Integer value for the quantity. Defaults to 1 if not specified. - - @returns the same [AMPRevenue](#) object, allowing you to chain multiple method calls together. - */ -- (AMPRevenue*)setQuantity:(NSInteger) quantity; - - -/** - Set a value for the price. - - **Note** revenue amount is calculated as price * quantity. - - @param price The value for the price. - - @returns the same [AMPRevenue](#) object, allowing you to chain multiple method calls together. - */ -- (AMPRevenue*)setPrice:(NSNumber*) price; - - -/** - Set a value for the revenueType (for example purchase, cost, tax, refund, etc). - - @param revenueType String value for the revenue type. - - @returns the same [AMPRevenue](#) object, allowing you to chain multiple method calls together. - */ -- (AMPRevenue*)setRevenueType:(NSString*) revenueType; - - -/** - Add the receipt data for the transaction. Reequired if you want to verify this revenue event. - - @param receipt The receipt data from the App Store. - - @returns the same [AMPRevenue](#) object, allowing you to chain multiple method calls together. - - @see [Revenue Validation](https://github.com/amplitude/amplitude-ios#revenue-verification) - @see [Validating Receipts with the App Store](https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html#//apple_ref/doc/uid/TP40010573-CH104-SW1) - */ -- (AMPRevenue*)setReceipt:(NSData*) receipt; - -/** - Set event properties for the revenue event. - - @param eventProperties An `NSDictionary` of event properties to set for the revenue event. - - @returns the same [AMPRevenue](#) object, allowing you to chain multiple method calls together. - - @see [Setting Event Properties](https://github.com/amplitude/amplitude-ios#setting-event-properties) - */ -- (AMPRevenue*)setEventProperties:(NSDictionary*) eventProperties; - - -- (NSDictionary*)toNSDictionary; - -@end diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h deleted file mode 100644 index b7318d2b4c..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h +++ /dev/null @@ -1,18 +0,0 @@ -#if AMPLITUDE_SSL_PINNING -// -// AMPURLConnection.h -// Amplitude -// -// Created by Allan on 3/13/15. -// Copyright (c) 2015 Amplitude. All rights reserved. -// - -#import -#import "ISPPinnedNSURLConnectionDelegate.h" - -@interface AMPURLConnection : ISPPinnedNSURLConnectionDelegate - -+ (void)sendAsynchronousRequest:(NSURLRequest *)request queue:(NSOperationQueue *)queue completionHandler:(void (^)(NSURLResponse *response, NSData *data, NSError *connectionError))handler; - -@end -#endif diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h deleted file mode 100644 index f16cd95903..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AMPUtils.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// AMPUtils.h -// Pods -// -// Created by Daniel Jih on 10/4/15. -// -// - -@interface AMPUtils : NSObject - -+ (NSString*) generateUUID; -+ (id) makeJSONSerializable:(id) obj; -+ (BOOL) isEmptyString:(NSString*) str; -+ (NSDictionary*) validateGroups:(NSDictionary*) obj; -+ (NSString*) platformDataDirectory; - -@end diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h b/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h deleted file mode 100644 index 70708dc063..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifdef AMPLITUDE_SSL_PINNING -// -// Amplitude+SSLPinning -// Amplitude -// -// Created by Allan on 3/11/15. -// Copyright (c) 2015 Amplitude. All rights reserved. -// - -#import - -@interface Amplitude (SSLPinning) - -@property (nonatomic, assign) BOOL sslPinningEnabled; - -@end -#endif diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h b/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h deleted file mode 100644 index 8dc562b218..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/Amplitude.h +++ /dev/null @@ -1,612 +0,0 @@ -// -// Amplitude.h - -#import -#import "AMPIdentify.h" -#import "AMPRevenue.h" - - -/** - Amplitude iOS SDK. - - Use the Amplitude SDK to track events in your application. - - Setup: - - 1. In every file that uses analytics, import Amplitude.h at the top `#import "Amplitude.h"` - 2. Be sure to initialize the API in your didFinishLaunchingWithOptions delegate `[[Amplitude instance] initializeApiKey:@"YOUR_API_KEY_HERE"];` - 3. Track an event anywhere in the app `[[Amplitude instance] logEvent:@"EVENT_IDENTIFIER_HERE"];` - 4. You can attach additional data to any event by passing a NSDictionary object: - - NSMutableDictionary *eventProperties = [NSMutableDictionary dictionary]; - [eventProperties setValue:@"VALUE_GOES_HERE" forKey:@"KEY_GOES_HERE"]; - [[Amplitude instance] logEvent:@"Compute Hash" withEventProperties:eventProperties]; - - **Note:** you should call SDK methods on an Amplitude instance, for example logging events with the default instance: `[[Amplitude instance] logEvent:@"testEvent"];` - - **Note:** the SDK supports tracking data to multiple Amplitude apps, via separate named instances. For example: `[[Amplitude instanceWithName:@"app1"] logEvent:@"testEvent"];` See [Tracking Events to Multiple Apps](https://github.com/amplitude/amplitude-ios#tracking-events-to-multiple-amplitude-apps). - - For more details on the setup and usage, be sure to checkout the [README](https://github.com/amplitude/Amplitude-iOS#amplitude-ios-sdk) - */ -@interface Amplitude : NSObject - -#pragma mark - Properties - - /**----------------------------------------------------------------------------- - * @name Instance Properties - * ----------------------------------------------------------------------------- - */ - - /** - API key for your Amplitude App. - */ -@property (nonatomic, strong, readonly) NSString *apiKey; - -/** - Identifier for the current user. - */ -@property (nonatomic, strong, readonly) NSString *userId; - -/** - Identifier for the current device. - */ -@property (nonatomic, strong, readonly) NSString *deviceId; - -/** - Name of the SDK instance (ex: no name for default instance, or custom name for a named instance) - */ -@property (nonatomic, strong, readonly) NSString *instanceName; -@property (nonatomic ,strong, readonly) NSString *propertyListPath; - -/** - Whether or to opt the current user out of tracking. If true then this blocks the logging of any events and properties, and blocks the sending of events to Amplitude servers. - */ -@property (nonatomic, assign) BOOL optOut; - - -/**----------------------------------------------------------------------------- - * @name Configurable SDK thresholds and parameters - * ----------------------------------------------------------------------------- - */ - -/** - The maximum number of events that can be stored locally before forcing an upload. The default is 30 events. - */ -@property (nonatomic, assign) int eventUploadThreshold; - -/** - The maximum number of events that can be uploaded in a single request. The default is 100 events. - */ -@property (nonatomic, assign) int eventUploadMaxBatchSize; - -/** - The maximum number of events that can be stored lcoally. The default is 1000 events. - */ -@property (nonatomic, assign) int eventMaxCount; - -/** - The amount of time after an event is logged that events will be batched before being uploaded to the server. The default is 30 seconds. - */ -@property (nonatomic, assign) int eventUploadPeriodSeconds; - -/** - When a user closes and reopens the app within minTimeBetweenSessionsMillis milliseconds, the reopen is considered part of the same session and the session continues. Otherwise, a new session is created. The default is 15 minutes. - */ -@property (nonatomic, assign) long minTimeBetweenSessionsMillis; - -/** - Whether to automatically log start and end session events corresponding to the start and end of a user's session. - */ -@property (nonatomic, assign) BOOL trackingSessionEvents; - - -#pragma mark - Methods - -/**----------------------------------------------------------------------------- - * @name Fetching Amplitude SDK instance - * ----------------------------------------------------------------------------- - */ - -/** - This fetches the default SDK instance. Recommended if you are only logging events to a single app. - - @returns the default Amplitude SDK instance - */ -+ (Amplitude *)instance; - -/** - This fetches a named SDK instance. Use this if logging events to multiple Amplitude apps. - - @param instanceName the name of the SDK instance to fetch. - - @returns the Amplitude SDK instance corresponding to `instanceName` - - @see [Tracking Events to Multiple Amplitude Apps](https://github.com/amplitude/amplitude-ios#tracking-events-to-multiple-amplitude-apps) - */ -+ (Amplitude *)instanceWithName:(NSString*) instanceName; - -/**----------------------------------------------------------------------------- - * @name Initialize the Amplitude SDK with your Amplitude API Key - * ----------------------------------------------------------------------------- - */ - -/** - Initializes the Amplitude instance with your Amplitude API key - - We recommend you first initialize your class within your "didFinishLaunchingWithOptions" method inside your app delegate. - - **Note:** this is required before you can log any events. - - @param apiKey Your Amplitude key obtained from your dashboard at https://amplitude.com/settings - */ -- (void)initializeApiKey:(NSString*) apiKey; - -/** - Initializes the Amplitude instance with your Amplitude API key and sets a user identifier for the current user. - - We recommend you first initialize your class within your "didFinishLaunchingWithOptions" method inside your app delegate. - - **Note:** this is required before you can log any events. - - @param apiKey Your Amplitude key obtained from your dashboard at https://amplitude.com/settings - - @param userId If your app has its own login system that you want to track users with, you can set the userId. - -*/ -- (void)initializeApiKey:(NSString*) apiKey userId:(NSString*) userId; - - -/**----------------------------------------------------------------------------- - * @name Logging Events - * ----------------------------------------------------------------------------- - */ - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - */ -- (void)logEvent:(NSString*) eventType; - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - @param eventProperties You can attach additional data to any event by passing a NSDictionary object with property: value pairs. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - */ -- (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties; - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - @param eventProperties You can attach additional data to any event by passing a NSDictionary object with property: value pairs. - @param outOfSession If YES, will track the event as out of session. Useful for push notification events. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - @see [Tracking Sessions](https://github.com/amplitude/Amplitude-iOS#tracking-sessions) - */ -- (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties outOfSession:(BOOL) outOfSession; - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - @param eventProperties You can attach additional data to any event by passing a NSDictionary object with property: value pairs. - @param groups You can specify event-level groups for this user by passing a NSDictionary object with groupType: groupName pairs. Note the keys need to be strings, and the values can either be strings or an array of strings. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - - @see [Setting Groups](https://github.com/amplitude/Amplitude-iOS#setting-groups) - */ -- (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties withGroups:(NSDictionary*) groups; - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - @param eventProperties You can attach additional data to any event by passing a NSDictionary object with property: value pairs. - @param groups You can specify event-level groups for this user by passing a NSDictionary object with groupType: groupName pairs. Note the keys need to be strings, and the values can either be strings or an array of strings. - @param outOfSession If YES, will track the event as out of session. Useful for push notification events. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - - @see [Setting Groups](https://github.com/amplitude/Amplitude-iOS#setting-groups) - - @see [Tracking Sessions](https://github.com/amplitude/Amplitude-iOS#tracking-sessions) - */ -- (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties withGroups:(NSDictionary*) groups outOfSession:(BOOL) outOfSession; - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - @param eventProperties You can attach additional data to any event by passing a NSDictionary object with property: value pairs. - @param groups You can specify event-level groups for this user by passing a NSDictionary object with groupType: groupName pairs. Note the keys need to be strings, and the values can either be strings or an array of strings. - @param longLongTimestamp You can specify a custom timestamp by passing the milliseconds since epoch UTC time as a long long. - @param outOfSession If YES, will track the event as out of session. Useful for push notification events. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - - @see [Setting Groups](https://github.com/amplitude/Amplitude-iOS#setting-groups) - - @see [Tracking Sessions](https://github.com/amplitude/Amplitude-iOS#tracking-sessions) - */ -- (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties withGroups:(NSDictionary*) groups withLongLongTimestamp:(long long) longLongTimestamp outOfSession:(BOOL)outOfSession; - -/** - Tracks an event. Events are saved locally. - - Uploads are batched to occur every 30 events or every 30 seconds (whichever comes first), as well as on app close. - - @param eventType The name of the event you wish to track. - @param eventProperties You can attach additional data to any event by passing a NSDictionary object with property: value pairs. - @param groups You can specify event-level groups for this user by passing a NSDictionary object with groupType: groupName pairs. Note the keys need to be strings, and the values can either be strings or an array of strings. - @param timestamp You can specify a custom timestamp by passing an NSNumber representing the milliseconds since epoch UTC time. We recommend using [NSNumber numberWithLongLong:milliseconds] to create the value. If nil is passed in, then the event will be timestamped with the current time. - @param outOfSession If YES, will track the event as out of session. Useful for push notification events. - - @see [Tracking Events](https://github.com/amplitude/amplitude-ios#tracking-events) - - @see [Setting Groups](https://github.com/amplitude/Amplitude-iOS#setting-groups) - - @see [Tracking Sessions](https://github.com/amplitude/Amplitude-iOS#tracking-sessions) - */ -- (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties withGroups:(NSDictionary*) groups withTimestamp:(NSNumber*) timestamp outOfSession:(BOOL)outOfSession; - -/**----------------------------------------------------------------------------- - * @name Logging Revenue - * ----------------------------------------------------------------------------- - */ - -/** - **Note: this is deprecated** - please use `logRevenueV2` and `AMPRevenue` - - Tracks revenue. - - To track revenue from a user, call [[Amplitude instance] logRevenue:[NSNumber numberWithDouble:3.99]] each time the user generates revenue. logRevenue: takes in an NSNumber with the dollar amount of the sale as the only argument. This allows us to automatically display data relevant to revenue on the Amplitude website, including average revenue per daily active user (ARPDAU), 7, 30, and 90 day revenue, lifetime value (LTV) estimates, and revenue by advertising campaign cohort and daily/weekly/monthly cohorts. - - @param amount The amount of revenue to track, e.g. "3.99". - - @see [LogRevenue Backwards Compatability](https://github.com/amplitude/Amplitude-iOS#backwards-compatibility) - */ -- (void)logRevenue:(NSNumber*) amount; - -/** - **Note: this is deprecated** - please use `logRevenueV2` and `AMPRevenue` - - Tracks revenue. This allows us to automatically display data relevant to revenue on the Amplitude website, including average revenue per daily active user (ARPDAU), 7, 30, and 90 day revenue, lifetime value (LTV) estimates, and revenue by advertising campaign cohort and daily/weekly/monthly cohorts. - - @param productIdentifier The identifier for the product in the transaction, e.g. "com.amplitude.productId" - @param quantity The number of products in the transaction. Revenue amount is calculated as quantity * price - @param price The price of the products in the transaction. Revenue amount is calculated as quantity * price - - @see [LogRevenueV2](https://github.com/amplitude/Amplitude-iOS#tracking-revenue) - @see [LogRevenue Backwards Compatability](https://github.com/amplitude/Amplitude-iOS#backwards-compatibility) - */ -- (void)logRevenue:(NSString*) productIdentifier quantity:(NSInteger) quantity price:(NSNumber*) price; - -/** - **Note: this is deprecated** - please use `logRevenueV2` and `AMPRevenue` - - Tracks revenue. This allows us to automatically display data relevant to revenue on the Amplitude website, including average revenue per daily active user (ARPDAU), 7, 30, and 90 day revenue, lifetime value (LTV) estimates, and revenue by advertising campaign cohort and daily/weekly/monthly cohorts. - - For validating revenue, use [[Amplitude instance] logRevenue:@"com.company.app.productId" quantity:1 price:[NSNumber numberWithDouble:3.99] receipt:transactionReceipt] - - @param productIdentifier The identifier for the product in the transaction, e.g. "com.amplitude.productId" - @param quantity The number of products in the transaction. Revenue amount is calculated as quantity * price - @param price The price of the products in the transaction. Revenue amount is calculated as quantity * price - @param receipt The receipt data from the App Store. Required if you want to verify this revenue event. - - @see [LogRevenueV2](https://github.com/amplitude/Amplitude-iOS#tracking-revenue) - @see [LogRevenue Backwards Compatability](https://github.com/amplitude/Amplitude-iOS#backwards-compatibility) - @see [Revenue Verification](https://github.com/amplitude/Amplitude-iOS#revenue-verification) - */ -- (void)logRevenue:(NSString*) productIdentifier quantity:(NSInteger) quantity price:(NSNumber*) price receipt:(NSData*) receipt; - -/** - Tracks revenue - API v2. This uses the `AMPRevenue` object to store transaction properties such as quantity, price, and revenue type. This is the recommended method for tracking revenue in Amplitude. - - For validating revenue, make sure the receipt data is set on the AMPRevenue object. - - To track revenue from a user, create an AMPRevenue object each time the user generates revenue, and set the revenue properties (productIdentifier, price, quantity). logRevenuev2: takes in an AMPRevenue object. This allows us to automatically display data relevant to revenue on the Amplitude website, including average revenue per daily active user (ARPDAU), 7, 30, and 90 day revenue, lifetime value (LTV) estimates, and revenue by advertising campaign cohort and daily/weekly/monthly cohorts. - - @param revenue AMPRevenue object revenue object contains all revenue information - - @see [Tracking Revenue](https://github.com/amplitude/Amplitude-iOS#tracking-revenue) - */ -- (void)logRevenueV2:(AMPRevenue*) revenue; - -/**----------------------------------------------------------------------------- - * @name User Properties and User Property Operations - * ----------------------------------------------------------------------------- - */ - -/** - Update user properties using operations provided via Identify API. - - To update user properties, first create an AMPIdentify object. For example if you wanted to set a user's gender, and then increment their karma count by 1, you would do: - - AMPIdentify *identify = [[[AMPIdentify identify] set:@"gender" value:@"male"] add:@"karma" value:[NSNumber numberWithInt:1]]; - - Then you would pass this AMPIdentify object to the identify function to send to the server: - - [[Amplitude instance] identify:identify]; - - @param identify An AMPIdentify object with the intended user property operations - - @see [User Properties and User Property Operations](https://github.com/amplitude/Amplitude-iOS#user-properties-and-user-property-operations) - - */ - -- (void)identify:(AMPIdentify *)identify; - -/** - Update user properties using operations provided via Identify API. If outOfSession is `YES` then the identify event is logged with a session id of -1 and does not trigger any session-handling logic. - - To update user properties, first create an AMPIdentify object. For example if you wanted to set a user's gender, and then increment their karma count by 1, you would do: - - AMPIdentify *identify = [[[AMPIdentify identify] set:@"gender" value:@"male"] add:@"karma" value:[NSNumber numberWithInt:1]]; - - Then you would pass this AMPIdentify object to the identify function to send to the server: - - [[Amplitude instance] identify:identify outOfSession:YES]; - - @param identify An AMPIdentify object with the intended user property operations - @param outOfSession Whether to log identify event out of session - - @see [User Properties and User Property Operations](https://github.com/amplitude/Amplitude-iOS#user-properties-and-user-property-operations) - - */ - -- (void)identify:(AMPIdentify *)identify outOfSession:(BOOL) outOfSession; - -/** - - Adds properties that are tracked on the user level. - - **Note:** Property keys must be NSString objects and values must be serializable. - - @param userProperties An NSDictionary containing any additional data to be tracked. - - @see [Setting Multiple Properties with setUserProperties](https://github.com/amplitude/Amplitude-iOS#setting-multiple-properties-with-setuserproperties) - */ -- (void)setUserProperties:(NSDictionary*) userProperties; - -/** - - **NOTE: this method is deprecated** - use `setUserProperties` instead. In earlier versions of the SDK, replace = YES replaced the in-memory userProperties dictionary with the input; however, now userProperties are no longer stored in memory, so the flag does nothing. - - Adds properties that are tracked on the user level. - - **Note:** Property keys must be NSString objects and values must be serializable. - - @param userProperties An NSDictionary containing any additional data to be tracked. - @param replace This is deprecated. In earlier versions of this SDK, this replaced the in-memory userProperties dictionary with the input, but now userProperties are no longer stored in memory. - - @see [Setting Multiple Properties with setUserProperties](https://github.com/amplitude/Amplitude-iOS#setting-multiple-properties-with-setuserproperties) - */ -- (void)setUserProperties:(NSDictionary*) userProperties replace:(BOOL) replace; - -/** - Clears all properties that are tracked on the user level. - - **Note: the result is irreversible!** - - @see [Clearing user properties](https://github.com/amplitude/Amplitude-iOS#clearing-user-properties-with-clearuserproperties) - */ - -- (void)clearUserProperties; - -/** - Adds a user to a group or groups. You need to specify a groupType and groupName(s). - - For example you can group people by their organization. In that case groupType is "orgId", and groupName would be the actual ID(s). groupName can be a string or an array of strings to indicate a user in multiple groups. - - You can also call setGroup multiple times with different groupTypes to track multiple types of groups (up to 5 per app). - - **Note:** this will also set groupType: groupName as a user property. - - @param groupType You need to specify a group type (for example "orgId"). - - @param groupName The value for the group name, can be a string or an array of strings, (for example for groupType orgId, the groupName would be the actual id number, like 15). - - @see [Setting Groups](https://github.com/amplitude/Amplitude-iOS#setting-groups) - */ - -- (void)setGroup:(NSString*) groupType groupName:(NSObject*) groupName; - -/**----------------------------------------------------------------------------- - * @name Setting User and Device Identifiers - * ----------------------------------------------------------------------------- - */ - -/** - Sets the userId. - - @param userId If your app has its own login system that you want to track users with, you can set the userId. - - @see [Setting Custom UserIds](https://github.com/amplitude/Amplitude-iOS#setting-custom-user-ids) - */ -- (void)setUserId:(NSString*) userId; - -/** - Sets the userId and starts a new session. The previous session for the previous user will be terminated and a new session will begin for the new user id. - - @param userId If your app has its own login system that you want to track users with, you can set the userId. - - @see [Setting Custom UserIds](https://github.com/amplitude/Amplitude-iOS#setting-custom-user-ids) - */ -- (void)setUserId:(NSString*) userId startNewSession:(BOOL) startNewSession; - -/** - Sets the deviceId. - - **NOTE: not recommended unless you know what you are doing** - - @param deviceId If your app has its own system for tracking devices, you can set the deviceId. - - @see [Setting Custom Device Ids](https://github.com/amplitude/Amplitude-iOS#custom-device-ids) - */ -- (void)setDeviceId:(NSString*) deviceId; - -/**----------------------------------------------------------------------------- - * @name Configuring the SDK instance - * ----------------------------------------------------------------------------- - */ - -/** - Enables tracking opt out. - - If the user wants to opt out of all tracking, use this method to enable opt out for them. Once opt out is enabled, no events will be saved locally or sent to the server. Calling this method again with enabled set to NO will turn tracking back on for the user. - - @param enabled Whether tracking opt out should be enabled or disabled. - */ -- (void)setOptOut:(BOOL)enabled; - -/** - Disables sending logged events to Amplitude servers. - - If you want to stop logged events from being sent to Amplitude severs, use this method to set the client to offline. Once offline is enabled, logged events will not be sent to the server until offline is disabled. Calling this method again with offline set to NO will allow events to be sent to server and the client will attempt to send events that have been queued while offline. - - @param offline Whether logged events should be sent to Amplitude servers. - */ -- (void)setOffline:(BOOL)offline; - -/** - Enables location tracking. - - If the user has granted your app location permissions, the SDK will also grab the location of the user. Amplitude will never prompt the user for location permissions itself, this must be done by your app. - - **Note:** the user's location is only fetched once per session. Use `updateLocation` to force the SDK to fetch the user's latest location. - */ -- (void)enableLocationListening; - -/** - Disables location tracking. If you want location tracking disabled on startup of the app, call disableLocationListening before you call initializeApiKey. - */ -- (void)disableLocationListening; - -/** - Forces the SDK to update with the user's last known location if possible. - - If you want to manually force the SDK to update with the user's last known location, call updateLocation. - */ -- (void)updateLocation; - -/** - Uses advertisingIdentifier instead of identifierForVendor as the device ID - - Apple prohibits the use of advertisingIdentifier if your app does not have advertising. Useful for tying together data from advertising campaigns to anlaytics data. - - **NOTE:** Must be called before initializeApiKey: is called to function. - */ -- (void)useAdvertisingIdForDeviceId; - -/** - Disables tracking of advertisingIdentifier by the SDK - - **NOTE:** Must be called before initializeApiKey: is called to function. - */ -- (void)disableIdfaTracking; - -/**----------------------------------------------------------------------------- - * @name Other Methods - * ----------------------------------------------------------------------------- - */ - -/** - Prints the number of events in the queue. - - Debugging method to find out how many events are being stored locally on the device. - */ -- (void)printEventsCount; - -/** - Fetches the deviceId, a unique identifier shared between multiple users using the same app on the same device. - - @returns the deviceId. - */ -- (NSString*)getDeviceId; - -/** - Regenerates a new random deviceId for current user. Note: this is not recommended unless you know what you are doing. This can be used in conjunction with setUserId:nil to anonymize users after they log out. With a nil userId and a completely new deviceId, the current user would appear as a brand new user in dashboard. - - @see [Logging Out Users](https://github.com/amplitude/Amplitude-iOS#logging-out-and-anonymous-users) - */ -- (void)regenerateDeviceId; - -/** - Fetches the current sessionId, an identifier used by Amplitude to group together events tracked during the same session. - - @returns the current session id - - @see [Tracking Sessions](https://github.com/amplitude/Amplitude-iOS#tracking-sessions) - */ -- (long long)getSessionId; - -/** - Manually forces the instance to immediately upload all unsent events. - - Events are saved locally. Uploads are batched to occur every 30 events and every 30 seconds, as well as on app close. Use this method to force the class to immediately upload all queued events. - */ -- (void)uploadEvents; - - -#pragma mark - Deprecated methods - -- (void)initializeApiKey:(NSString*) apiKey userId:(NSString*) userId startSession:(BOOL)startSession __attribute((deprecated())); - -- (void)startSession __attribute((deprecated())); - -+ (void)initializeApiKey:(NSString*) apiKey __attribute((deprecated())); - -+ (void)initializeApiKey:(NSString*) apiKey userId:(NSString*) userId __attribute((deprecated())); - -+ (void)logEvent:(NSString*) eventType __attribute((deprecated())); - -+ (void)logEvent:(NSString*) eventType withEventProperties:(NSDictionary*) eventProperties __attribute((deprecated())); - -+ (void)logRevenue:(NSNumber*) amount __attribute((deprecated())); - -+ (void)logRevenue:(NSString*) productIdentifier quantity:(NSInteger) quantity price:(NSNumber*) price __attribute((deprecated())) __attribute((deprecated())); - -+ (void)logRevenue:(NSString*) productIdentifier quantity:(NSInteger) quantity price:(NSNumber*) price receipt:(NSData*) receipt __attribute((deprecated())); - -+ (void)uploadEvents __attribute((deprecated())); - -+ (void)setUserProperties:(NSDictionary*) userProperties __attribute((deprecated())); - -+ (void)setUserId:(NSString*) userId __attribute((deprecated())); - -+ (void)enableLocationListening __attribute((deprecated())); - -+ (void)disableLocationListening __attribute((deprecated())); - -+ (void)useAdvertisingIdForDeviceId __attribute((deprecated())); - -+ (void)printEventsCount __attribute((deprecated())); - -+ (NSString*)getDeviceId __attribute((deprecated())); -@end - -#pragma mark - constants - -extern NSString *const kAMPSessionStartEvent; -extern NSString *const kAMPSessionEndEvent; -extern NSString *const kAMPRevenueEvent; diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h b/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h deleted file mode 100644 index 196fa3f2d5..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/AmplitudeFramework.h +++ /dev/null @@ -1,24 +0,0 @@ -#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/Amplitude.framework/Headers/ISPCertificatePinning.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h deleted file mode 100644 index 71fa184fb7..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h +++ /dev/null @@ -1,66 +0,0 @@ -#if AMPLITUDE_SSL_PINNING -// -// ISPCertificatePinning.h -// SSLCertificatePinning v3 -// -// Created by Alban Diquet on 1/14/14. -// Copyright (c) 2014 iSEC Partners. All rights reserved. -// - -#import - -/** This class implements certificate pinning utility functions. - - First, the certificates and domains to pin should be loaded using - setupSSLPinsUsingDictionnary:. This method will store them in - "~/Library/SSLPins.plist". - - Then, the verifyPinnedCertificateForTrust:andDomain: method can be - used to validate that at least one the certificates pinned to a - specific domain is in the server's certificate chain when connecting to - it. This method should be used for example in the - connection:willSendRequestForAuthenticationChallenge: method of the - NSURLConnectionDelegate object that is used to perform the connection. - - Alternatively, the ISPPinnedNSURLSessionDelegate or - ISPPinnedNSURLConnectionDelegate classes can be directly used - to create a delegate class performing certificate pinning. - - */ - -@interface ISPCertificatePinning : NSObject - - -/** - Certificate pinning loading method - - This method takes a dictionary with domain names as keys and arrays of DER- - encoded certificates as values, and stores them in a pre-defined location on - the filesystem. The ability to specify multiple certificates for a single - domain is useful when transitioning from an expiring certificate to a new one. - - @param certificates a dictionnary with domain names as keys and arrays of DER-encoded certificates as values - @return BOOL successfully loaded the public keys and domains - - */ -+ (BOOL)setupSSLPinsUsingDictionnary:(NSDictionary*)domainsAndCertificates; - - -/** - Certificate pinning validation method - - This method accesses the certificates previously loaded using the - setupSSLPinsUsingDictionnary: method and inspects the trust object's - certificate chain in order to find at least one certificate pinned to the - given domain. SecTrustEvaluate() should always be called before this method to - ensure that the certificate chain is valid. - - @param trust the trust object whose certificate chain must contain the certificate previously pinned to the given domain - @param domain the domain we're trying to connect to - @return BOOL found the domain's pinned certificate in the trust object's certificate chain - - */ -+ (BOOL)verifyPinnedCertificateForTrust:(SecTrustRef)trust andDomain:(NSString*)domain; - -@end -#endif diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h deleted file mode 100644 index 34cae2108c..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h +++ /dev/null @@ -1,26 +0,0 @@ -#if AMPLITUDE_SSL_PINNING -// -// ISPPinnedNSURLConnectionDelegate.h -// SSLCertificatePinning -// -// Created by Alban Diquet on 1/14/14. -// Copyright (c) 2014 iSEC Partners. All rights reserved. -// - -#import - -/** Convenience class to automatically perform certificate pinning for NSURLConnection. - - ISPPinnedNSURLConnectionDelegate is designed to be subclassed in order to - implement an NSURLConnectionDelegate class. The - connection:willSendRequestForAuthenticationChallenge: method it implements - will automatically validate that at least one the certificates pinned to the domain the - connection is accessing is part of the server's certificate chain. - - */ -@interface ISPPinnedNSURLConnectionDelegate : NSObject - -- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge; - -@end -#endif diff --git a/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h b/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h deleted file mode 100644 index 6072644799..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.h +++ /dev/null @@ -1,26 +0,0 @@ -#if AMPLITUDE_SSL_PINNING -// -// ISPPinnedNSURLSessionDelegate.h -// SSLCertificatePinning -// -// Created by Alban Diquet on 1/14/14. -// Copyright (c) 2014 iSEC Partners. All rights reserved. -// - -#import - -/** Convenience class to automatically perform certificate pinning for NSURLSession. - - ISPPinnedNSURLSessionDelegate is designed to be subclassed in order to - implement an NSURLSession class. The - URLSession:didReceiveChallenge:completionHandler: method it implements - will automatically validate that at least one the certificates pinned to the domain the - connection is accessing is part of the server's certificate chain. - - */ -@interface ISPPinnedNSURLSessionDelegate : NSObject - -- (void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler; - -@end -#endif diff --git a/Carthage/Build/iOS/Amplitude.framework/Info.plist b/Carthage/Build/iOS/Amplitude.framework/Info.plist deleted file mode 100644 index a963fa3eb3..0000000000 Binary files a/Carthage/Build/iOS/Amplitude.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap b/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap deleted file mode 100644 index 3a871d1523..0000000000 --- a/Carthage/Build/iOS/Amplitude.framework/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Amplitude { - umbrella header "AmplitudeFramework.h" - - export * - module * { export * } -} \ No newline at end of file diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/CGMBLEKit b/Carthage/Build/iOS/CGMBLEKit.framework/CGMBLEKit deleted file mode 100755 index a158773f4f..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/CGMBLEKit and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Headers/AESCrypt.h b/Carthage/Build/iOS/CGMBLEKit.framework/Headers/AESCrypt.h deleted file mode 100644 index 357420d607..0000000000 --- a/Carthage/Build/iOS/CGMBLEKit.framework/Headers/AESCrypt.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// AESCrypt.h -// xDripG5 -// -// Created by Nate Racklyeft on 6/17/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -#import - -@interface AESCrypt : NSObject - -NS_ASSUME_NONNULL_BEGIN - -+ (nullable NSData *)encryptData:(NSData *)data usingKey:(NSData *)key error:(NSError **)error; - -NS_ASSUME_NONNULL_END - -@end diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit-Swift.h b/Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit-Swift.h deleted file mode 100644 index 7c90b3f2f3..0000000000 --- a/Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit-Swift.h +++ /dev/null @@ -1,252 +0,0 @@ -// Generated by Apple Swift version 4.1.2 (swiftlang-902.0.54 clang-902.0.39.2) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import ObjectiveC; -@import CoreBluetooth; -@import HealthKit; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="CGMBLEKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - -SWIFT_CLASS("_TtC9CGMBLEKit16BluetoothManager") -@interface BluetoothManager : NSObject -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - - -@class CBCentralManager; -@class CBPeripheral; -@class NSNumber; - -@interface BluetoothManager (SWIFT_EXTENSION(CGMBLEKit)) -- (void)centralManagerDidUpdateState:(CBCentralManager * _Nonnull)central; -- (void)centralManager:(CBCentralManager * _Nonnull)central willRestoreState:(NSDictionary * _Nonnull)dict; -- (void)centralManager:(CBCentralManager * _Nonnull)central didDiscoverPeripheral:(CBPeripheral * _Nonnull)peripheral advertisementData:(NSDictionary * _Nonnull)advertisementData RSSI:(NSNumber * _Nonnull)RSSI; -- (void)centralManager:(CBCentralManager * _Nonnull)central didConnectPeripheral:(CBPeripheral * _Nonnull)peripheral; -- (void)centralManager:(CBCentralManager * _Nonnull)central didDisconnectPeripheral:(CBPeripheral * _Nonnull)peripheral error:(NSError * _Nullable)error; -- (void)centralManager:(CBCentralManager * _Nonnull)central didFailToConnectPeripheral:(CBPeripheral * _Nonnull)peripheral error:(NSError * _Nullable)error; -@end - - - - - - - - -SWIFT_CLASS("_TtC9CGMBLEKit17PeripheralManager") -@interface PeripheralManager : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable"); -@end - - - - -@interface PeripheralManager (SWIFT_EXTENSION(CGMBLEKit)) -- (void)centralManagerDidUpdateState:(CBCentralManager * _Nonnull)central; -- (void)centralManager:(CBCentralManager * _Nonnull)central didConnectPeripheral:(CBPeripheral * _Nonnull)peripheral; -@end - - - - - -@class CBService; -@class CBCharacteristic; - -@interface PeripheralManager (SWIFT_EXTENSION(CGMBLEKit)) -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didDiscoverServices:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didDiscoverCharacteristicsForService:(CBService * _Nonnull)service error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didUpdateNotificationStateForCharacteristic:(CBCharacteristic * _Nonnull)characteristic error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didWriteValueForCharacteristic:(CBCharacteristic * _Nonnull)characteristic error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didUpdateValueForCharacteristic:(CBCharacteristic * _Nonnull)characteristic error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didReadRSSI:(NSNumber * _Nonnull)RSSI error:(NSError * _Nullable)error; -- (void)peripheralDidUpdateName:(CBPeripheral * _Nonnull)peripheral; -@end - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit.h b/Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit.h deleted file mode 100644 index 49882cc8ea..0000000000 --- a/Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// CGMBLEKit.h -// xDripG5 -// -// Created by Nathan Racklyeft on 12/30/15. -// Copyright © 2015 Nathan Racklyeft. All rights reserved. -// - -#import -#import - -//! Project version number for CGMBLEKIt. -FOUNDATION_EXPORT double CGMBLEKitVersionNumber; - -//! Project version string for CGMBLEKit. -FOUNDATION_EXPORT const unsigned char CGMBLEKitVersionString[]; - diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Info.plist b/Carthage/Build/iOS/CGMBLEKit.framework/Info.plist deleted file mode 100644 index 4b5b588798..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftdoc deleted file mode 100644 index fc491aea5b..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftmodule deleted file mode 100644 index d3a314d97a..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftdoc deleted file mode 100644 index 51a1f8d3cc..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftmodule deleted file mode 100644 index 458a8c6327..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftdoc deleted file mode 100644 index 4c5006c673..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftmodule deleted file mode 100644 index f77faf3bac..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 06262088bb..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 8da9a201f2..0000000000 Binary files a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/CGMBLEKit.framework/Modules/module.modulemap deleted file mode 100644 index 64bb2572ba..0000000000 --- a/Carthage/Build/iOS/CGMBLEKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module CGMBLEKit { - umbrella header "CGMBLEKit.h" - - export * - module * { export * } -} - -module CGMBLEKit.Swift { - header "CGMBLEKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/CarbKit.framework/Assets.car b/Carthage/Build/iOS/CarbKit.framework/Assets.car deleted file mode 100644 index 9a30a8fa07..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Assets.car and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit b/Carthage/Build/iOS/CarbKit.framework/CarbKit deleted file mode 100755 index fec280e936..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/objects-11.0+.nib deleted file mode 100644 index 0486bfe4ee..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/runtime.nib deleted file mode 100644 index cfa3f7f0e0..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/objects-11.0+.nib deleted file mode 100644 index 377d06b04d..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/runtime.nib deleted file mode 100644 index fa4f7c7d8e..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/objects-11.0+.nib deleted file mode 100644 index c5732723bd..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/runtime.nib deleted file mode 100644 index 2fa8dbae67..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist deleted file mode 100644 index a6103f40b1..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/objects-11.0+.nib deleted file mode 100644 index 1ca760e93e..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/runtime.nib deleted file mode 100644 index e45e7b27f3..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/objects-11.0+.nib deleted file mode 100644 index c3f36895b5..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/runtime.nib deleted file mode 100644 index 8611f33726..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/objects-11.0+.nib deleted file mode 100644 index bb0d54205d..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/runtime.nib deleted file mode 100644 index 4e6d64c350..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/objects-11.0+.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/objects-11.0+.nib deleted file mode 100644 index c43b9bdc4f..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/objects-11.0+.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/runtime.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/runtime.nib deleted file mode 100644 index 9952806b2b..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/runtime.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/DatePickerTableViewCell.nib b/Carthage/Build/iOS/CarbKit.framework/DatePickerTableViewCell.nib deleted file mode 100644 index 02002de103..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/DatePickerTableViewCell.nib and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h deleted file mode 100644 index f64955a0e9..0000000000 --- a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h +++ /dev/null @@ -1,250 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import UIKit; -@import Foundation; -@import HealthKit; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="CarbKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - -@class UITableView; -@class UITableViewCell; -@class NSBundle; -@class NSCoder; - -SWIFT_CLASS("_TtC7CarbKit27CarbEntryEditViewController") -@interface CarbEntryEditViewController : UITableViewController -- (void)viewDidLoad; -- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView SWIFT_WARN_UNUSED_RESULT; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForFooterInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (NSIndexPath * _Nullable)tableView:(UITableView * _Nonnull)tableView willSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; -- (BOOL)shouldPerformSegueWithIdentifier:(NSString * _Nonnull)identifier sender:(id _Nullable)sender SWIFT_WARN_UNUSED_RESULT; -- (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; -@end - - - - - - - - - -@class UIStoryboardSegue; - -SWIFT_CLASS("_TtC7CarbKit28CarbEntryTableViewController") -@interface CarbEntryTableViewController : UITableViewController -- (void)viewDidLoad; -- (void)viewWillAppear:(BOOL)animated; -- (void)viewDidAppear:(BOOL)animated; -- (void)viewWillDisappear:(BOOL)animated; -- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView SWIFT_WARN_UNUSED_RESULT; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView canEditRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (void)tableView:(UITableView * _Nonnull)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; -- (NSIndexPath * _Nullable)tableView:(UITableView * _Nonnull)tableView willSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (void)prepareForSegue:(UIStoryboardSegue * _Nonnull)segue sender:(id _Nullable)sender; -- (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; -@end - - - - - - -@interface UIInputView (SWIFT_EXTENSION(CarbKit)) -@property (nonatomic, readonly) BOOL enableInputClicksWhenVisible; -@end - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit.h b/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit.h deleted file mode 100644 index 912c55ffc2..0000000000 --- a/Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// CarbKit.h -// CarbKit -// -// Created by Nathan Racklyeft on 2/15/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -#import - -//! Project version number for CarbKit. -FOUNDATION_EXPORT double CarbKitVersionNumber; - -//! Project version string for CarbKit. -FOUNDATION_EXPORT const unsigned char CarbKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/CarbKit.framework/Info.plist b/Carthage/Build/iOS/CarbKit.framework/Info.plist deleted file mode 100644 index 081e65c882..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Info.plist and /dev/null 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 deleted file mode 100644 index f280575a1e..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index cb9e02b1b2..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index 0afc32a22d..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 3bae421e9a..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 2625653fae..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 3bb540a1c9..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index 21a4c45026..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 5460cbc3e1..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/CarbKit.framework/Modules/module.modulemap deleted file mode 100644 index c090a6f14f..0000000000 --- a/Carthage/Build/iOS/CarbKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module CarbKit { - umbrella header "CarbKit.h" - - export * - module * { export * } -} - -module CarbKit.Swift { - header "CarbKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/CarbKit.framework/es.lproj/CarbKit.strings b/Carthage/Build/iOS/CarbKit.framework/es.lproj/CarbKit.strings deleted file mode 100644 index 416c782565..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/es.lproj/CarbKit.strings and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/CarbKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index d2dea409a2..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/es.lproj/Localizable.strings b/Carthage/Build/iOS/CarbKit.framework/es.lproj/Localizable.strings deleted file mode 100644 index cbbb4a4c85..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/es.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/ru.lproj/CarbKit.strings b/Carthage/Build/iOS/CarbKit.framework/ru.lproj/CarbKit.strings deleted file mode 100644 index 953c993704..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/ru.lproj/CarbKit.strings and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/CarbKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index d3426a0c14..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/CarbKit.framework/ru.lproj/Localizable.strings b/Carthage/Build/iOS/CarbKit.framework/ru.lproj/Localizable.strings deleted file mode 100644 index 5b642c8d9c..0000000000 Binary files a/Carthage/Build/iOS/CarbKit.framework/ru.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Crypto b/Carthage/Build/iOS/Crypto.framework/Crypto deleted file mode 100755 index 3e1d7d6d30..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Crypto and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h b/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h deleted file mode 100644 index abf4334f5d..0000000000 --- a/Carthage/Build/iOS/Crypto.framework/Headers/Crypto.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// Crypto.h -// Crypto -// -// Created by Nate Racklyeft on 9/13/16. -// Copyright © 2016 Pete Schwamb. All rights reserved. -// - -#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 deleted file mode 100644 index 966cd811ab..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap b/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap deleted file mode 100644 index 9d53a1b38e..0000000000 --- a/Carthage/Build/iOS/Crypto.framework/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Crypto { - umbrella header "Crypto.h" - - export * - module * { export * } -} diff --git a/Carthage/Build/iOS/Crypto.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/Crypto.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/Crypto.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/Crypto.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index 3967e063f9..0000000000 Binary files a/Carthage/Build/iOS/Crypto.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy b/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy deleted file mode 100755 index 5b142ba3ce..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy and /dev/null differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h deleted file mode 100644 index 644391d358..0000000000 --- a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-Swift.h +++ /dev/null @@ -1,186 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="G4ShareSpy",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy.h b/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy.h deleted file mode 100644 index 3ef4c98e96..0000000000 --- a/Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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/G4ShareSpy.framework/Info.plist b/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist deleted file mode 100644 index e8865484d7..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Info.plist and /dev/null 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 deleted file mode 100644 index 9de305ac1e..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index d532a307ad..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index e01f4aa77a..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 8926c63cd6..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 3e96c1ea3d..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 450b90ff49..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index 6c19f2d975..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 67c4ce02f8..0000000000 Binary files a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/module.modulemap b/Carthage/Build/iOS/G4ShareSpy.framework/Modules/module.modulemap deleted file mode 100644 index df78dc9bcc..0000000000 --- a/Carthage/Build/iOS/G4ShareSpy.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module G4ShareSpy { - umbrella header "G4ShareSpy.h" - - export * - module * { export * } -} - -module G4ShareSpy.Swift { - header "G4ShareSpy-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit deleted file mode 100755 index 89ee4e02d4..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit and /dev/null differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h deleted file mode 100644 index 29e2d646ee..0000000000 --- a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-Swift.h +++ /dev/null @@ -1,191 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import HealthKit; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="GlucoseKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit.h b/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit.h deleted file mode 100644 index 78da548953..0000000000 --- a/Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// GlucoseKit.h -// GlucoseKit -// -// Created by Nathan Racklyeft on 2/15/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -#import - -//! Project version number for GlucoseKit. -FOUNDATION_EXPORT double GlucoseKitVersionNumber; - -//! Project version string for GlucoseKit. -FOUNDATION_EXPORT const unsigned char GlucoseKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist deleted file mode 100644 index 816d699ec2..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist and /dev/null 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 deleted file mode 100644 index 912099f682..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index d45c871351..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index 3fa79dd5bc..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 5bfc73a677..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 0d21ad5e50..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 67356f2a5c..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index aa1836f17c..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index fd10dc28a6..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/GlucoseKit.framework/Modules/module.modulemap deleted file mode 100644 index 200d18fa50..0000000000 --- a/Carthage/Build/iOS/GlucoseKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module GlucoseKit { - umbrella header "GlucoseKit.h" - - export * - module * { export * } -} - -module GlucoseKit.Swift { - header "GlucoseKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/GlucoseKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/GlucoseKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 2ffe97f57b..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/es.lproj/Localizable.strings b/Carthage/Build/iOS/GlucoseKit.framework/es.lproj/Localizable.strings deleted file mode 100644 index 9391e38612..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/es.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/GlucoseKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index f78572ada5..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/ru.lproj/Localizable.strings b/Carthage/Build/iOS/GlucoseKit.framework/ru.lproj/Localizable.strings deleted file mode 100644 index 3cd59451fd..0000000000 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/ru.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/Info.plist b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/Info.plist deleted file mode 100644 index 67202dc4c9..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/Info.plist and /dev/null 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 deleted file mode 100644 index f5ac10e31e..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib and /dev/null 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 deleted file mode 100644 index 73ab9d38c7..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h deleted file mode 100644 index cd3119532f..0000000000 --- a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h +++ /dev/null @@ -1,216 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import HealthKit; -@import UIKit; -@import Foundation; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="InsulinKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - - - -@class UITableView; -@class UITableViewCell; -@class NSBundle; -@class NSCoder; - -SWIFT_CLASS("_TtC10InsulinKit34InsulinDeliveryTableViewController") -@interface InsulinDeliveryTableViewController : UITableViewController -- (void)viewDidLoad; -- (void)viewWillAppear:(BOOL)animated; -- (void)viewDidAppear:(BOOL)animated; -- (void)viewWillDisappear:(BOOL)animated; -- (void)viewDidDisappear:(BOOL)animated; -- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView SWIFT_WARN_UNUSED_RESULT; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView canEditRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (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; -@end - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit.h b/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit.h deleted file mode 100644 index 6ed55d515b..0000000000 --- a/Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// InsulinKit.h -// InsulinKit -// -// Created by Nathan Racklyeft on 2/15/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -#import - -//! Project version number for InsulinKit. -FOUNDATION_EXPORT double InsulinKitVersionNumber; - -//! Project version string for InsulinKit. -FOUNDATION_EXPORT const unsigned char InsulinKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/InsulinKit.framework/Info.plist b/Carthage/Build/iOS/InsulinKit.framework/Info.plist deleted file mode 100644 index 8994736d76..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit deleted file mode 100755 index 50b0bc1304..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom deleted file mode 100644 index eac43a82a8..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist b/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist deleted file mode 100644 index f9d9b55c25..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist and /dev/null 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 deleted file mode 100644 index e861493884..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index 8c5f8d49d6..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index 09332307f6..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 9d01099fe5..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 6e5f5ee129..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index eaafed5888..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index d5c39cd5a9..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 7de63982a3..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/InsulinKit.framework/Modules/module.modulemap deleted file mode 100644 index 8817472965..0000000000 --- a/Carthage/Build/iOS/InsulinKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module InsulinKit { - umbrella header "InsulinKit.h" - - export * - module * { export * } -} - -module InsulinKit.Swift { - header "InsulinKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/InsulinKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/InsulinKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/es.lproj/InsulinKit.strings b/Carthage/Build/iOS/InsulinKit.framework/es.lproj/InsulinKit.strings deleted file mode 100644 index 95b5d697c7..0000000000 --- a/Carthage/Build/iOS/InsulinKit.framework/es.lproj/InsulinKit.strings +++ /dev/null @@ -1,30 +0,0 @@ -/* Class = "UILabel"; text = "Title"; ObjectID = "7Fi-wD-gf2"; */ -"7Fi-wD-gf2.text" = "Título"; - -/* Class = "UILabel"; text = "..."; ObjectID = "7Fy-gG-Zof"; */ -"7Fy-gG-Zof.text" = "..."; - -/* Class = "UILabel"; text = "Detail"; ObjectID = "9jm-X6-3QA"; */ -"9jm-X6-3QA.text" = "Detalle"; - -/* Class = "UILabel"; text = "..."; ObjectID = "PZQ-gO-084"; */ -"PZQ-gO-084.text" = "..."; - -/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[0] = "Reservoir"; ObjectID = "TyZ-xm-mVN"; */ -"TyZ-xm-mVN.segmentTitles[0]" = "Reservorio"; - -/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[1] = "Event History"; ObjectID = "TyZ-xm-mVN"; */ -"TyZ-xm-mVN.segmentTitles[1]" = "Historia de eventos"; - -/* Class = "UILabel"; text = "U IOB"; ObjectID = "dZi-Ta-IHm"; */ -"dZi-Ta-IHm.text" = "U IOB"; - -/* Class = "UILabel"; text = "No pump configured"; ObjectID = "jSc-64-2tZ"; */ -"jSc-64-2tZ.text" = "No hay microinfusadora configurada"; - -/* Class = "UILabel"; text = "U Total"; ObjectID = "kys-by-14s"; */ -"kys-by-14s.text" = "U Total"; - -/* Class = "UINavigationItem"; title = "Insulin Delivery"; ObjectID = "vls-EW-uwI"; */ -"vls-EW-uwI.title" = "Administración de insulina"; - diff --git a/Carthage/Build/iOS/InsulinKit.framework/es.lproj/Localizable.strings b/Carthage/Build/iOS/InsulinKit.framework/es.lproj/Localizable.strings deleted file mode 100644 index 48d76fe554..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/es.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index 3967e063f9..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/InsulinKit.strings b/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/InsulinKit.strings deleted file mode 100644 index 98b4eadf6a..0000000000 --- a/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/InsulinKit.strings +++ /dev/null @@ -1,30 +0,0 @@ -/* Class = "UILabel"; text = "Title"; ObjectID = "7Fi-wD-gf2"; */ -"7Fi-wD-gf2.text" = "Название"; - -/* Class = "UILabel"; text = "..."; ObjectID = "7Fy-gG-Zof"; */ -"7Fy-gG-Zof.text" = "..."; - -/* Class = "UILabel"; text = "Detail"; ObjectID = "9jm-X6-3QA"; */ -"9jm-X6-3QA.text" = "Детали"; - -/* Class = "UILabel"; text = "..."; ObjectID = "PZQ-gO-084"; */ -"PZQ-gO-084.text" = "..."; - -/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[0] = "Reservoir"; ObjectID = "TyZ-xm-mVN"; */ -"TyZ-xm-mVN.segmentTitles[0]" = "Резервуар"; - -/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[1] = "Event History"; ObjectID = "TyZ-xm-mVN"; */ -"TyZ-xm-mVN.segmentTitles[1]" = "История событий"; - -/* Class = "UILabel"; text = "U IOB"; ObjectID = "dZi-Ta-IHm"; */ -"dZi-Ta-IHm.text" = "ед IOB"; - -/* Class = "UILabel"; text = "No pump configured"; ObjectID = "jSc-64-2tZ"; */ -"jSc-64-2tZ.text" = "Нет сконфигурированной помпы"; - -/* Class = "UILabel"; text = "U Total"; ObjectID = "kys-by-14s"; */ -"kys-by-14s.text" = "ед Всего"; - -/* Class = "UINavigationItem"; title = "Insulin Delivery"; ObjectID = "vls-EW-uwI"; */ -"vls-EW-uwI.title" = "Подача инсулина"; - diff --git a/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/Localizable.strings b/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/Localizable.strings deleted file mode 100644 index d847043320..0000000000 Binary files a/Carthage/Build/iOS/InsulinKit.framework/ru.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Assets.car b/Carthage/Build/iOS/LoopKit.framework/Assets.car deleted file mode 100644 index 19ab224fb1..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Assets.car and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib deleted file mode 100644 index e2ca39c33b..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib deleted file mode 100644 index fdbef1acfb..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h deleted file mode 100644 index 605b19b620..0000000000 --- a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h +++ /dev/null @@ -1,307 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import UIKit; -@import Foundation; -@import CoreGraphics; -@import HealthKit; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="LoopKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - -@class NSCoder; -@class NSBundle; - -SWIFT_CLASS("_TtC7LoopKit29CommandResponseViewController") -@interface CommandResponseViewController : UIViewController -- (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 SWIFT_WARN_UNUSED_RESULT; -- (id _Nullable)activityViewController:(UIActivityViewController * _Nonnull)activityViewController itemForActivityType:(UIActivityType _Nullable)activityType SWIFT_WARN_UNUSED_RESULT; -- (NSString * _Nonnull)activityViewController:(UIActivityViewController * _Nonnull)activityViewController subjectForActivityType:(UIActivityType _Nullable)activityType SWIFT_WARN_UNUSED_RESULT; -@end - -@class UITableView; -@class UITableViewCell; - -SWIFT_CLASS("_TtC7LoopKit37DailyValueScheduleTableViewController") -@interface DailyValueScheduleTableViewController : UITableViewController -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)viewDidLoad; -- (void)setEditing:(BOOL)editing animated:(BOOL)animated; -- (void)viewWillDisappear:(BOOL)animated; -- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView SWIFT_WARN_UNUSED_RESULT; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView canEditRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView canMoveRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (void)tableView:(UITableView * _Nonnull)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; -- (CGFloat)tableView:(UITableView * _Nonnull)tableView heightForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView shouldHighlightRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSIndexPath * _Nullable)tableView:(UITableView * _Nonnull)tableView willSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (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 SWIFT_WARN_UNUSED_RESULT; -- (nonnull instancetype)initWithStyle:(UITableViewStyle)style SWIFT_UNAVAILABLE; -- (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil SWIFT_UNAVAILABLE; -@end - - -SWIFT_CLASS("_TtC7LoopKit38SingleValueScheduleTableViewController") -@interface SingleValueScheduleTableViewController : DailyValueScheduleTableViewController -- (void)viewDidLoad; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (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; -- (NSIndexPath * _Nonnull)tableView:(UITableView * _Nonnull)tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath * _Nonnull)sourceIndexPath toProposedIndexPath:(NSIndexPath * _Nonnull)proposedDestinationIndexPath SWIFT_WARN_UNUSED_RESULT; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -@end - - -SWIFT_CLASS("_TtC7LoopKit40DailyQuantityScheduleTableViewController") -@interface DailyQuantityScheduleTableViewController : SingleValueScheduleTableViewController -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -@end - - - -SWIFT_CLASS("_TtC7LoopKit39GlucoseRangeScheduleTableViewController") -@interface GlucoseRangeScheduleTableViewController : DailyValueScheduleTableViewController -- (void)viewDidLoad; -- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView SWIFT_WARN_UNUSED_RESULT; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (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 SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView canMoveRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForHeaderInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView shouldHighlightRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSIndexPath * _Nullable)tableView:(UITableView * _Nonnull)tableView willSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -@end - - - - - - - - - - - - -@class UITextField; - -SWIFT_CLASS("_TtC7LoopKit28TextFieldTableViewController") -@interface TextFieldTableViewController : UITableViewController -- (nonnull instancetype)init; -- (void)viewDidLoad; -- (void)viewDidAppear:(BOOL)animated; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForFooterInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (BOOL)textFieldShouldEndEditing:(UITextField * _Nonnull)textField SWIFT_WARN_UNUSED_RESULT; -- (BOOL)textFieldShouldReturn:(UITextField * _Nonnull)textField SWIFT_WARN_UNUSED_RESULT; -- (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; -@end - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit.h b/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit.h deleted file mode 100644 index 16ad5bea32..0000000000 --- a/Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// LoopKit.h -// LoopKit -// -// Created by Nathan Racklyeft on 1/18/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -#import - -//! Project version number for LoopKit. -FOUNDATION_EXPORT double LoopKitVersionNumber; - -//! Project version string for LoopKit. -FOUNDATION_EXPORT const unsigned char LoopKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/LoopKit.framework/Info.plist b/Carthage/Build/iOS/LoopKit.framework/Info.plist deleted file mode 100644 index 3e0a932f94..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/LoopKit b/Carthage/Build/iOS/LoopKit.framework/LoopKit deleted file mode 100755 index 220f81f8e0..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/LoopKit and /dev/null 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 deleted file mode 100644 index 6bd298961d..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index c96ec396fe..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index c1b17ee3d7..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index db3dca3c5c..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index b2c27d5031..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 83fd0068ae..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index b9c7e5d8eb..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index db50dbbd0b..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/LoopKit.framework/Modules/module.modulemap deleted file mode 100644 index 2088179a3d..0000000000 --- a/Carthage/Build/iOS/LoopKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module LoopKit { - umbrella header "LoopKit.h" - - export * - module * { export * } -} - -module LoopKit.Swift { - header "LoopKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib deleted file mode 100644 index 20fa2a7277..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib deleted file mode 100644 index 18cfa641fa..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/LoopKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/es.lproj/Localizable.strings b/Carthage/Build/iOS/LoopKit.framework/es.lproj/Localizable.strings deleted file mode 100644 index b380a13ae7..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/es.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/es.lproj/LoopKit.strings b/Carthage/Build/iOS/LoopKit.framework/es.lproj/LoopKit.strings deleted file mode 100644 index 4f978a1855..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/es.lproj/LoopKit.strings and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/LoopKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/ru.lproj/Localizable.strings b/Carthage/Build/iOS/LoopKit.framework/ru.lproj/Localizable.strings deleted file mode 100644 index 225fd44646..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/ru.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/LoopKit.framework/ru.lproj/LoopKit.strings b/Carthage/Build/iOS/LoopKit.framework/ru.lproj/LoopKit.strings deleted file mode 100644 index d40428e2a1..0000000000 Binary files a/Carthage/Build/iOS/LoopKit.framework/ru.lproj/LoopKit.strings and /dev/null differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h deleted file mode 100644 index 93606bd677..0000000000 --- a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit-Swift.h +++ /dev/null @@ -1,189 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import Foundation; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="MinimedKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit.h b/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit.h deleted file mode 100644 index b4f1d1cc90..0000000000 --- a/Carthage/Build/iOS/MinimedKit.framework/Headers/MinimedKit.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MinimedKit.h -// MinimedKit -// -// Created by Pete Schwamb on 2/27/16. -// Copyright © 2016 Pete Schwamb. All rights reserved. -// - -#import - -//! Project version number for MinimedKit. -FOUNDATION_EXPORT double MinimedKitVersionNumber; - -//! Project version string for MinimedKit. -FOUNDATION_EXPORT const unsigned char MinimedKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/MinimedKit.framework/Info.plist b/Carthage/Build/iOS/MinimedKit.framework/Info.plist deleted file mode 100644 index 92cc757b5e..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit deleted file mode 100755 index d84e493e3d..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit and /dev/null 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 deleted file mode 100644 index b564fce1c8..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index f2b3b0e273..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index ce6bf9551b..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 0f180096a7..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 2bdc4adc89..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 8668c50051..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index eea7806599..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index a5a2164939..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/MinimedKit.framework/Modules/module.modulemap deleted file mode 100644 index 9a16638ac7..0000000000 --- a/Carthage/Build/iOS/MinimedKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module MinimedKit { - umbrella header "MinimedKit.h" - - export * - module * { export * } -} - -module MinimedKit.Swift { - header "MinimedKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/MinimedKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/MinimedKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/es.lproj/Localizable.strings b/Carthage/Build/iOS/MinimedKit.framework/es.lproj/Localizable.strings deleted file mode 100644 index 704a2f1224..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/es.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/MinimedKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index 3967e063f9..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/ru.lproj/Localizable.strings b/Carthage/Build/iOS/MinimedKit.framework/ru.lproj/Localizable.strings deleted file mode 100644 index 284262d537..0000000000 Binary files a/Carthage/Build/iOS/MinimedKit.framework/ru.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h deleted file mode 100644 index 5bc4b7be48..0000000000 --- a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit-Swift.h +++ /dev/null @@ -1,205 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import Foundation; -@import HealthKit; -@import ObjectiveC; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="NightscoutUploadKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - - - - -SWIFT_CLASS("_TtC19NightscoutUploadKit20NightscoutPumpEvents") -@interface NightscoutPumpEvents : NSObject -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - -SWIFT_CLASS("_TtC19NightscoutUploadKit10TimeFormat") -@interface TimeFormat : NSObject -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit.h b/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit.h deleted file mode 100644 index f5a66044aa..0000000000 --- a/Carthage/Build/iOS/NightscoutUploadKit.framework/Headers/NightscoutUploadKit.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// NightscoutUploadKit.h -// NightscoutUploadKit -// -// Created by Pete Schwamb on 4/26/16. -// Copyright © 2016 Pete Schwamb. All rights reserved. -// - -#import - -//! Project version number for NightscoutUploadKit. -FOUNDATION_EXPORT double NightscoutUploadKitVersionNumber; - -//! Project version string for NightscoutUploadKit. -FOUNDATION_EXPORT const unsigned char NightscoutUploadKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist deleted file mode 100644 index 05bdf8efd4..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist and /dev/null 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 deleted file mode 100644 index f9ad01ab02..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index 3a9353945e..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index 1dcfd3bfc8..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 049671c9cc..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 58b739fff0..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 80f52949c4..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index 11f0095f4f..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 46745e245f..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/module.modulemap deleted file mode 100644 index 0fda0189a4..0000000000 --- a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module NightscoutUploadKit { - umbrella header "NightscoutUploadKit.h" - - export * - module * { export * } -} - -module NightscoutUploadKit.Swift { - header "NightscoutUploadKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit deleted file mode 100755 index bfdfcfd5ab..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit and /dev/null differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/NightscoutUploadKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/NightscoutUploadKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index 3967e063f9..0000000000 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEKit-Swift.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEKit-Swift.h deleted file mode 100644 index f291e9aff6..0000000000 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEKit-Swift.h +++ /dev/null @@ -1,263 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import CoreBluetooth; -@import ObjectiveC; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="RileyLinkBLEKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - - - - - - - - -SWIFT_CLASS("_TtC15RileyLinkBLEKit17PeripheralManager") -@interface PeripheralManager : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable"); -@end - - - - - - -@interface PeripheralManager (SWIFT_EXTENSION(RileyLinkBLEKit)) -- (void)centralManagerDidUpdateState:(CBCentralManager * _Nonnull)central; -- (void)centralManager:(CBCentralManager * _Nonnull)central didConnectPeripheral:(CBPeripheral * _Nonnull)peripheral; -@end - - - - - -@class CBService; -@class CBCharacteristic; -@class NSNumber; - -@interface PeripheralManager (SWIFT_EXTENSION(RileyLinkBLEKit)) -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didDiscoverServices:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didDiscoverCharacteristicsForService:(CBService * _Nonnull)service error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didUpdateNotificationStateForCharacteristic:(CBCharacteristic * _Nonnull)characteristic error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didWriteValueForCharacteristic:(CBCharacteristic * _Nonnull)characteristic error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didUpdateValueForCharacteristic:(CBCharacteristic * _Nonnull)characteristic error:(NSError * _Nullable)error; -- (void)peripheral:(CBPeripheral * _Nonnull)peripheral didReadRSSI:(NSNumber * _Nonnull)RSSI error:(NSError * _Nullable)error; -- (void)peripheralDidUpdateName:(CBPeripheral * _Nonnull)peripheral; -@end - - - - - - -SWIFT_CLASS("_TtC15RileyLinkBLEKit22RileyLinkDeviceManager") -@interface RileyLinkDeviceManager : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable"); -@end - - - - - - -@interface RileyLinkDeviceManager (SWIFT_EXTENSION(RileyLinkBLEKit)) -@property (nonatomic, readonly, copy) NSString * _Nonnull debugDescription; -@end - - -@interface RileyLinkDeviceManager (SWIFT_EXTENSION(RileyLinkBLEKit)) -- (void)centralManager:(CBCentralManager * _Nonnull)central willRestoreState:(NSDictionary * _Nonnull)dict; -- (void)centralManagerDidUpdateState:(CBCentralManager * _Nonnull)central; -- (void)centralManager:(CBCentralManager * _Nonnull)central didDiscoverPeripheral:(CBPeripheral * _Nonnull)peripheral advertisementData:(NSDictionary * _Nonnull)advertisementData RSSI:(NSNumber * _Nonnull)RSSI; -- (void)centralManager:(CBCentralManager * _Nonnull)central didConnectPeripheral:(CBPeripheral * _Nonnull)peripheral; -- (void)centralManager:(CBCentralManager * _Nonnull)central didDisconnectPeripheral:(CBPeripheral * _Nonnull)peripheral error:(NSError * _Nullable)error; -- (void)centralManager:(CBCentralManager * _Nonnull)central didFailToConnectPeripheral:(CBPeripheral * _Nonnull)peripheral error:(NSError * _Nullable)error; -@end - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEKit.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEKit.h deleted file mode 100644 index 191e90389a..0000000000 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEKit.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// RileyLinkBLEKit.h -// RileyLinkBLEKit -// -// Copyright © 2017 Pete Schwamb. All rights reserved. -// - -#import - -//! Project version number for RileyLinkBLEKit. -FOUNDATION_EXPORT double RileyLinkBLEKitVersionNumber; - -//! Project version string for RileyLinkBLEKit. -FOUNDATION_EXPORT const unsigned char RileyLinkBLEKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist deleted file mode 100644 index 607b825d56..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm.swiftdoc deleted file mode 100644 index cbe667511c..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm.swiftmodule deleted file mode 100644 index 9ff1531c58..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm64.swiftdoc deleted file mode 100644 index efa74fdffd..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm64.swiftmodule deleted file mode 100644 index cba3abdfd0..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/arm64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/i386.swiftdoc deleted file mode 100644 index b704f724d7..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/i386.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/i386.swiftmodule deleted file mode 100644 index b987761709..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/i386.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 899270802a..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index bb08da24ee..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/RileyLinkBLEKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/module.modulemap deleted file mode 100644 index 8985fa2761..0000000000 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module RileyLinkBLEKit { - umbrella header "RileyLinkBLEKit.h" - - export * - module * { export * } -} - -module RileyLinkBLEKit.Swift { - header "RileyLinkBLEKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit deleted file mode 100755 index ed739b996e..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h deleted file mode 100644 index f204a949f5..0000000000 --- a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit-Swift.h +++ /dev/null @@ -1,186 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="RileyLinkKit",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit.h b/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit.h deleted file mode 100644 index 472a86e7fc..0000000000 --- a/Carthage/Build/iOS/RileyLinkKit.framework/Headers/RileyLinkKit.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// RileyLinkKit.h -// RileyLinkKit -// -// Created by Nathan Racklyeft on 4/9/16. -// Copyright © 2016 Pete Schwamb. All rights reserved. -// - -#import - -//! Project version number for RileyLinkKit. -FOUNDATION_EXPORT double RileyLinkKitVersionNumber; - -//! Project version string for RileyLinkKit. -FOUNDATION_EXPORT const unsigned char RileyLinkKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist deleted file mode 100644 index 7939db8efa..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist and /dev/null 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 deleted file mode 100644 index b951c256fc..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index 069818c359..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index 206ae7c5a1..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index acf856abfd..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index a9287c28bb..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index a636df0bf7..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index c891fbf837..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 64c21e39d7..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/module.modulemap b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/module.modulemap deleted file mode 100644 index b950751ecd..0000000000 --- a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module RileyLinkKit { - umbrella header "RileyLinkKit.h" - - export * - module * { export * } -} - -module RileyLinkKit.Swift { - header "RileyLinkKit-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit deleted file mode 100755 index 1e6f66fe23..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/es.lproj/InfoPlist.strings b/Carthage/Build/iOS/RileyLinkKit.framework/es.lproj/InfoPlist.strings deleted file mode 100644 index 1ee4318d4f..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/es.lproj/Localizable.strings b/Carthage/Build/iOS/RileyLinkKit.framework/es.lproj/Localizable.strings deleted file mode 100644 index 9f76d6cf34..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/es.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/ru.lproj/InfoPlist.strings b/Carthage/Build/iOS/RileyLinkKit.framework/ru.lproj/InfoPlist.strings deleted file mode 100644 index 3967e063f9..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/ru.lproj/Localizable.strings b/Carthage/Build/iOS/RileyLinkKit.framework/ru.lproj/Localizable.strings deleted file mode 100644 index 5a57392335..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/ru.lproj/Localizable.strings and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Headers/RileyLinkKitUI-Swift.h b/Carthage/Build/iOS/RileyLinkKitUI.framework/Headers/RileyLinkKitUI-Swift.h deleted file mode 100644 index 1bad713eda..0000000000 --- a/Carthage/Build/iOS/RileyLinkKitUI.framework/Headers/RileyLinkKitUI-Swift.h +++ /dev/null @@ -1,244 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import Foundation; -@import UIKit; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="RileyLinkKitUI",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - -@class NSCoder; - -SWIFT_CLASS("_TtC14RileyLinkKitUI28RileyLinkDeviceTableViewCell") -@interface RileyLinkDeviceTableViewCell : UITableViewCell -- (nonnull instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString * _Nullable)reuseIdentifier OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)awakeFromNib; -- (void)layoutSubviews; -- (void)prepareForReuse; -@end - -@class UITableView; -@class NSBundle; - -SWIFT_CLASS("_TtC14RileyLinkKitUI34RileyLinkDeviceTableViewController") -@interface RileyLinkDeviceTableViewController : UITableViewController -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)viewDidLoad; -- (void)viewWillAppear:(BOOL)animated; -- (void)viewWillDisappear:(BOOL)animated; -- (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView SWIFT_WARN_UNUSED_RESULT; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForHeaderInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (BOOL)tableView:(UITableView * _Nonnull)tableView shouldHighlightRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (void)tableView:(UITableView * _Nonnull)tableView didSelectRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath; -- (nonnull instancetype)initWithStyle:(UITableViewStyle)style SWIFT_UNAVAILABLE; -- (nonnull instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil SWIFT_UNAVAILABLE; -@end - - - -@class UITextField; - -SWIFT_CLASS("_TtC14RileyLinkKitUI28TextFieldTableViewController") -@interface TextFieldTableViewController : UITableViewController -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable"); -- (void)viewDidLoad; -- (void)viewDidAppear:(BOOL)animated; -- (NSInteger)tableView:(UITableView * _Nonnull)tableView numberOfRowsInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath SWIFT_WARN_UNUSED_RESULT; -- (NSString * _Nullable)tableView:(UITableView * _Nonnull)tableView titleForFooterInSection:(NSInteger)section SWIFT_WARN_UNUSED_RESULT; -- (BOOL)textFieldShouldEndEditing:(UITextField * _Nonnull)textField SWIFT_WARN_UNUSED_RESULT; -- (BOOL)textFieldShouldReturn:(UITextField * _Nonnull)textField SWIFT_WARN_UNUSED_RESULT; -- (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; -@end - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Headers/RileyLinkKitUI.h b/Carthage/Build/iOS/RileyLinkKitUI.framework/Headers/RileyLinkKitUI.h deleted file mode 100644 index 236c99f79c..0000000000 --- a/Carthage/Build/iOS/RileyLinkKitUI.framework/Headers/RileyLinkKitUI.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// RileyLinkKitUI.h -// RileyLinkKitUI -// -// Copyright © 2017 Pete Schwamb. All rights reserved. -// - -#import - -//! Project version number for RileyLinkKitUI. -FOUNDATION_EXPORT double RileyLinkKitUIVersionNumber; - -//! Project version string for RileyLinkKitUI. -FOUNDATION_EXPORT const unsigned char RileyLinkKitUIVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Info.plist b/Carthage/Build/iOS/RileyLinkKitUI.framework/Info.plist deleted file mode 100644 index 277931a2e6..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Info.plist and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm.swiftdoc deleted file mode 100644 index ff1e4cdd71..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm.swiftmodule deleted file mode 100644 index a6529ab2b2..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm64.swiftdoc deleted file mode 100644 index 4082c8ca6c..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm64.swiftmodule deleted file mode 100644 index fe50a6db5b..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/arm64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/i386.swiftdoc deleted file mode 100644 index 6a900caf68..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/i386.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/i386.swiftmodule deleted file mode 100644 index d70d4a8750..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/i386.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 9347052a5b..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 72dbb65486..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/RileyLinkKitUI.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/module.modulemap b/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/module.modulemap deleted file mode 100644 index a1d1cc1793..0000000000 --- a/Carthage/Build/iOS/RileyLinkKitUI.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module RileyLinkKitUI { - umbrella header "RileyLinkKitUI.h" - - export * - module * { export * } -} - -module RileyLinkKitUI.Swift { - header "RileyLinkKitUI-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/RileyLinkKitUI b/Carthage/Build/iOS/RileyLinkKitUI.framework/RileyLinkKitUI deleted file mode 100755 index e535b2c3da..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/RileyLinkKitUI and /dev/null differ diff --git a/Carthage/Build/iOS/RileyLinkKitUI.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKitUI.framework/TextFieldTableViewCell.nib deleted file mode 100644 index ce1a4b7986..0000000000 Binary files a/Carthage/Build/iOS/RileyLinkKitUI.framework/TextFieldTableViewCell.nib and /dev/null differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h deleted file mode 100644 index 7f870ce126..0000000000 --- a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient-Swift.h +++ /dev/null @@ -1,186 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="ShareClient",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient.h b/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient.h deleted file mode 100644 index 2d67034b08..0000000000 --- a/Carthage/Build/iOS/ShareClient.framework/Headers/ShareClient.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// ShareClient.h -// ShareClient -// -// Created by Nathan Racklyeft on 5/8/16. -// Copyright © 2016 Mark Wilson. All rights reserved. -// - -#import - -//! Project version number for ShareClient. -FOUNDATION_EXPORT double ShareClientVersionNumber; - -//! Project version string for ShareClient. -FOUNDATION_EXPORT const unsigned char ShareClientVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/ShareClient.framework/Info.plist b/Carthage/Build/iOS/ShareClient.framework/Info.plist deleted file mode 100644 index ecc5020733..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Info.plist and /dev/null 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 deleted file mode 100644 index 9de305ac1e..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index 329f119152..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index e01f4aa77a..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index ce0eb8c131..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index 3e96c1ea3d..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 35c27b7106..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index 6c19f2d975..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 3141130a9d..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/Modules/ShareClient.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/ShareClient.framework/Modules/module.modulemap b/Carthage/Build/iOS/ShareClient.framework/Modules/module.modulemap deleted file mode 100644 index 20500a0e76..0000000000 --- a/Carthage/Build/iOS/ShareClient.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module ShareClient { - umbrella header "ShareClient.h" - - export * - module * { export * } -} - -module ShareClient.Swift { - header "ShareClient-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/ShareClient.framework/ShareClient b/Carthage/Build/iOS/ShareClient.framework/ShareClient deleted file mode 100755 index af4dfba70f..0000000000 Binary files a/Carthage/Build/iOS/ShareClient.framework/ShareClient and /dev/null differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h deleted file mode 100644 index 2d766a6518..0000000000 --- a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h +++ /dev/null @@ -1,350 +0,0 @@ -// Generated by Apple Swift version 4.1 (swiftlang-902.0.48 clang-902.0.37.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -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) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#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 __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open))) -# else -# define SWIFT_ENUM_ATTR -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type -# else -# 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(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import UIKit; -@import CoreGraphics; -@import ObjectiveC; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="SwiftCharts",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - -@class NSCoder; - -SWIFT_CLASS("_TtC11SwiftCharts14ChartAreasView") -@interface ChartAreasView : UIView -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; -@end - -@class UIPinchGestureRecognizer; -@class UIPanGestureRecognizer; -@class UITapGestureRecognizer; - -SWIFT_CLASS("_TtC11SwiftCharts9ChartView") -@interface ChartView : UIView -- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)onPinch:(UIPinchGestureRecognizer * _Nonnull)sender; -- (void)onPan:(UIPanGestureRecognizer * _Nonnull)sender; -- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender; -@end - - -/// A UIView subclass for drawing charts -SWIFT_CLASS("_TtC11SwiftCharts13ChartBaseView") -@interface ChartBaseView : ChartView -- (void)drawRect:(CGRect)rect; -- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts20ChartCandleStickView") -@interface ChartCandleStickView : UIView -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)drawRect:(CGRect)rect; -- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts16ChartContentView") -@interface ChartContentView : UIView -- (void)drawRect:(CGRect)rect; -- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -@end - - -/// Convenience class to store common properties and make protocol’s methods optional -SWIFT_CLASS("_TtC11SwiftCharts14ChartLayerBase") -@interface ChartLayerBase : NSObject -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts21ChartCoordsSpaceLayer") -@interface ChartCoordsSpaceLayer : ChartLayerBase -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable"); -@end - - -SWIFT_CLASS("_TtC11SwiftCharts18ChartDividersLayer") -@interface ChartDividersLayer : ChartCoordsSpaceLayer -@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; -@class UIEvent; - -SWIFT_CLASS("_TtC11SwiftCharts21ChartPointEllipseView") -@interface ChartPointEllipseView : UIView -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)didMoveToSuperview; -- (void)drawRect:(CGRect)rect; -- (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; -- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; -@end - - -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 - - -SWIFT_CLASS("_TtC11SwiftCharts24ChartPointTextCircleView") -@interface ChartPointTextCircleView : UILabel -- (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 - - -SWIFT_CLASS("_TtC11SwiftCharts17ChartPointViewBar") -@interface ChartPointViewBar : UIView -- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender; -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)didMoveToSuperview; -- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarGreyOut") -@interface ChartPointViewBarGreyOut : ChartPointViewBar -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)didMoveToSuperview; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts24ChartPointViewBarStacked") -@interface ChartPointViewBarStacked : ChartPointViewBar -- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender; -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)didMoveToSuperview; -@end - - - -SWIFT_CLASS("_TtC11SwiftCharts13HandlingLabel") -@interface HandlingLabel : UILabel -- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)didMoveToSuperview; -- (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts12HandlingView") -@interface HandlingView : UIView -- (void)didMoveToSuperview; -- (void)touchesEnded:(NSSet * _Nonnull)touches withEvent:(UIEvent * _Nullable)event; -- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -@end - - -SWIFT_CLASS("_TtC11SwiftCharts10InfoBubble") -@interface InfoBubble : UIView -- (void)onTap:(UITapGestureRecognizer * _Nonnull)sender; -- (void)didMoveToSuperview; -- (nonnull instancetype)initWithCoder:(NSCoder * _Nonnull)aDecoder OBJC_DESIGNATED_INITIALIZER; -- (void)drawRect:(CGRect)rect; -- (nonnull instancetype)initWithFrame:(CGRect)frame SWIFT_UNAVAILABLE; -@end - - - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts.h b/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts.h deleted file mode 100644 index 4cfb01e91c..0000000000 --- a/Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// SwiftCharts.h -// SwiftCharts -// -// Created by Pierre-Marc Airoldi on 2015-08-23. -// Copyright (c) 2015 Pierre-Marc Airoldi. All rights reserved. -// - -#import - -//! Project version number for SwiftCharts. -FOUNDATION_EXPORT double SwiftChartsVersionNumber; - -//! Project version string for SwiftCharts. -FOUNDATION_EXPORT const unsigned char SwiftChartsVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist b/Carthage/Build/iOS/SwiftCharts.framework/Info.plist deleted file mode 100644 index 8d580dc863..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Info.plist and /dev/null 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 deleted file mode 100644 index 12bfcb3030..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftdoc and /dev/null 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 deleted file mode 100644 index 1f460f4f03..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm.swiftmodule and /dev/null 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 deleted file mode 100644 index e1db2988f3..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftdoc and /dev/null 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 deleted file mode 100644 index 58a8f19db4..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/arm64.swiftmodule and /dev/null 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 deleted file mode 100644 index c197534efd..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftdoc and /dev/null 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 deleted file mode 100644 index 97bf59f565..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/i386.swiftmodule and /dev/null 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 deleted file mode 100644 index da01d0c0aa..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftdoc and /dev/null 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 deleted file mode 100644 index 605b0b3dfa..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/Modules/SwiftCharts.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/iOS/SwiftCharts.framework/Modules/module.modulemap b/Carthage/Build/iOS/SwiftCharts.framework/Modules/module.modulemap deleted file mode 100644 index 62d7f29e25..0000000000 --- a/Carthage/Build/iOS/SwiftCharts.framework/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module SwiftCharts { - umbrella header "SwiftCharts.h" - - export * - module * { export * } -} - -module SwiftCharts.Swift { - header "SwiftCharts-Swift.h" - requires objc -} diff --git a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts b/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts deleted file mode 100755 index 06c3dd64b0..0000000000 Binary files a/Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts and /dev/null differ diff --git a/Common/Extensions/HKUnit.swift b/Common/Extensions/HKUnit.swift index 343c5ef604..d5b0fb727d 100644 --- a/Common/Extensions/HKUnit.swift +++ b/Common/Extensions/HKUnit.swift @@ -21,18 +21,23 @@ extension HKUnit { } } - static func milligramsPerDeciliter() -> HKUnit { + static let milligramsPerDeciliter: HKUnit = { return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci)) - } + }() - static func millimolesPerLiter() -> HKUnit { + static let millimolesPerLiter: HKUnit = { return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter()) - } - - /// A glucose-centric presentation helper for the localized unit string - var glucoseUnitDisplayString: String { - if self == HKUnit.millimolesPerLiter() { - return NSLocalizedString("mmol/L", comment: "The unit display string for millimoles of glucose per liter") + }() + + var localizedShortUnitString: String { + if self == HKUnit.millimolesPerLiter { + return NSLocalizedString("mmol/L", comment: "The short unit display string for millimoles of glucose per liter") + } else if self == .milligramsPerDeciliter { + return NSLocalizedString("mg/dL", comment: "The short unit display string for milligrams of glucose per decilter") + } else if self == .internationalUnit() { + return NSLocalizedString("U", comment: "The short unit display string for international units of insulin") + } else if self == .gram() { + return NSLocalizedString("g", comment: "The short unit display string for grams") } else { return String(describing: self) } diff --git a/Common/Extensions/NSUserDefaults.swift b/Common/Extensions/NSUserDefaults.swift new file mode 100644 index 0000000000..7d5d73edde --- /dev/null +++ b/Common/Extensions/NSUserDefaults.swift @@ -0,0 +1,139 @@ +// +// NSUserDefaults.swift +// Naterade +// +// Created by Nathan Racklyeft on 8/30/15. +// Copyright © 2015 Nathan Racklyeft. All rights reserved. +// + +import Foundation +import LoopKit +import HealthKit + + +extension UserDefaults { + + private enum Key: String { + case basalRateSchedule = "com.loudnate.Naterade.BasalRateSchedule" + case carbRatioSchedule = "com.loudnate.Naterade.CarbRatioSchedule" + case insulinModelSettings = "com.loopkit.Loop.insulinModelSettings" + case loopSettings = "com.loopkit.Loop.loopSettings" + case insulinSensitivitySchedule = "com.loudnate.Naterade.InsulinSensitivitySchedule" + } + + var basalRateSchedule: BasalRateSchedule? { + get { + if let rawValue = dictionary(forKey: Key.basalRateSchedule.rawValue) { + return BasalRateSchedule(rawValue: rawValue) + } else { + return nil + } + } + set { + set(newValue?.rawValue, forKey: Key.basalRateSchedule.rawValue) + } + } + + var carbRatioSchedule: CarbRatioSchedule? { + get { + if let rawValue = dictionary(forKey: Key.carbRatioSchedule.rawValue) { + return CarbRatioSchedule(rawValue: rawValue) + } else { + return nil + } + } + set { + set(newValue?.rawValue, forKey: Key.carbRatioSchedule.rawValue) + } + } + + var insulinModelSettings: InsulinModelSettings? { + get { + if let rawValue = dictionary(forKey: Key.insulinModelSettings.rawValue) { + return InsulinModelSettings(rawValue: rawValue) + } else { + // Migrate the version 0 case + let insulinActionDurationKey = "com.loudnate.Naterade.InsulinActionDuration" + defer { + removeObject(forKey: insulinActionDurationKey) + } + + let value = double(forKey: insulinActionDurationKey) + return value > 0 ? .walsh(WalshInsulinModel(actionDuration: value)) : nil + } + } + set { + set(newValue?.rawValue, forKey: Key.insulinModelSettings.rawValue) + } + } + + var loopSettings: LoopSettings? { + get { + if let rawValue = dictionary(forKey: Key.loopSettings.rawValue) { + return LoopSettings(rawValue: rawValue) + } else { + // Migrate the version 0 case + defer { + removeObject(forKey: "com.loudnate.Naterade.DosingEnabled") + removeObject(forKey: "com.loudnate.Naterade.GlucoseTargetRangeSchedule") + removeObject(forKey: "com.loudnate.Naterade.MaximumBasalRatePerHour") + removeObject(forKey: "com.loudnate.Naterade.MaximumBolus") + removeObject(forKey: "com.loopkit.Loop.MinimumBGGuard") + removeObject(forKey: "com.loudnate.Loop.RetrospectiveCorrectionEnabled") + } + + let glucoseTargetRangeSchedule: GlucoseRangeSchedule? + if let rawValue = dictionary(forKey: "com.loudnate.Naterade.GlucoseTargetRangeSchedule") { + glucoseTargetRangeSchedule = GlucoseRangeSchedule(rawValue: rawValue) + } else { + glucoseTargetRangeSchedule = nil + } + + let suspendThreshold: GlucoseThreshold? + if let rawValue = dictionary(forKey: "com.loopkit.Loop.MinimumBGGuard") { + suspendThreshold = GlucoseThreshold(rawValue: rawValue) + } else { + suspendThreshold = nil + } + + var maximumBasalRatePerHour: Double? = double(forKey: "com.loudnate.Naterade.MaximumBasalRatePerHour") + if maximumBasalRatePerHour! <= 0 { + maximumBasalRatePerHour = nil + } + + var maximumBolus: Double? = double(forKey: "com.loudnate.Naterade.MaximumBolus") + if maximumBolus! <= 0 { + maximumBolus = nil + } + + let settings = LoopSettings( + dosingEnabled: bool(forKey: "com.loudnate.Naterade.DosingEnabled"), + glucoseTargetRangeSchedule: glucoseTargetRangeSchedule, + maximumBasalRatePerHour: maximumBasalRatePerHour, + maximumBolus: maximumBolus, + suspendThreshold: suspendThreshold, + retrospectiveCorrectionEnabled: bool(forKey: "com.loudnate.Loop.RetrospectiveCorrectionEnabled") + ) + self.loopSettings = settings + + return settings + } + } + set { + set(newValue?.rawValue, forKey: Key.loopSettings.rawValue) + } + } + + var insulinSensitivitySchedule: InsulinSensitivitySchedule? { + get { + if let rawValue = dictionary(forKey: Key.insulinSensitivitySchedule.rawValue) { + return InsulinSensitivitySchedule(rawValue: rawValue) + } else { + return nil + } + } + set { + set(newValue?.rawValue, forKey: Key.insulinSensitivitySchedule.rawValue) + } + } +} diff --git a/Common/Extensions/NumberFormatter.swift b/Common/Extensions/NumberFormatter.swift index 785a185676..51f411ae7d 100644 --- a/Common/Extensions/NumberFormatter.swift +++ b/Common/Extensions/NumberFormatter.swift @@ -20,8 +20,20 @@ extension NumberFormatter { return numberFormatter } + func string(from number: Double) -> String? { + return string(from: NSNumber(value: number)) + } + + func string(from quantity: HKQuantity, unit: HKUnit) -> String? { + return string(from: quantity.doubleValue(for: unit), unit: unit) + } + + func string(from number: Double, unit: HKUnit) -> String? { + return string(from: number, unit: unit.localizedShortUnitString) + } + func string(from number: Double, unit: String) -> String? { - guard let stringValue = string(from: NSNumber(value: number)) else { + guard let stringValue = string(from: number) else { return nil } @@ -38,18 +50,9 @@ extension NumberFormatter { func decibleString(from decibles: Int?) -> String? { if let decibles = decibles { - return string(from: Double(decibles), unit: "dB") + return string(from: Double(decibles), unit: NSLocalizedString("dB", comment: "The short unit display string for decibles")) } else { return nil } } - - func describingGlucose(_ value: Double, for unit: HKUnit) -> String? { - return string(from: value, unit: unit.glucoseUnitDisplayString) - } - - @nonobjc func describingGlucose(_ value: HKQuantity, for unit: HKUnit) -> String? { - return describingGlucose(value.doubleValue(for: unit), for: unit) - } - } diff --git a/Loop/Extensions/OSLog.swift b/Common/Extensions/OSLog.swift similarity index 100% rename from Loop/Extensions/OSLog.swift rename to Common/Extensions/OSLog.swift diff --git a/Common/Extensions/PersistenceController.swift b/Common/Extensions/PersistenceController.swift new file mode 100644 index 0000000000..b32689bb7f --- /dev/null +++ b/Common/Extensions/PersistenceController.swift @@ -0,0 +1,23 @@ +// +// PersistenceController.swift +// Loop +// +// Copyright © 2017 LoopKit Authors. All rights reserved. +// + +import LoopKit + + +extension PersistenceController { + class func controllerInAppGroupDirectory() -> PersistenceController { + let appGroup = Bundle.main.appGroupSuiteName + guard let directoryURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup) else { + assertionFailure("Could not get a container directory URL. Please ensure App Groups are set up correctly in entitlements.") + return self.init(directoryURL: URL(fileURLWithPath: "/")) + } + + let isReadOnly = Bundle.main.bundleURL.pathExtension == "appex" + + return self.init(directoryURL: directoryURL.appendingPathComponent("com.loopkit.LoopKit", isDirectory: true), isReadOnly: isReadOnly) + } +} diff --git a/Common/Extensions/UserDefaults+CGM.swift b/Common/Extensions/UserDefaults+CGM.swift new file mode 100644 index 0000000000..ca286bcef3 --- /dev/null +++ b/Common/Extensions/UserDefaults+CGM.swift @@ -0,0 +1,28 @@ +// +// UserDefaults+CGM.swift +// Loop +// +// Copyright © 2018 LoopKit Authors. All rights reserved. +// + +import Foundation + + +extension UserDefaults { + private enum Key: String { + case cgmSettings = "com.loopkit.Loop.cgmSettings" + } + + var cgm: CGM? { + get { + if let rawValue = dictionary(forKey: Key.cgmSettings.rawValue) { + return CGM(rawValue: rawValue) + } else { + return nil + } + } + set { + set(newValue?.rawValue, forKey: Key.cgmSettings.rawValue) + } + } +} diff --git a/Loop/Models/CGM.swift b/Common/Models/CGM.swift similarity index 80% rename from Loop/Models/CGM.swift rename to Common/Models/CGM.swift index 43710351a4..0cfb219a51 100644 --- a/Loop/Models/CGM.swift +++ b/Common/Models/CGM.swift @@ -6,12 +6,13 @@ // import Foundation +import LoopKit enum CGM { case g5(transmitterID: String?) case g4 - case enlite + case usePump var appURL: URL? { switch self { @@ -26,21 +27,10 @@ enum CGM { } } return nil - case .enlite: + case .usePump: return nil } } - - func createManager() -> CGMManager? { - switch self { - case .enlite: - return EnliteCGMManager() - case .g4: - return G4CGMManager() - case .g5(let transmitterID): - return G5CGMManager(transmitterID: transmitterID) - } - } } @@ -62,8 +52,8 @@ extension CGM: RawRepresentable { self = .g5(transmitterID: rawValue["transmitterID"] as? String) case .g4?: self = .g4 - case .enlite?: - self = .enlite + case .usePump?: + self = .usePump case .none: return nil } @@ -72,14 +62,14 @@ extension CGM: RawRepresentable { private enum CGMType: String { case g5 case g4 - case enlite + case usePump = "enlite" } private var type: CGMType { switch self { case .g5: return .g5 case .g4: return .g4 - case .enlite: return .enlite + case .usePump: return .usePump } } @@ -101,7 +91,7 @@ extension CGM: RawRepresentable { extension CGM: Equatable { static func ==(lhs: CGM, rhs: CGM) -> Bool { switch (lhs, rhs) { - case (.g4, .g4), (.enlite, .enlite): + case (.g4, .g4), (.usePump, .usePump): return true case (.g5(let a), .g5(let b)): return a == b diff --git a/Common/Models/GlucoseBackfillRequestUserInfo.swift b/Common/Models/GlucoseBackfillRequestUserInfo.swift new file mode 100644 index 0000000000..899a93434b --- /dev/null +++ b/Common/Models/GlucoseBackfillRequestUserInfo.swift @@ -0,0 +1,40 @@ +// +// GlucoseBackfillRequestUserInfo.swift +// Loop +// +// Created by Bharat Mediratta on 6/21/18. +// Copyright © 2018 LoopKit Authors. All rights reserved. +// + +import Foundation + +struct GlucoseBackfillRequestUserInfo { + let version = 1 + let startDate: Date +} + +extension GlucoseBackfillRequestUserInfo: RawRepresentable { + typealias RawValue = [String: Any] + + static let name = "GlucoseBackfillRequestUserInfo" + + init?(rawValue: RawValue) { + guard + rawValue["v"] as? Int == version, + rawValue["name"] as? String == GlucoseBackfillRequestUserInfo.name, + let startDate = rawValue["sd"] as? Date + else { + return nil + } + + self.startDate = startDate + } + + var rawValue: RawValue { + return [ + "v": version, + "name": GlucoseBackfillRequestUserInfo.name, + "sd": startDate + ] + } +} diff --git a/Common/Models/GlucoseRangeScheduleOverrideUserInfo.swift b/Common/Models/GlucoseRangeScheduleOverrideUserInfo.swift index 651d425fe4..0145d0cb2c 100644 --- a/Common/Models/GlucoseRangeScheduleOverrideUserInfo.swift +++ b/Common/Models/GlucoseRangeScheduleOverrideUserInfo.swift @@ -26,6 +26,10 @@ struct GlucoseRangeScheduleOverrideUserInfo { var effectiveEndDate: Date { return endDate ?? .distantFuture } + + var dateInterval: DateInterval { + return DateInterval(start: startDate, end: effectiveEndDate) + } } extension GlucoseRangeScheduleOverrideUserInfo: RawRepresentable { diff --git a/Loop/Models/GlucoseThreshold.swift b/Common/Models/GlucoseThreshold.swift similarity index 100% rename from Loop/Models/GlucoseThreshold.swift rename to Common/Models/GlucoseThreshold.swift diff --git a/Common/Models/GlucoseTrend.swift b/Common/Models/GlucoseTrend.swift deleted file mode 100644 index 99b2999708..0000000000 --- a/Common/Models/GlucoseTrend.swift +++ /dev/null @@ -1,58 +0,0 @@ -// -// GlucoseTrend.swift -// Loop -// -// Created by Nate Racklyeft on 8/2/16. -// Copyright © 2016 Nathan Racklyeft. All rights reserved. -// - -import Foundation - - -public enum GlucoseTrend: Int { - case upUpUp = 1 - case upUp = 2 - case up = 3 - case flat = 4 - case down = 5 - case downDown = 6 - case downDownDown = 7 - - var symbol: String { - switch self { - case .upUpUp: - return "⇈" - case .upUp: - return "↑" - case .up: - return "↗︎" - case .flat: - return "→" - case .down: - return "↘︎" - case .downDown: - return "↓" - case .downDownDown: - return "⇊" - } - } - - var localizedDescription: String { - switch self { - case .upUpUp: - return NSLocalizedString("Rising very fast", comment: "Glucose trend up-up-up") - case .upUp: - return NSLocalizedString("Rising fast", comment: "Glucose trend up-up") - case .up: - return NSLocalizedString("Rising", comment: "Glucose trend up") - case .flat: - return NSLocalizedString("Flat", comment: "Glucose trend flat") - case .down: - return NSLocalizedString("Falling", comment: "Glucose trend down") - case .downDown: - return NSLocalizedString("Falling fast", comment: "Glucose trend down-down") - case .downDownDown: - return NSLocalizedString("Falling very fast", comment: "Glucose trend down-down-down") - } - } -} diff --git a/Loop/Models/Insulin/ExponentialInsulinModelPreset.swift b/Common/Models/Insulin/ExponentialInsulinModelPreset.swift similarity index 99% rename from Loop/Models/Insulin/ExponentialInsulinModelPreset.swift rename to Common/Models/Insulin/ExponentialInsulinModelPreset.swift index f5e6cb4b2a..66644da1b8 100644 --- a/Loop/Models/Insulin/ExponentialInsulinModelPreset.swift +++ b/Common/Models/Insulin/ExponentialInsulinModelPreset.swift @@ -5,7 +5,7 @@ // Copyright © 2017 LoopKit Authors. All rights reserved. // -import InsulinKit +import LoopKit enum ExponentialInsulinModelPreset: String { diff --git a/Loop/Models/Insulin/InsulinModelSettings.swift b/Common/Models/Insulin/InsulinModelSettings.swift similarity index 99% rename from Loop/Models/Insulin/InsulinModelSettings.swift rename to Common/Models/Insulin/InsulinModelSettings.swift index 13aadeee89..0d6eb295c4 100644 --- a/Loop/Models/Insulin/InsulinModelSettings.swift +++ b/Common/Models/Insulin/InsulinModelSettings.swift @@ -5,7 +5,7 @@ // Copyright © 2017 LoopKit Authors. All rights reserved. // -import InsulinKit +import LoopKit enum InsulinModelSettings { diff --git a/Loop/Models/Insulin/WalshInsulinModel.swift b/Common/Models/Insulin/WalshInsulinModel.swift similarity index 98% rename from Loop/Models/Insulin/WalshInsulinModel.swift rename to Common/Models/Insulin/WalshInsulinModel.swift index 860416e76c..50d2f70ad5 100644 --- a/Loop/Models/Insulin/WalshInsulinModel.swift +++ b/Common/Models/Insulin/WalshInsulinModel.swift @@ -5,7 +5,7 @@ // Copyright © 2017 LoopKit Authors. All rights reserved. // -import InsulinKit +import LoopKit extension WalshInsulinModel: RawRepresentable { diff --git a/Loop/Models/LoopSettings.swift b/Common/Models/LoopSettings.swift similarity index 82% rename from Loop/Models/LoopSettings.swift rename to Common/Models/LoopSettings.swift index 24d374a153..3e932b4813 100644 --- a/Loop/Models/LoopSettings.swift +++ b/Common/Models/LoopSettings.swift @@ -6,7 +6,6 @@ // import LoopKit -import RileyLinkBLEKit struct LoopSettings { @@ -23,23 +22,17 @@ struct LoopSettings { var suspendThreshold: GlucoseThreshold? = nil var retrospectiveCorrectionEnabled = true -} + let retrospectiveCorrectionInterval = TimeInterval(minutes: 30) -// MARK: - Static configuration -extension LoopSettings { - static let idleListeningEnabledDefaults: RileyLinkDevice.IdleListeningState = .enabled(timeout: .minutes(4), channel: 0) -} + /// The amount of time since a given date that data should be considered valid + let recencyInterval = TimeInterval(minutes: 15) + // MARK - Display settings -extension LoopSettings { - var enabledEffects: PredictionInputEffect { - var inputs = PredictionInputEffect.all - if !retrospectiveCorrectionEnabled { - inputs.remove(.retrospection) - } - return inputs - } + let minimumChartWidthPerHour: CGFloat = 50 + + let statusChartMinimumHistoryDisplay: TimeInterval = .hours(1) } diff --git a/Common/Models/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift index eb61df6dbd..f385cf30cc 100644 --- a/Common/Models/StatusExtensionContext.swift +++ b/Common/Models/StatusExtensionContext.swift @@ -9,18 +9,8 @@ import Foundation import HealthKit -import LoopUI +import LoopKit -struct ReservoirContext { - let startDate: Date - let unitVolume: Double - let capacity: Int -} - -struct LoopContext { - let dosingEnabled: Bool - let lastCompleted: Date? -} struct NetBasalContext { let rate: Double @@ -61,54 +51,6 @@ struct PredictedGlucoseContext { } } -extension ReservoirContext: RawRepresentable { - typealias RawValue = [String: Any] - - var rawValue: RawValue { - return [ - "startDate": startDate, - "unitVolume": unitVolume, - "capacity": capacity - ] - } - - init?(rawValue: RawValue) { - guard - let startDate = rawValue["startDate"] as? Date, - let unitVolume = rawValue["unitVolume"] as? Double, - let capacity = rawValue["capacity"] as? Int - else { - return nil - } - - self.startDate = startDate - self.unitVolume = unitVolume - self.capacity = capacity - } -} - -extension LoopContext: RawRepresentable { - typealias RawValue = [String: Any] - - var rawValue: RawValue { - var raw: RawValue = [ - "dosingEnabled": dosingEnabled - ] - raw["lastCompleted"] = lastCompleted - return raw - } - - init?(rawValue: RawValue) { - guard let dosingEnabled = rawValue["dosingEnabled"] as? Bool - else { - return nil - } - - self.dosingEnabled = dosingEnabled - self.lastCompleted = rawValue["lastCompleted"] as? Date - } -} - extension NetBasalContext: RawRepresentable { typealias RawValue = [String: Any] @@ -180,32 +122,6 @@ extension SensorDisplayableContext: RawRepresentable { } } -extension GlucoseContext: RawRepresentable { - typealias RawValue = [String: Any] - - var rawValue: RawValue { - return [ - "value": value, - "unit": unit.unitString, - "startDate": startDate - ] - } - - init?(rawValue: RawValue) { - guard - let value = rawValue["value"] as? Double, - let unitString = rawValue["unit"] as? String, - let startDate = rawValue["startDate"] as? Date - else { - return nil - } - - self.value = value - self.unit = HKUnit(from: unitString) - self.startDate = startDate - } -} - extension PredictedGlucoseContext: RawRepresentable { typealias RawValue = [String: Any] @@ -235,45 +151,15 @@ extension PredictedGlucoseContext: RawRepresentable { } } -extension DatedRangeContext: RawRepresentable { - public typealias RawValue = [String: Any] - - public var rawValue: RawValue { - return [ - "startDate": startDate, - "endDate": endDate, - "minValue": minValue, - "maxValue": maxValue - ] - } - - public init?(rawValue: RawValue) { - guard - let startDate = rawValue["startDate"] as? Date, - let endDate = rawValue["endDate"] as? Date, - let minValue = rawValue["minValue"] as? Double, - let maxValue = rawValue["maxValue"] as? Double - else { - return nil - } - - self.init(startDate: startDate, endDate: endDate, minValue: minValue, maxValue: maxValue) - } -} - struct StatusExtensionContext: RawRepresentable { typealias RawValue = [String: Any] - private let version = 4 + private let version = 5 - var glucose: [GlucoseContext]? var predictedGlucose: PredictedGlucoseContext? - var reservoir: ReservoirContext? - var loop: LoopContext? + var lastLoopCompleted: Date? var netBasal: NetBasalContext? var batteryPercentage: Double? - var activeInsulin: Double? - var targetRanges: [DatedRangeContext]? - var temporaryOverride: DatedRangeContext? + var reservoirCapacity: Double? var sensor: SensorDisplayableContext? init() { } @@ -283,37 +169,17 @@ struct StatusExtensionContext: RawRepresentable { return nil } - if let rawValue = rawValue["glucose"] as? [GlucoseContext.RawValue] { - glucose = rawValue.compactMap({return GlucoseContext(rawValue: $0)}) - } - if let rawValue = rawValue["predictedGlucose"] as? PredictedGlucoseContext.RawValue { predictedGlucose = PredictedGlucoseContext(rawValue: rawValue) } - if let rawValue = rawValue["reservoir"] as? ReservoirContext.RawValue { - reservoir = ReservoirContext(rawValue: rawValue) - } - - if let rawValue = rawValue["loop"] as? LoopContext.RawValue { - loop = LoopContext(rawValue: rawValue) - } - if let rawValue = rawValue["netBasal"] as? NetBasalContext.RawValue { netBasal = NetBasalContext(rawValue: rawValue) } + lastLoopCompleted = rawValue["lastLoopCompleted"] as? Date batteryPercentage = rawValue["batteryPercentage"] as? Double - - activeInsulin = rawValue["activeInsulin"] as? Double - - if let rawValue = rawValue["targetRanges"] as? [DatedRangeContext.RawValue] { - targetRanges = rawValue.compactMap({return DatedRangeContext(rawValue: $0)}) - } - - if let rawValue = rawValue["temporaryOverride"] as? DatedRangeContext.RawValue { - temporaryOverride = DatedRangeContext(rawValue: rawValue) - } + reservoirCapacity = rawValue["reservoirCapacity"] as? Double if let rawValue = rawValue["sensor"] as? SensorDisplayableContext.RawValue { sensor = SensorDisplayableContext(rawValue: rawValue) @@ -325,15 +191,11 @@ struct StatusExtensionContext: RawRepresentable { "version": version ] - raw["glucose"] = glucose?.map({return $0.rawValue}) raw["predictedGlucose"] = predictedGlucose?.rawValue - raw["reservoir"] = reservoir?.rawValue - raw["loop"] = loop?.rawValue + raw["lastLoopCompleted"] = lastLoopCompleted raw["netBasal"] = netBasal?.rawValue raw["batteryPercentage"] = batteryPercentage - raw["activeInsulin"] = activeInsulin - raw["targetRanges"] = targetRanges?.map({return $0.rawValue}) - raw["temporaryOverride"] = temporaryOverride?.rawValue + raw["reservoirCapacity"] = reservoirCapacity raw["sensor"] = sensor?.rawValue return raw } diff --git a/Common/Models/WatchContext.swift b/Common/Models/WatchContext.swift index f28140d222..b7376604e3 100644 --- a/Common/Models/WatchContext.swift +++ b/Common/Models/WatchContext.swift @@ -9,10 +9,11 @@ import Foundation import HealthKit + final class WatchContext: NSObject, RawRepresentable { typealias RawValue = [String: Any] - private let version = 3 + private let version = 4 var preferredGlucoseUnit: HKUnit? var maxBolus: Double? @@ -22,6 +23,8 @@ final class WatchContext: NSObject, RawRepresentable { var eventualGlucose: HKQuantity? var glucoseDate: Date? + var targetRanges: [WatchDatedRange]? + var temporaryOverride: WatchDatedRange? var glucoseRangeScheduleOverride: GlucoseRangeScheduleOverrideUserInfo? var configuredOverrideContexts: [GlucoseRangeScheduleOverrideUserInfo.Context] = [] @@ -41,6 +44,9 @@ final class WatchContext: NSObject, RawRepresentable { var reservoir: Double? var reservoirPercentage: Double? var batteryPercentage: Double? + var predictedGlucose: WatchPredictedGlucose? + + var cgm: CGM? override init() { super.init() @@ -54,16 +60,15 @@ final class WatchContext: NSObject, RawRepresentable { } if let unitString = rawValue["gu"] as? String { - let unit = HKUnit(from: unitString) - preferredGlucoseUnit = unit + preferredGlucoseUnit = HKUnit(from: unitString) } - + let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter if let glucoseValue = rawValue["gv"] as? Double { - glucose = HKQuantity(unit: preferredGlucoseUnit ?? .milligramsPerDeciliter(), doubleValue: glucoseValue) + glucose = HKQuantity(unit: unit, doubleValue: glucoseValue) } if let glucoseValue = rawValue["egv"] as? Double { - eventualGlucose = HKQuantity(unit: preferredGlucoseUnit ?? .milligramsPerDeciliter(), doubleValue: glucoseValue) + eventualGlucose = HKQuantity(unit: unit, doubleValue: glucoseValue) } glucoseTrendRawValue = rawValue["gt"] as? Int @@ -90,6 +95,22 @@ final class WatchContext: NSObject, RawRepresentable { recommendedBolusDose = rawValue["rbo"] as? Double COB = rawValue["cob"] as? Double maxBolus = rawValue["mb"] as? Double + + if let rawValue = rawValue["pg"] as? WatchPredictedGlucose.RawValue { + predictedGlucose = WatchPredictedGlucose(rawValue: rawValue) + } + + if let rawValue = rawValue["tr"] as? [WatchDatedRange.RawValue] { + targetRanges = rawValue.compactMap({return WatchDatedRange(rawValue: $0)}) + } + + if let rawValue = rawValue["to"] as? WatchDatedRange.RawValue { + temporaryOverride = WatchDatedRange(rawValue: rawValue) + } + + if let cgmRawValue = rawValue["cgm"] as? CGM.RawValue { + cgm = CGM(rawValue: cgmRawValue) + } } var rawValue: RawValue { @@ -100,9 +121,12 @@ final class WatchContext: NSObject, RawRepresentable { raw["ba"] = lastNetTempBasalDose raw["bad"] = lastNetTempBasalDate raw["bp"] = batteryPercentage + + raw["cgm"] = cgm?.rawValue + raw["cob"] = COB - let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter() + let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter raw["egv"] = eventualGlucose?.doubleValue(for: unit) raw["gu"] = preferredGlucoseUnit?.unitString raw["gv"] = glucose?.doubleValue(for: unit) @@ -118,6 +142,11 @@ final class WatchContext: NSObject, RawRepresentable { raw["rbo"] = recommendedBolusDose raw["rp"] = reservoirPercentage + raw["pg"] = predictedGlucose?.rawValue + + raw["tr"] = targetRanges?.map { $0.rawValue } + raw["to"] = temporaryOverride?.rawValue + return raw } } diff --git a/Common/Models/WatchDatedRange.swift b/Common/Models/WatchDatedRange.swift new file mode 100644 index 0000000000..855f22bd6e --- /dev/null +++ b/Common/Models/WatchDatedRange.swift @@ -0,0 +1,54 @@ +// +// WatchDatedRange.swift +// WatchApp Extension +// +// Created by Bharat Mediratta on 6/26/18. +// Copyright © 2018 LoopKit Authors. All rights reserved. +// + +import Foundation + + +struct WatchDatedRange { + public let startDate: Date + public let endDate: Date + public let minValue: Double + public let maxValue: Double + + public init(startDate: Date, endDate: Date, minValue: Double, maxValue: Double) { + self.startDate = startDate + self.endDate = endDate + self.minValue = minValue + self.maxValue = maxValue + } +} + + +extension WatchDatedRange: RawRepresentable { + typealias RawValue = [String: Any] + + var rawValue: RawValue { + return [ + "sd": startDate, + "ed": endDate, + "mi": minValue, + "ma": maxValue + ] + } + + init?(rawValue: RawValue) { + guard + let startDate = rawValue["sd"] as? Date, + let endDate = rawValue["ed"] as? Date, + let minValue = rawValue["mi"] as? Double, + let maxValue = rawValue["ma"] as? Double + else { + return nil + } + + self.startDate = startDate + self.endDate = endDate + self.minValue = minValue + self.maxValue = maxValue + } +} diff --git a/Common/Models/WatchHistoricalGlucose.swift b/Common/Models/WatchHistoricalGlucose.swift new file mode 100644 index 0000000000..f4214625e6 --- /dev/null +++ b/Common/Models/WatchHistoricalGlucose.swift @@ -0,0 +1,51 @@ +// +// WatchHistoricalGlucose.swift +// Loop +// +// Created by Bharat Mediratta on 6/22/18. +// Copyright © 2018 LoopKit Authors. All rights reserved. +// + +import Foundation +import HealthKit +import LoopKit + + +struct WatchHistoricalGlucose { + let samples: [NewGlucoseSample] + + init(with samples: [StoredGlucoseSample]) { + self.samples = samples.map { + NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, syncIdentifier: $0.syncIdentifier) + } + } +} + + +extension WatchHistoricalGlucose: RawRepresentable { + typealias RawValue = [String: Any] + + var rawValue: RawValue { + return [ + "d": samples.map { $0.date }, + "v": samples.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) }, + "id": samples.map { $0.syncIdentifier } + ] + } + + init?(rawValue: RawValue) { + guard + let dates = rawValue["d"] as? [Date], + let values = rawValue["v"] as? [Int16], + let syncIdentifiers = rawValue["id"] as? [String], + dates.count == values.count, + dates.count == syncIdentifiers.count + else { + return nil + } + + self.samples = (0.. 1 else { + return nil + } + self.values = values + } +} + + +extension WatchPredictedGlucose: RawRepresentable { + typealias RawValue = [String: Any] + + var rawValue: RawValue { + + return [ + "v": values.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) }, + "d": values[0].startDate, + "i": values[1].startDate.timeIntervalSince(values[0].startDate) + ] + } + + init?(rawValue: RawValue) { + guard + let values = rawValue["v"] as? [Int16], + let firstDate = rawValue["d"] as? Date, + let interval = rawValue["i"] as? TimeInterval + else { + return nil + } + + self.values = values.enumerated().map { tuple in + PredictedGlucoseValue(startDate: firstDate + Double(tuple.0) * interval, + quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(tuple.1))) + } + } +} diff --git a/DoseMathTests/DoseMathTests.swift b/DoseMathTests/DoseMathTests.swift index f54990834b..9b2718701a 100644 --- a/DoseMathTests/DoseMathTests.swift +++ b/DoseMathTests/DoseMathTests.swift @@ -8,7 +8,6 @@ import XCTest import HealthKit -import InsulinKit import LoopKit @@ -62,7 +61,7 @@ class RecommendTempBasalTests: XCTestCase { return fixture.map { return GlucoseFixtureValue( startDate: dateFormatter.date(from: $0["date"] as! String)!, - quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double) + quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter, doubleValue: $0["amount"] as! Double) ) } } @@ -82,15 +81,15 @@ class RecommendTempBasalTests: XCTestCase { } var glucoseTargetRange: GlucoseRangeSchedule { - return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], overrideRanges: [:])! + return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], overrideRanges: [:])! } var insulinSensitivitySchedule: InsulinSensitivitySchedule { - return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])! + return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])! } var suspendThreshold: GlucoseThreshold { - return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55) + return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter, value: 55) } var insulinModel: InsulinModel { @@ -366,7 +365,7 @@ class RecommendTempBasalTests: XCTestCase { XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration) // Use mmol sensitivity value - let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])! + let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter, dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 3.33)])! dose = glucose.recommendedTempBasal( to: glucoseTargetRange, @@ -448,7 +447,7 @@ class RecommendBolusTests: XCTestCase { return fixture.map { return GlucoseFixtureValue( startDate: dateFormatter.date(from: $0["date"] as! String)!, - quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: $0["amount"] as! Double) + quantity: HKQuantity(unit: HKUnit.milligramsPerDeciliter, doubleValue: $0["amount"] as! Double) ) } } @@ -468,15 +467,15 @@ class RecommendBolusTests: XCTestCase { } var glucoseTargetRange: GlucoseRangeSchedule { - return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], overrideRanges: [:])! + return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], overrideRanges: [:])! } var insulinSensitivitySchedule: InsulinSensitivitySchedule { - return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])! + return InsulinSensitivitySchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 60.0)])! } var suspendThreshold: GlucoseThreshold { - return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter(), value: 55) + return GlucoseThreshold(unit: HKUnit.milligramsPerDeciliter, value: 55) } var insulinModel: InsulinModel { @@ -567,7 +566,7 @@ class RecommendBolusTests: XCTestCase { XCTAssertEqual(1.575, dose.amount) if case BolusRecommendationNotice.currentGlucoseBelowTarget(let glucose) = dose.notice! { - XCTAssertEqual(glucose.quantity.doubleValue(for: .milligramsPerDeciliter()), 60) + XCTAssertEqual(glucose.quantity.doubleValue(for: .milligramsPerDeciliter), 60) } else { XCTFail("Expected currentGlucoseBelowTarget, but got \(dose.notice!)") } @@ -580,7 +579,7 @@ class RecommendBolusTests: XCTestCase { let dose = glucose.recommendedBolus( to: glucoseTargetRange, at: glucose.first!.startDate, - suspendThreshold: HKQuantity(unit: .milligramsPerDeciliter(), doubleValue: 70), + suspendThreshold: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 70), sensitivity: insulinSensitivitySchedule, model: insulinModel, pendingInsulin: 0, @@ -590,7 +589,7 @@ class RecommendBolusTests: XCTestCase { XCTAssertEqual(0, dose.amount) if case BolusRecommendationNotice.glucoseBelowSuspendThreshold(let glucose) = dose.notice! { - XCTAssertEqual(glucose.quantity.doubleValue(for: .milligramsPerDeciliter()), 60) + XCTAssertEqual(glucose.quantity.doubleValue(for: .milligramsPerDeciliter), 60) } else { XCTFail("Expected currentGlucoseBelowTarget, but got \(dose.notice!)") } @@ -613,7 +612,7 @@ class RecommendBolusTests: XCTestCase { XCTAssertEqual(0, dose.amount) if case BolusRecommendationNotice.glucoseBelowSuspendThreshold(let glucose) = dose.notice! { - XCTAssertEqual(glucose.quantity.doubleValue(for: .milligramsPerDeciliter()), 60) + XCTAssertEqual(glucose.quantity.doubleValue(for: .milligramsPerDeciliter), 60) } else { XCTFail("Expected currentGlucoseBelowTarget, but got \(dose.notice!)") } @@ -737,7 +736,7 @@ class RecommendBolusTests: XCTestCase { let dose = glucose.recommendedBolus( to: glucoseTargetRange, at: glucose.first!.startDate, - suspendThreshold: HKQuantity(unit: .milligramsPerDeciliter(), doubleValue: 0), + suspendThreshold: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 0), sensitivity: insulinSensitivitySchedule, model: ExponentialInsulinModel(actionDuration: 21600.0, peakActivityTime: 4500.0), pendingInsulin: 0, @@ -763,7 +762,7 @@ class RecommendBolusTests: XCTestCase { XCTAssertEqual(1.25, dose.amount) // Use mmol sensitivity value - let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter(), dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])! + let insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: HKUnit.millimolesPerLiter, dailyItems: [RepeatingScheduleValue(startTime: 0.0, value: 10.0 / 3)])! dose = glucose.recommendedBolus( to: glucoseTargetRange, diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist index 6d86f6a299..b8493765dc 100644 --- a/DoseMathTests/Info.plist +++ b/DoseMathTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.5.6 + 1.5.7dev CFBundleSignature ???? CFBundleVersion diff --git a/Loop Status Extension/Base.lproj/MainInterface.storyboard b/Loop Status Extension/Base.lproj/MainInterface.storyboard index 154bdf9b27..5b5eb74e56 100644 --- a/Loop Status Extension/Base.lproj/MainInterface.storyboard +++ b/Loop Status Extension/Base.lproj/MainInterface.storyboard @@ -1,11 +1,11 @@ - + - + diff --git a/Loop Status Extension/DatedRangedContextCalculator.swift b/Loop Status Extension/DatedRangedContextCalculator.swift deleted file mode 100644 index e6f75d02d2..0000000000 --- a/Loop Status Extension/DatedRangedContextCalculator.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// DateRangedContextCalculator.swift -// Loop -// -// Created by Bharat Mediratta on 3/21/17. -// Copyright © 2017 LoopKit Authors. All rights reserved. -// - -import Foundation -import SwiftCharts - -import LoopUI - -class DatedRangeContextCalculator: TargetPointsCalculator { - - var targetRanges: [DatedRangeContext]? - var temporaryOverride: DatedRangeContext? - - var glucosePoints: [ChartPoint] = [] - var overridePoints: [ChartPoint] = [] - var overrideDurationPoints: [ChartPoint] = [] - - init(targetRanges: [DatedRangeContext]?, temporaryOverride: DatedRangeContext?) { - self.targetRanges = targetRanges - self.temporaryOverride = temporaryOverride - } - - func calculate(_ xAxisValues: [ChartAxisValue]?) { - if let xAxisValues = xAxisValues, xAxisValues.count > 1, - let targetRanges = targetRanges - { - glucosePoints = ChartPoint.pointsForDatedRanges(targetRanges, xAxisValues: xAxisValues) - - if let override = temporaryOverride { - overridePoints = ChartPoint.pointsForDatedRangeOverride(override, xAxisValues: xAxisValues) - overrideDurationPoints = ChartPoint.pointsForDatedRangeOverrideDuration(override, xAxisValues: xAxisValues) - } else { - overridePoints = [] - overrideDurationPoints = [] - } - } - } -} diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist index 9f091d68bf..fc0a625ed3 100644 --- a/Loop Status Extension/Info.plist +++ b/Loop Status Extension/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.5.6 + 1.5.7dev CFBundleVersion $(CURRENT_PROJECT_VERSION) AppGroupIdentifier diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift index d388476b90..68d1856898 100644 --- a/Loop Status Extension/StatusViewController.swift +++ b/Loop Status Extension/StatusViewController.swift @@ -8,6 +8,7 @@ import CoreData import HealthKit +import LoopKit import LoopUI import NotificationCenter import UIKit @@ -51,19 +52,41 @@ class StatusViewController: UIViewController, NCWidgetProviding { ) charts.glucoseDisplayRange = ( - min: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 100), - max: HKQuantity(unit: HKUnit.milligramsPerDeciliter(), doubleValue: 175) + min: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 100), + max: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 175) ) return charts }() var statusExtensionContext: StatusExtensionContext? - var defaults: UserDefaults? - final var observationContext = 1 + + lazy var defaults = UserDefaults(suiteName: Bundle.main.appGroupSuiteName) + + private var observers: [Any] = [] + + lazy var healthStore = HKHealthStore() + + lazy var cacheStore = PersistenceController.controllerInAppGroupDirectory() + + lazy var glucoseStore = GlucoseStore( + healthStore: healthStore, + cacheStore: cacheStore, + observationEnabled: false + ) + + lazy var doseStore = DoseStore( + healthStore: healthStore, + cacheStore: cacheStore, + observationEnabled: false, + insulinModel: defaults?.insulinModelSettings?.model, + basalProfile: defaults?.basalRateSchedule, + insulinSensitivitySchedule: defaults?.insulinSensitivitySchedule + ) override func viewDidLoad() { super.viewDidLoad() + subtitleLabel.isHidden = true subtitleLabel.textColor = .subtitleLabelColor insulinLabel.isHidden = true @@ -72,28 +95,28 @@ class StatusViewController: UIViewController, NCWidgetProviding { let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openLoopApp(_:))) view.addGestureRecognizer(tapGestureRecognizer) - defaults = UserDefaults(suiteName: Bundle.main.appGroupSuiteName) - if let defaults = defaults { - defaults.addObserver( - self, - forKeyPath: defaults.statusExtensionContextObservableKey, - options: [], - context: &observationContext - ) + self.charts.prerender() + glucoseChartContentView.chartGenerator = { [weak self] (frame) in + return self?.charts.glucoseChartWithFrame(frame)?.view } - self.charts.prerender() - glucoseChartContentView.chartGenerator = { [unowned self] (frame) in - return self.charts.glucoseChartWithFrame(frame)?.view + extensionContext?.widgetLargestAvailableDisplayMode = .expanded + + switch extensionContext?.widgetActiveDisplayMode ?? .compact { + case .compact: + glucoseChartContentView.isHidden = true + case .expanded: + glucoseChartContentView.isHidden = false } - self.extensionContext?.widgetLargestAvailableDisplayMode = NCWidgetDisplayMode.expanded - glucoseChartContentView.isHidden = self.extensionContext?.widgetActiveDisplayMode != .expanded + observers = [ + // TODO: Observe cross-process notifications of Loop status updating + ] } deinit { - if let defaults = defaults { - defaults.removeObserver(self, forKeyPath: defaults.statusExtensionContextObservableKey, context: &observationContext) + for observer in observers { + NotificationCenter.default.removeObserver(observer) } } @@ -116,15 +139,6 @@ class StatusViewController: UIViewController, NCWidgetProviding { self.glucoseChartContentView.isHidden = self.extensionContext?.widgetActiveDisplayMode != .expanded }) } - - override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { - guard context == &observationContext else { - super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) - return - } - - update() - } @objc private func openLoopApp(_: Any) { if let url = Bundle.main.mainAppUrl { @@ -139,115 +153,158 @@ class StatusViewController: UIViewController, NCWidgetProviding { @discardableResult func update() -> NCUpdateResult { - guard let context = defaults?.statusExtensionContext else { - return NCUpdateResult.failed - } - if let lastGlucose = context.glucose?.last { - hudView.glucoseHUD.setGlucoseQuantity(lastGlucose.value, - at: lastGlucose.startDate, - unit: lastGlucose.unit, - sensor: context.sensor - ) - } - - if let batteryPercentage = context.batteryPercentage { - hudView.batteryHUD.batteryLevel = Double(batteryPercentage) - } - - if let reservoir = context.reservoir { - hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(reservoir.capacity)))) - hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate) - } + subtitleLabel.isHidden = true + insulinLabel.isHidden = true + + let group = DispatchGroup() - if let netBasal = context.netBasal { - hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percentage, at: netBasal.start) + var activeInsulin: Double? + var lastReservoirValue: ReservoirValue? + var glucose: [StoredGlucoseSample] = [] + + group.enter() + doseStore.insulinOnBoard(at: Date()) { (result) in + switch result { + case .success(let iobValue): + activeInsulin = iobValue.value + case .failure: + activeInsulin = nil + } + group.leave() } - if let loop = context.loop { - hudView.loopCompletionHUD.dosingEnabled = loop.dosingEnabled - hudView.loopCompletionHUD.lastLoopCompleted = loop.lastCompleted + group.enter() + doseStore.getReservoirValues(since: .distantPast, limit: 1) { (result) in + switch result { + case .success(let values): + lastReservoirValue = values.first + case .failure: + lastReservoirValue = nil + } + group.leave() } - subtitleLabel.isHidden = true - insulinLabel.isHidden = true + charts.startDate = Calendar.current.nextDate(after: Date(timeIntervalSinceNow: .minutes(-5)), matching: DateComponents(minute: 0), matchingPolicy: .strict, direction: .backward) ?? Date() + + // Showing the whole history plus full prediction in the glucose plot + // is a little crowded, so limit it to three hours in the future: + charts.maxEndDate = charts.startDate.addingTimeInterval(TimeInterval(hours: 3)) - let dateFormatter: DateFormatter = { - let dateFormatter = DateFormatter() - dateFormatter.dateStyle = .none - dateFormatter.timeStyle = .short - - return dateFormatter - }() - - let insulinFormatter: NumberFormatter = { - let numberFormatter = NumberFormatter() - - numberFormatter.numberStyle = .decimal - numberFormatter.minimumFractionDigits = 1 - numberFormatter.maximumFractionDigits = 1 - - return numberFormatter - }() - - if let activeInsulin = context.activeInsulin, let valueStr = insulinFormatter.string(from:NSNumber(value:activeInsulin)) - { - insulinLabel.text = String(format: NSLocalizedString( - "IOB %1$@ U", - comment: "The subtitle format describing units of active insulin. (1: localized insulin value description)"), - valueStr) - insulinLabel.isHidden = false + group.enter() + glucoseStore.getCachedGlucoseSamples(start: charts.startDate) { (result) in + glucose = result + group.leave() } - - if let glucose = context.glucose, - glucose.count > 0 { - let unit = glucose[0].unit + + group.notify(queue: .main) { + guard let defaults = self.defaults, let context = defaults.statusExtensionContext else { + return + } + + if let batteryPercentage = context.batteryPercentage { + self.hudView.batteryHUD.batteryLevel = Double(batteryPercentage) + } + + if let reservoir = lastReservoirValue, let capacity = context.reservoirCapacity { + self.hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / capacity))) + self.hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate) + } + + if let netBasal = context.netBasal { + self.hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percentage, at: netBasal.start) + } + + self.hudView.loopCompletionHUD.dosingEnabled = defaults.loopSettings?.dosingEnabled ?? false + + if let lastCompleted = context.lastLoopCompleted { + self.hudView.loopCompletionHUD.lastLoopCompleted = lastCompleted + } + + if let activeInsulin = activeInsulin { + let insulinFormatter: NumberFormatter = { + let numberFormatter = NumberFormatter() + + numberFormatter.numberStyle = .decimal + numberFormatter.minimumFractionDigits = 1 + numberFormatter.maximumFractionDigits = 1 + + return numberFormatter + }() + + if let valueStr = insulinFormatter.string(from: activeInsulin) { + self.insulinLabel.text = String(format: NSLocalizedString("IOB %1$@ U", + comment: "The subtitle format describing units of active insulin. (1: localized insulin value description)"), + valueStr + ) + self.insulinLabel.isHidden = false + } + } + + guard let unit = context.predictedGlucose?.unit else { + return + } + + if let lastGlucose = glucose.last { + self.hudView.glucoseHUD.setGlucoseQuantity( + lastGlucose.quantity.doubleValue(for: unit), + at: lastGlucose.startDate, + unit: unit, + sensor: context.sensor + ) + } + let glucoseFormatter = NumberFormatter.glucoseFormatter(for: unit) - charts.glucoseUnit = unit - charts.glucosePoints = glucose.map { + let dateFormatter: DateFormatter = { + let dateFormatter = DateFormatter() + dateFormatter.dateStyle = .none + dateFormatter.timeStyle = .short + + return dateFormatter + }() + + self.charts.glucoseUnit = unit + self.charts.glucosePoints = glucose.map { ChartPoint( x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter), - y: ChartAxisValueDoubleUnit($0.value, unitString: unit.unitString, formatter: glucoseFormatter) + y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: unit), unitString: unit.localizedShortUnitString, formatter: glucoseFormatter) ) } - // Anchor the start date of the chart to the earliest date we have in our historical glucose - if let first = glucose.first { - charts.startDate = first.startDate - } - - // Showing the whole history plus full prediction in the glucose plot - // is a little crowded, so limit it to three hours in the future: - charts.maxEndDate = Date().addingTimeInterval(TimeInterval(hours: 3)) - if let predictedGlucose = context.predictedGlucose?.samples { - charts.predictedGlucosePoints = predictedGlucose.map { + self.charts.predictedGlucosePoints = predictedGlucose.map { ChartPoint( x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter), - y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: unit), unitString: unit.unitString, formatter: glucoseFormatter) + y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: unit), unitString: unit.localizedShortUnitString, formatter: glucoseFormatter) ) } if let eventualGlucose = predictedGlucose.last { - let formatter = NumberFormatter.glucoseFormatter(for: eventualGlucose.unit) - - if let eventualGlucoseNumberString = formatter.string(from: NSNumber(value: eventualGlucose.quantity.doubleValue(for: unit))) { - subtitleLabel.text = String( + if let eventualGlucoseNumberString = glucoseFormatter.string(from: eventualGlucose.quantity.doubleValue(for: unit)) { + self.subtitleLabel.text = String( format: NSLocalizedString( "Eventually %1$@ %2$@", - comment: "The subtitle format describing eventual glucose. (1: localized glucose value description) (2: localized glucose units description)"), + comment: "The subtitle format describing eventual glucose. (1: localized glucose value description) (2: localized glucose units description)" + ), eventualGlucoseNumberString, - unit.glucoseUnitDisplayString + unit.localizedShortUnitString ) - subtitleLabel.isHidden = false + self.subtitleLabel.isHidden = false } } } - charts.targetPointsCalculator = DatedRangeContextCalculator(targetRanges: context.targetRanges, temporaryOverride: context.temporaryOverride) + self.charts.targetGlucoseSchedule = defaults.loopSettings?.glucoseTargetRangeSchedule - charts.prerender() - glucoseChartContentView.reloadChart() + self.charts.prerender() + self.glucoseChartContentView.reloadChart() + } + + switch extensionContext?.widgetActiveDisplayMode ?? .compact { + case .compact: + glucoseChartContentView.isHidden = true + case .expanded: + glucoseChartContentView.isHidden = false } // Right now we always act as if there's new data. diff --git a/Loop Status Extension/UIColor+Widget.swift b/Loop Status Extension/UIColor+Widget.swift index 5ae2e95efc..e97e76504e 100644 --- a/Loop Status Extension/UIColor+Widget.swift +++ b/Loop Status Extension/UIColor+Widget.swift @@ -7,7 +7,7 @@ // import UIKit -import LoopUI + extension UIColor { @nonobjc static let axisLabelColor = subtitleLabelColor diff --git a/Loop.xcconfig b/Loop.xcconfig index d092e89a38..ab57d0d2a7 100644 --- a/Loop.xcconfig +++ b/Loop.xcconfig @@ -6,6 +6,6 @@ // 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.loopkit +// This is automatically disambiguated by development team, but you may choose to change this to +// support running multiple apps simultaneously. +MAIN_APP_BUNDLE_IDENTIFIER = com.${DEVELOPMENT_TEAM}.loopkit diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index 573e187130..595058300e 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -6,42 +6,73 @@ objectVersion = 48; objects = { +/* Begin PBXAggregateTarget section */ + 432CF87720D8B8380066B889 /* Cartfile */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 432CF87820D8B8380066B889 /* Build configuration list for PBXAggregateTarget "Cartfile" */; + buildPhases = ( + 432CF88220D8BCD90066B889 /* Homebrew & Carthage Setup */, + 432CF87B20D8B8490066B889 /* Build Carthage Dependencies */, + ); + dependencies = ( + ); + name = Cartfile; + productName = Cartfile; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 43027F0F1DFE0EC900C51989 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; }; 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 */; }; - 43045E581F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43045E571F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift */; }; 43076BF31DFDBC4B0012A723 /* it.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 43076BF21DFDBC4B0012A723 /* it.lproj */; }; 4309786C1E73D2F500BEBC82 /* it.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 4309786B1E73D2F500BEBC82 /* it.lproj */; }; 4309786E1E73DAD100BEBC82 /* CGM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4309786D1E73DAD100BEBC82 /* CGM.swift */; }; + 430B298A2041F54A00BA9F93 /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B29892041F54A00BA9F93 /* NSUserDefaults.swift */; }; + 430B298B2041F55700BA9F93 /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B29892041F54A00BA9F93 /* NSUserDefaults.swift */; }; + 430B298E2041F56500BA9F93 /* LoopSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B298C2041F56500BA9F93 /* LoopSettings.swift */; }; + 430B298F2041F56500BA9F93 /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */; }; + 430B29902041F57000BA9F93 /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */; }; + 430B29912041F57200BA9F93 /* LoopSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B298C2041F56500BA9F93 /* LoopSettings.swift */; }; + 430B29932041F5B300BA9F93 /* UserDefaults+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B29922041F5B200BA9F93 /* UserDefaults+Loop.swift */; }; + 430B29952041F5CB00BA9F93 /* LoopSettings+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B29942041F5CB00BA9F93 /* LoopSettings+Loop.swift */; }; 430D85891F44037000AF2D4F /* HUDViewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */; }; 430DA58E1D4AEC230097D1CA /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; }; - 430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */; }; 4311FB9B1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.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 */; }; 431A8C401EC6E8AB00823B9C /* CircleMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431A8C3F1EC6E8AB00823B9C /* CircleMaskView.swift */; }; + 431E73481FF95A900069B5F7 /* PersistenceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431E73471FF95A900069B5F7 /* PersistenceController.swift */; }; 4326BA641F3A44D9007CCAD4 /* ChartLineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4326BA631F3A44D9007CCAD4 /* ChartLineModel.swift */; }; - 4328E01A1CFBE1DA00E199AA /* StatusInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0151CFBE1DA00E199AA /* StatusInterfaceController.swift */; }; + 4328E01A1CFBE1DA00E199AA /* ActionHUDController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0151CFBE1DA00E199AA /* ActionHUDController.swift */; }; 4328E01B1CFBE1DA00E199AA /* BolusInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0161CFBE1DA00E199AA /* BolusInterfaceController.swift */; }; 4328E01E1CFBE25F00E199AA /* AddCarbsInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E01D1CFBE25F00E199AA /* AddCarbsInterfaceController.swift */; }; 4328E0261CFBE2C500E199AA /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0201CFBE2C500E199AA /* IdentifiableClass.swift */; }; 4328E0281CFBE2C500E199AA /* CLKComplicationTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0221CFBE2C500E199AA /* CLKComplicationTemplate.swift */; }; - 4328E0291CFBE2C500E199AA /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0231CFBE2C500E199AA /* NSUserDefaults.swift */; }; 4328E02A1CFBE2C500E199AA /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0241CFBE2C500E199AA /* UIColor.swift */; }; 4328E02B1CFBE2C500E199AA /* WKAlertAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0251CFBE2C500E199AA /* WKAlertAction.swift */; }; 4328E02F1CFBF81800E199AA /* WKInterfaceImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E02E1CFBF81800E199AA /* WKInterfaceImage.swift */; }; 4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */; }; 4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0341CFC0AE100E199AA /* WatchDataManager.swift */; }; + 432CF87520D8AC950066B889 /* NSUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0231CFBE2C500E199AA /* NSUserDefaults.swift */; }; 432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */; }; - 433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */; }; 433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */; }; 4341F4EB1EDB92AC001C936B /* LogglyService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4341F4EA1EDB92AC001C936B /* LogglyService.swift */; }; 43441A9C1EDB34810087958C /* StatusExtensionContext+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */; }; - 43441AA01EDB4D390087958C /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43441A9F1EDB4D390087958C /* OSLog.swift */; }; + 4344628020A7A37400C4BE6F /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4344627F20A7A37400C4BE6F /* HealthKit.framework */; }; + 4344628220A7A37F00C4BE6F /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4344628120A7A37E00C4BE6F /* CoreBluetooth.framework */; }; + 4344628520A7A3BE00C4BE6F /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4344628320A7A3BE00C4BE6F /* LoopKit.framework */; }; + 4344628620A7A3BE00C4BE6F /* CGMBLEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4344628420A7A3BE00C4BE6F /* CGMBLEKit.framework */; }; + 4344628E20A7ADD100C4BE6F /* UserDefaults+CGM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4344628D20A7ADD100C4BE6F /* UserDefaults+CGM.swift */; }; + 4344628F20A7ADD500C4BE6F /* UserDefaults+CGM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4344628D20A7ADD100C4BE6F /* UserDefaults+CGM.swift */; }; + 4344629220A7C19800C4BE6F /* ButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4344629120A7C19800C4BE6F /* ButtonGroup.swift */; }; + 4344629820A8B2D700C4BE6F /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; }; 4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */; }; - 4346D1F61C78501000ABAFE3 /* ChartPoint+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1F51C78501000ABAFE3 /* ChartPoint+Loop.swift */; }; + 434B288420661D29000EE07B /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 434B288520661D29000EE07B /* LoopKit.framework */; }; + 434B2886206628B3000EE07B /* PersistenceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431E73471FF95A900069B5F7 /* PersistenceController.swift */; }; + 434B2887206B4F07000EE07B /* WalshInsulinModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */; }; + 434B2888206B4F0A000EE07B /* InsulinModelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */; }; + 434B2889206B4F0C000EE07B /* ExponentialInsulinModelPreset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.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 */; }; @@ -52,8 +83,6 @@ 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 */; }; - 4353D176203D4D3C007B4ECD /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4353D175203D4D3C007B4ECD /* HealthKit.framework */; }; - 4353D178203D4DDA007B4ECD /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4353D177203D4DDA007B4ECD /* CoreBluetooth.framework */; }; 435400311C9F744E00D5819C /* BolusSuggestionUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */; }; 435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */; }; 435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */; }; @@ -62,15 +91,22 @@ 435CB6251F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift */; }; 435CB6271F37AE5600C320C7 /* WalshInsulinModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */; }; 435CB6291F37B01300C320C7 /* InsulinModelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */; }; + 4365050520A793FA00EA8D7A /* CGM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4309786D1E73DAD100BEBC82 /* CGM.swift */; }; 436961911F19D11E00447E89 /* ChartPointsContextFillLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4369618F1F19C86400447E89 /* ChartPointsContextFillLayer.swift */; }; 436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0DA41D236A2A00104B24 /* LoopError.swift */; }; 436D9BF81F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json in Resources */ = {isa = PBXBuildFile; fileRef = 436D9BF71F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json */; }; - 436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */; }; + 43709AEA20DF3F8200F941B3 /* MinimedKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43709AE920DF3F8200F941B3 /* MinimedKitUI.framework */; }; + 4374B5EF209D84BF00D17AA8 /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; }; + 4374B5F0209D857E00D17AA8 /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; }; + 4374B5F2209D897600D17AA8 /* Locked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5F1209D897600D17AA8 /* Locked.swift */; }; + 4374B5F4209D89A900D17AA8 /* TextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */; }; 43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43776F8F1B8022E90074EA36 /* AppDelegate.swift */; }; 43776F971B8022E90074EA36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F951B8022E90074EA36 /* Main.storyboard */; }; 43776F991B8022E90074EA36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 43776F981B8022E90074EA36 /* Assets.xcassets */; }; 437AFEE42035252A008C4892 /* RileyLinkBLEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */; }; 437AFEE520352591008C4892 /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F70C1DD1DE8DCA7006380B7 /* NotificationCenter.framework */; }; + 437AFEE7203688CF008C4892 /* LoopKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 437AFEE6203688CF008C4892 /* LoopKitUI.framework */; }; + 437AFEE8203689FE008C4892 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; }; 437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CCAD91D284ADF0075D2C3 /* AuthenticationTableViewCell.swift */; }; 437CCADC1D284B830075D2C3 /* ButtonTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */; }; 437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CCADD1D2858FD0075D2C3 /* AuthenticationViewController.swift */; }; @@ -78,9 +114,7 @@ 437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */; }; 437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */; }; 438172D91F4E9E37003C3328 /* NewPumpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438172D81F4E9E37003C3328 /* NewPumpEvent.swift */; }; - 4381D2261F3C0FDD004ACCF9 /* RileyLinkDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4381D2251F3C0FDD004ACCF9 /* RileyLinkDevice.swift */; }; 43846AD51D8FA67800799272 /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 43846AD41D8FA67800799272 /* Base.lproj */; }; - 43846ADB1D91057000799272 /* ContextUpdatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43846ADA1D91057000799272 /* ContextUpdatable.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 */; }; @@ -92,11 +126,9 @@ 439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897361CD2F80600223065 /* AnalyticsManager.swift */; }; 439BED2A1E76093C00B0AED5 /* CGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED291E76093C00B0AED5 /* CGMManager.swift */; }; 439BED2C1E760A7A00B0AED5 /* DexCGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED2B1E760A7A00B0AED5 /* DexCGMManager.swift */; }; - 439BED2E1E760BC600B0AED5 /* EnliteCGMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439BED2D1E760BC600B0AED5 /* EnliteCGMManager.swift */; }; 43A51E1F1EB6D62A000736CC /* CarbAbsorptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A51E1E1EB6D62A000736CC /* CarbAbsorptionViewController.swift */; }; 43A51E211EB6DBDD000736CC /* ChartsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A51E201EB6DBDD000736CC /* ChartsTableViewController.swift */; }; 43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A567681C94880B00334FAC /* LoopDataManager.swift */; }; - 43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */; }; 43A943761B926B7B0051FA24 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43A943741B926B7B0051FA24 /* Interface.storyboard */; }; 43A9437F1B926B7B0051FA24 /* WatchApp Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 43A9437E1B926B7B0051FA24 /* WatchApp Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 43A943881B926B7B0051FA24 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A943871B926B7B0051FA24 /* ExtensionDelegate.swift */; }; @@ -119,9 +151,10 @@ 43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C094491CACCC73001F6403 /* NotificationManager.swift */; }; 43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C246A71D89990F0031F8D1 /* Crypto.framework */; }; 43C2FAE11EB656A500364AFF /* GlucoseEffectVelocity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */; }; + 43C3B6EC20B650A80026CAFA /* SettingsImageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */; }; + 43C3B6ED20B884500026CAFA /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */; }; 43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */; }; 43C513191E864C4E001547C7 /* GlucoseRangeSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */; }; - 43C6407C1DA051850093E25D /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; }; 43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CA93361CB98079000026B5 /* MinimedKit.framework */; }; 43CB2B2B1D924D450079823D /* WCSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CB2B2A1D924D450079823D /* WCSession.swift */; }; 43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDD1CA8B63E003CC1B0 /* Data.swift */; }; @@ -129,13 +162,14 @@ 43D2E8231F00425400AE5CBF /* BolusViewController+LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D2E8221F00425400AE5CBF /* BolusViewController+LoopDataManager.swift */; }; 43D381621EBD9759007F8C8F /* HeaderValuesTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */; }; 43D848B01E7DCBE100DADCBC /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848AF1E7DCBE100DADCBC /* Result.swift */; }; - 43D848B21E7DF42500DADCBC /* LoopSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848B11E7DF42500DADCBC /* LoopSettings.swift */; }; + 43DAD00020A2736F000F8529 /* PersistedPumpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DACFFF20A2736F000F8529 /* PersistedPumpEvent.swift */; }; 43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */; }; 43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0521C93EC8200B3C386 /* DeviceDataManager.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 */; }; 43DE92611C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */; }; + 43DFB62320D4CAE7008A7BAE /* PumpManagerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6F620BBCAA30026CAFA /* PumpManagerState.swift */; }; 43E0F0A51E46D1670064F7CE /* LevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E0F0A41E46D1670064F7CE /* LevelHUDView.swift */; }; 43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E2D8C51D204678004DA55F /* KeychainManager.swift */; }; 43E2D8C81D208D5B004DA55F /* KeychainManager+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E2D8C71D208D5B004DA55F /* KeychainManager+Loop.swift */; }; @@ -157,7 +191,6 @@ 43E2D9171D2226BD004DA55F /* LoopKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 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 */; }; 43E397A31D56B9E40028E321 /* Glucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E397A21D56B9E40028E321 /* Glucose.swift */; }; 43E93FB51E4675E800EAB8DB /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; }; 43E93FB61E469A4000EAB8DB /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; }; @@ -165,13 +198,10 @@ 43F1C31A1F5DC87700395429 /* ChartPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438991661E91B563000EEF90 /* ChartPoint.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 */; }; 43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; }; 43FCBBC21E51710B00343C1B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F9A1B8022E90074EA36 /* LaunchScreen.storyboard */; }; 4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */; }; @@ -179,12 +209,13 @@ 4F08DE8F1E7BB871006741EA /* CollectionType+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F08DE8E1E7BB871006741EA /* CollectionType+Loop.swift */; }; 4F08DE9B1E7BC4ED006741EA /* SwiftCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */; }; 4F08DE9D1E81D0E9006741EA /* StatusChartsManager+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430C1ABC1E5568A80067F1AE /* StatusChartsManager+LoopKit.swift */; }; - 4F08DEA11E81D90F006741EA /* GlucoseRangeScheduleCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F08DEA01E81D90F006741EA /* GlucoseRangeScheduleCalculator.swift */; }; - 4F08DEA31E81E12D006741EA /* DatedRangedContextCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F08DEA21E81E12D006741EA /* DatedRangedContextCalculator.swift */; }; + 4F11D3C020DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F11D3BF20DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift */; }; + 4F11D3C220DD80B3006E072C /* WatchHistoricalGlucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F11D3C120DD80B3006E072C /* WatchHistoricalGlucose.swift */; }; + 4F11D3C320DD84DB006E072C /* GlucoseBackfillRequestUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F11D3BF20DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift */; }; + 4F11D3C420DD881A006E072C /* WatchHistoricalGlucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F11D3C120DD80B3006E072C /* WatchHistoricalGlucose.swift */; }; 4F20AE621E6B879C00D07A06 /* ReservoirVolumeHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */; }; 4F20AE631E6B87B100D07A06 /* ChartContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4313EDDF1D8A6BF90060FA79 /* ChartContainerView.swift */; }; 4F2C15741E0209F500E160D4 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; }; - 4F2C15751E0209FA00E160D4 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; }; 4F2C15811E0495B200E160D4 /* WatchContext+WatchApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2C15801E0495B200E160D4 /* WatchContext+WatchApp.swift */; }; 4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; }; 4F2C15831E0757E600E160D4 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; }; @@ -193,7 +224,6 @@ 4F2C15951E09BF3C00E160D4 /* HUDView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F2C15941E09BF3C00E160D4 /* HUDView.xib */; }; 4F2C15971E09E94E00E160D4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4F2C15961E09E94E00E160D4 /* Assets.xcassets */; }; 4F2C159A1E0C9E5600E160D4 /* LoopUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4F526D611DF8D9A900A04910 /* NetBasal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D601DF8D9A900A04910 /* NetBasal.swift */; }; 4F526D621DF9D95200A04910 /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; }; 4F6663941E905FD2009E74FC /* ChartColorPalette+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F6663931E905FD2009E74FC /* ChartColorPalette+Loop.swift */; }; @@ -203,6 +233,7 @@ 4F70C2101DE8FAC5006380B7 /* StatusExtensionDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C20F1DE8FAC5006380B7 /* StatusExtensionDataManager.swift */; }; 4F70C2121DE900EA006380B7 /* StatusExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */; }; 4F70C2131DE90339006380B7 /* StatusExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */; }; + 4F73F5FC20E2E7FA00E8D82C /* GlucoseStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F73F5FB20E2E7FA00E8D82C /* GlucoseStore.swift */; }; 4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; }; 4F7528951DFE1E9B00C322D6 /* LoopUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */; }; 4F75289A1DFE1F6000C322D6 /* BasalRateHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEBF1CD6FCD8003C8C80 /* BasalRateHUDView.swift */; }; @@ -214,9 +245,14 @@ 4F7528A11DFE200B00C322D6 /* BasalStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B371851CE583890013C5A6 /* BasalStateView.swift */; }; 4F7528A21DFE200B00C322D6 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; }; 4F7528A51DFE208C00C322D6 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; }; - 4F7528A71DFE20CE00C322D6 /* SensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA28611D517E42001BC233 /* SensorDisplayable.swift */; }; - 4F7528A91DFE212600C322D6 /* GlucoseTrend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */; }; 4F7528AA1DFE215100C322D6 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; }; + 4F75F00220FCFE8C00B5570E /* GlucoseChartScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F75F00120FCFE8C00B5570E /* GlucoseChartScene.swift */; }; + 4F7E8AC520E2AB9600AEA65E /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E8AC420E2AB9600AEA65E /* Date.swift */; }; + 4F7E8AC720E2AC0300AEA65E /* WatchPredictedGlucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E8AC620E2AC0300AEA65E /* WatchPredictedGlucose.swift */; }; + 4F7E8AC920E2AC3700AEA65E /* WatchDatedRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E8AC820E2AC3700AEA65E /* WatchDatedRange.swift */; }; + 4F7E8ACA20E2ACAE00AEA65E /* WatchDatedRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E8AC820E2AC3700AEA65E /* WatchDatedRange.swift */; }; + 4F7E8ACB20E2ACB500AEA65E /* WatchPredictedGlucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E8AC620E2AC0300AEA65E /* WatchPredictedGlucose.swift */; }; + 4F82655020E69F9A0031A8F5 /* HUDInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F82654F20E69F9A0031A8F5 /* HUDInterfaceController.swift */; }; 4FAC02541E22F6B20087A773 /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; }; 4FB76FB01E8C3E8000B39636 /* SwiftCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */; }; 4FB76FB31E8C3EE400B39636 /* ChartAxisValueDoubleLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F08DE7C1E7BB6E5006741EA /* ChartAxisValueDoubleLog.swift */; }; @@ -232,11 +268,14 @@ 4FB76FCE1E8C835D00B39636 /* ChartColorPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FB76FCD1E8C835D00B39636 /* ChartColorPalette.swift */; }; 4FC8C8011DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */; }; 4FC8C8021DEB943800A1452E /* NSUserDefaults+StatusExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */; }; + 4FDDD23720DC51DF00D04B16 /* LoopDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FDDD23620DC51DF00D04B16 /* LoopDataManager.swift */; }; + 4FF0F75E20E1E5D100FC6291 /* PersistenceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431E73471FF95A900069B5F7 /* PersistenceController.swift */; }; + 4FF0F75F20E1E5EF00FC6291 /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; }; 4FF4D0F81E1725B000846527 /* NibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54561D287FDB002A9274 /* NibLoadable.swift */; }; 4FF4D0F91E17268800846527 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */; }; 4FF4D1001E18374700846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; }; 4FF4D1011E18375000846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; }; - 540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */; }; + 4FFEDFBF20E5CF22000BFC58 /* ChartHUDController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FFEDFBE20E5CF22000BFC58 /* ChartHUDController.swift */; }; 7D7076351FE06EDE004AC8EA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076371FE06EDE004AC8EA /* Localizable.strings */; }; 7D70763A1FE06EDF004AC8EA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D70763C1FE06EDF004AC8EA /* InfoPlist.strings */; }; 7D70763F1FE06EDF004AC8EA /* ckcomplication.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076411FE06EDF004AC8EA /* ckcomplication.strings */; }; @@ -253,14 +292,12 @@ 894F71E21FFEC4D8007D365C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 894F71E11FFEC4D8007D365C /* Assets.xcassets */; }; C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; }; C10B28461EA9BA5E006EA1FC /* far_future_high_bg_forecast.json in Resources */ = {isa = PBXBuildFile; fileRef = C10B28451EA9BA5E006EA1FC /* far_future_high_bg_forecast.json */; }; - C11C87DD1E21E53500BB71D3 /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */; }; C11C87DE1E21EAAD00BB71D3 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; }; C12F21A71DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */; }; C13BAD941E8009B000050CB5 /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; }; C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; }; C178249A1E1999FA00D9D25C /* CaseCountable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824991E1999FA00D9D25C /* CaseCountable.swift */; }; C17824A01E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C178249F1E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift */; }; - C17824A11E19E8C200D9D25C /* GlucoseThreshold.swift in Sources */ = {isa = PBXBuildFile; fileRef = C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */; }; C17824A31E19EAB600D9D25C /* recommend_temp_basal_start_very_low_end_high.json in Resources */ = {isa = PBXBuildFile; fileRef = C17824A21E19EAB600D9D25C /* recommend_temp_basal_start_very_low_end_high.json */; }; C17824A51E1AD4D100D9D25C /* BolusRecommendation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */; }; C17824A61E1AF91F00D9D25C /* BolusRecommendation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */; }; @@ -272,6 +309,27 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 432CF87C20D8B8990066B889 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43776F841B8022E90074EA36 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 432CF87720D8B8380066B889; + remoteInfo = Cartfile; + }; + 432CF87E20D8BC3B0066B889 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43776F841B8022E90074EA36 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 432CF87720D8B8380066B889; + remoteInfo = Cartfile; + }; + 432CF88020D8BC460066B889 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43776F841B8022E90074EA36 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 432CF87720D8B8380066B889; + remoteInfo = Cartfile; + }; 43A943801B926B7B0051FA24 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 43776F841B8022E90074EA36 /* Project object */; @@ -366,7 +424,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */, 43E2D9171D2226BD004DA55F /* LoopKit.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -387,22 +444,25 @@ /* 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 = ""; }; - 43045E571F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RileyLinkDeviceManager.swift; sourceTree = ""; }; 43076BF21DFDBC4B0012A723 /* it.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = it.lproj; sourceTree = ""; }; 4309786B1E73D2F500BEBC82 /* it.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = it.lproj; sourceTree = ""; }; 4309786D1E73DAD100BEBC82 /* CGM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGM.swift; sourceTree = ""; }; + 430B29892041F54A00BA9F93 /* NSUserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSUserDefaults.swift; sourceTree = ""; }; + 430B298C2041F56500BA9F93 /* LoopSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopSettings.swift; sourceTree = ""; }; + 430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseThreshold.swift; sourceTree = ""; }; + 430B29922041F5B200BA9F93 /* UserDefaults+Loop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserDefaults+Loop.swift"; sourceTree = ""; }; + 430B29942041F5CB00BA9F93 /* LoopSettings+Loop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "LoopSettings+Loop.swift"; sourceTree = ""; }; 430C1ABC1E5568A80067F1AE /* StatusChartsManager+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StatusChartsManager+LoopKit.swift"; sourceTree = ""; }; 430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HUDViewTableViewCell.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 = ""; }; 4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitleSubtitleTextFieldTableViewCell.swift; sourceTree = ""; }; 4313EDDF1D8A6BF90060FA79 /* ChartContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ChartContainerView.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 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 = ""; }; 431A8C3F1EC6E8AB00823B9C /* CircleMaskView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CircleMaskView.swift; sourceTree = ""; }; + 431E73471FF95A900069B5F7 /* PersistenceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceController.swift; sourceTree = ""; }; 4326BA631F3A44D9007CCAD4 /* ChartLineModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartLineModel.swift; sourceTree = ""; }; - 4328E0151CFBE1DA00E199AA /* StatusInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusInterfaceController.swift; sourceTree = ""; }; + 4328E0151CFBE1DA00E199AA /* ActionHUDController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionHUDController.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 = ""; }; 4328E0201CFBE2C500E199AA /* IdentifiableClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = ""; }; @@ -415,15 +475,19 @@ 4328E0341CFC0AE100E199AA /* WatchDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = WatchDataManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteDataManager.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 = ""; }; 4341F4EA1EDB92AC001C936B /* LogglyService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogglyService.swift; sourceTree = ""; }; 43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StatusExtensionContext+LoopKit.swift"; sourceTree = ""; }; - 43441A9F1EDB4D390087958C /* OSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = ""; }; + 4344627F20A7A37400C4BE6F /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS4.3.sdk/System/Library/Frameworks/HealthKit.framework; sourceTree = DEVELOPER_DIR; }; + 4344628120A7A37E00C4BE6F /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS4.3.sdk/System/Library/Frameworks/CoreBluetooth.framework; sourceTree = DEVELOPER_DIR; }; + 4344628320A7A3BE00C4BE6F /* LoopKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKit.framework; path = Carthage/Build/watchOS/LoopKit.framework; sourceTree = ""; }; + 4344628420A7A3BE00C4BE6F /* CGMBLEKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CGMBLEKit.framework; path = Carthage/Build/watchOS/CGMBLEKit.framework; sourceTree = ""; }; + 4344628D20A7ADD100C4BE6F /* UserDefaults+CGM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+CGM.swift"; sourceTree = ""; }; + 4344629120A7C19800C4BE6F /* ButtonGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroup.swift; sourceTree = ""; }; 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ChartTableViewCell.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCharts.framework; path = Carthage/Build/iOS/SwiftCharts.framework; sourceTree = SOURCE_ROOT; }; - 4346D1F51C78501000ABAFE3 /* ChartPoint+Loop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ChartPoint+Loop.swift"; sourceTree = ""; }; 434AB0B11CBB4C3300422F4A /* RileyLinkBLEKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RileyLinkBLEKit.framework; path = Carthage/Build/iOS/RileyLinkBLEKit.framework; sourceTree = SOURCE_ROOT; }; + 434B288520661D29000EE07B /* LoopKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; @@ -434,8 +498,6 @@ 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 = SOURCE_ROOT; }; - 4353D175203D4D3C007B4ECD /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS4.2.sdk/System/Library/Frameworks/HealthKit.framework; sourceTree = DEVELOPER_DIR; }; - 4353D177203D4DDA007B4ECD /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS4.2.sdk/System/Library/Frameworks/CoreBluetooth.framework; sourceTree = DEVELOPER_DIR; }; 435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BolusSuggestionUserInfo.swift; sourceTree = ""; }; 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetBolusUserInfo.swift; sourceTree = ""; }; 435CB6221F37967800C320C7 /* InsulinModelSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinModelSettingsViewController.swift; sourceTree = ""; }; @@ -446,12 +508,16 @@ 4369618F1F19C86400447E89 /* ChartPointsContextFillLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsContextFillLayer.swift; sourceTree = ""; }; 436A0DA41D236A2A00104B24 /* LoopError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopError.swift; sourceTree = ""; }; 436D9BF71F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommended_temp_start_low_end_just_above_range.json; sourceTree = ""; }; - 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDataSource.swift; sourceTree = ""; }; + 43709AE920DF3F8200F941B3 /* MinimedKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MinimedKitUI.framework; path = Carthage/Build/iOS/MinimedKitUI.framework; sourceTree = ""; }; + 4374B5EE209D84BE00D17AA8 /* OSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = ""; }; + 4374B5F1209D897600D17AA8 /* Locked.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locked.swift; sourceTree = ""; }; + 4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewCell.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; }; 43776F961B8022E90074EA36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 43776F981B8022E90074EA36 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 43776F9B1B8022E90074EA36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 437AFEE6203688CF008C4892 /* LoopKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKitUI.framework; path = Carthage/Build/iOS/LoopKitUI.framework; sourceTree = ""; }; 437CCAD91D284ADF0075D2C3 /* AuthenticationTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationTableViewCell.swift; sourceTree = ""; }; 437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonTableViewCell.swift; sourceTree = ""; }; 437CCADD1D2858FD0075D2C3 /* AuthenticationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationViewController.swift; sourceTree = ""; }; @@ -465,9 +531,7 @@ 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 = ""; }; 438172D81F4E9E37003C3328 /* NewPumpEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewPumpEvent.swift; sourceTree = ""; }; - 4381D2251F3C0FDD004ACCF9 /* RileyLinkDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RileyLinkDevice.swift; sourceTree = ""; }; 43846AD41D8FA67800799272 /* Base.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Base.lproj; sourceTree = ""; }; - 43846ADA1D91057000799272 /* ContextUpdatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextUpdatable.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 = ""; }; @@ -481,11 +545,9 @@ 439897361CD2F80600223065 /* AnalyticsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AnalyticsManager.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 439BED291E76093C00B0AED5 /* CGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGMManager.swift; sourceTree = ""; }; 439BED2B1E760A7A00B0AED5 /* DexCGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DexCGMManager.swift; sourceTree = ""; }; - 439BED2D1E760BC600B0AED5 /* EnliteCGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnliteCGMManager.swift; sourceTree = ""; }; 43A51E1E1EB6D62A000736CC /* CarbAbsorptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbAbsorptionViewController.swift; sourceTree = ""; }; 43A51E201EB6DBDD000736CC /* ChartsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartsTableViewController.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 = ""; }; 43A943721B926B7B0051FA24 /* WatchApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WatchApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 43A943751B926B7B0051FA24 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = ""; }; 43A9437E1B926B7B0051FA24 /* WatchApp Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "WatchApp Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -509,9 +571,10 @@ 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 = SOURCE_ROOT; }; 43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseEffectVelocity.swift; sourceTree = ""; }; + 43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsImageTableViewCell.swift; sourceTree = ""; }; + 43C3B6F620BBCAA30026CAFA /* PumpManagerState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PumpManagerState.swift; sourceTree = ""; }; 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ShareGlucose+GlucoseKit.swift"; sourceTree = ""; }; 43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseRangeSchedule.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 = SOURCE_ROOT; }; 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 = ""; }; @@ -520,7 +583,7 @@ 43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderValuesTableViewCell.swift; sourceTree = ""; }; 43D533BB1CFD1DD7009E3085 /* WatchApp Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WatchApp Extension.entitlements"; sourceTree = ""; }; 43D848AF1E7DCBE100DADCBC /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = ""; }; - 43D848B11E7DF42500DADCBC /* LoopSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopSettings.swift; sourceTree = ""; }; + 43DACFFF20A2736F000F8529 /* PersistedPumpEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistedPumpEvent.swift; 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; }; 43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarbEntryTableViewController.swift; sourceTree = ""; }; @@ -547,22 +610,16 @@ 43E2D90B1D20C581004DA55F /* LoopTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LoopTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 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 = ""; }; 43EDEE6B1CF2E12A00393BE3 /* Loop.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Loop.entitlements; 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 = ""; }; 43F78D4B1C914197002152D1 /* LoopKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKit.framework; path = Carthage/Build/iOS/LoopKit.framework; sourceTree = SOURCE_ROOT; }; 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 = SOURCE_ROOT; }; @@ -573,8 +630,8 @@ 4F08DE831E7BB70B006741EA /* ChartPointsScatterDownTrianglesLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsScatterDownTrianglesLayer.swift; sourceTree = ""; }; 4F08DE841E7BB70B006741EA /* ChartPointsTouchHighlightLayerViewCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsTouchHighlightLayerViewCache.swift; sourceTree = ""; }; 4F08DE8E1E7BB871006741EA /* CollectionType+Loop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CollectionType+Loop.swift"; sourceTree = ""; }; - 4F08DEA01E81D90F006741EA /* GlucoseRangeScheduleCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseRangeScheduleCalculator.swift; sourceTree = ""; }; - 4F08DEA21E81E12D006741EA /* DatedRangedContextCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatedRangedContextCalculator.swift; sourceTree = ""; }; + 4F11D3BF20DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseBackfillRequestUserInfo.swift; sourceTree = ""; }; + 4F11D3C120DD80B3006E072C /* WatchHistoricalGlucose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchHistoricalGlucose.swift; sourceTree = ""; }; 4F2C15801E0495B200E160D4 /* WatchContext+WatchApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WatchContext+WatchApp.swift"; sourceTree = ""; }; 4F2C15921E09BF2C00E160D4 /* HUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HUDView.swift; sourceTree = ""; }; 4F2C15941E09BF3C00E160D4 /* HUDView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HUDView.xib; sourceTree = ""; }; @@ -590,14 +647,21 @@ 4F70C1FD1DE8E662006380B7 /* Loop Status Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Loop Status Extension.entitlements"; sourceTree = ""; }; 4F70C20F1DE8FAC5006380B7 /* StatusExtensionDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusExtensionDataManager.swift; sourceTree = ""; }; 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusExtensionContext.swift; sourceTree = ""; }; + 4F73F5FB20E2E7FA00E8D82C /* GlucoseStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseStore.swift; sourceTree = ""; }; 4F75288B1DFE1DC600C322D6 /* LoopUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LoopUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4F75288D1DFE1DC600C322D6 /* LoopUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoopUI.h; sourceTree = ""; }; 4F75288E1DFE1DC600C322D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 4F75F00120FCFE8C00B5570E /* GlucoseChartScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseChartScene.swift; sourceTree = ""; }; + 4F7E8AC420E2AB9600AEA65E /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = ""; }; + 4F7E8AC620E2AC0300AEA65E /* WatchPredictedGlucose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchPredictedGlucose.swift; sourceTree = ""; }; + 4F7E8AC820E2AC3700AEA65E /* WatchDatedRange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchDatedRange.swift; sourceTree = ""; }; + 4F82654F20E69F9A0031A8F5 /* HUDInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDInterfaceController.swift; sourceTree = ""; }; 4FB76FC51E8C57B100B39636 /* StatusChartsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusChartsManager.swift; sourceTree = ""; }; 4FB76FCD1E8C835D00B39636 /* ChartColorPalette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartColorPalette.swift; sourceTree = ""; }; 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSUserDefaults+StatusExtension.swift"; sourceTree = ""; }; + 4FDDD23620DC51DF00D04B16 /* LoopDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopDataManager.swift; sourceTree = ""; }; 4FF4D0FF1E18374700846527 /* WatchContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchContext.swift; sourceTree = ""; }; - 540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnliteSensorDisplayable.swift; sourceTree = ""; }; + 4FFEDFBE20E5CF22000BFC58 /* ChartHUDController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartHUDController.swift; sourceTree = ""; }; 7D68AAA91FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = ""; }; 7D68AAAA1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; 7D68AAAB1FE2DB0A00522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainInterface.strings; sourceTree = ""; }; @@ -637,7 +701,6 @@ C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_very_low_end_in_range.json; sourceTree = ""; }; C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MealBolusNightscoutTreatment.swift; sourceTree = ""; }; C17824991E1999FA00D9D25C /* CaseCountable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaseCountable.swift; sourceTree = ""; }; - C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseThreshold.swift; sourceTree = ""; }; C178249F1E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseThresholdTableViewController.swift; sourceTree = ""; }; C17824A21E19EAB600D9D25C /* recommend_temp_basal_start_very_low_end_high.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_start_very_low_end_high.json; sourceTree = ""; }; C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BolusRecommendation.swift; sourceTree = ""; }; @@ -662,14 +725,13 @@ files = ( 4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */, 434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */, - 43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */, 43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */, 4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */, - 43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */, 43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */, - 43C6407C1DA051850093E25D /* InsulinKit.framework in Frameworks */, 43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */, + 437AFEE7203688CF008C4892 /* LoopKitUI.framework in Frameworks */, 43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */, + 43709AEA20DF3F8200F941B3 /* MinimedKitUI.framework in Frameworks */, C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */, 437AFEE42035252A008C4892 /* RileyLinkBLEKit.framework in Frameworks */, 43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */, @@ -684,8 +746,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4353D178203D4DDA007B4ECD /* CoreBluetooth.framework in Frameworks */, - 4353D176203D4D3C007B4ECD /* HealthKit.framework in Frameworks */, + 4344628220A7A37F00C4BE6F /* CoreBluetooth.framework in Frameworks */, + 4344628020A7A37400C4BE6F /* HealthKit.framework in Frameworks */, + 4344628520A7A3BE00C4BE6F /* LoopKit.framework in Frameworks */, + 4344628620A7A3BE00C4BE6F /* CGMBLEKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -708,6 +772,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 434B288420661D29000EE07B /* LoopKit.framework in Frameworks */, 4F7528951DFE1E9B00C322D6 /* LoopUI.framework in Frameworks */, 437AFEE520352591008C4892 /* NotificationCenter.framework in Frameworks */, ); @@ -717,6 +782,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 437AFEE8203689FE008C4892 /* LoopKit.framework in Frameworks */, 4FB76FB01E8C3E8000B39636 /* SwiftCharts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -729,9 +795,10 @@ children = ( 4328E01D1CFBE25F00E199AA /* AddCarbsInterfaceController.swift */, 4328E0161CFBE1DA00E199AA /* BolusInterfaceController.swift */, - 43846ADA1D91057000799272 /* ContextUpdatable.swift */, 43A943891B926B7B0051FA24 /* NotificationController.swift */, - 4328E0151CFBE1DA00E199AA /* StatusInterfaceController.swift */, + 4F82654F20E69F9A0031A8F5 /* HUDInterfaceController.swift */, + 4328E0151CFBE1DA00E199AA /* ActionHUDController.swift */, + 4FFEDFBE20E5CF22000BFC58 /* ChartHUDController.swift */, ); path = Controllers; sourceTree = ""; @@ -739,7 +806,10 @@ 4328E01F1CFBE2B100E199AA /* Extensions */ = { isa = PBXGroup; children = ( + 4344629120A7C19800C4BE6F /* ButtonGroup.swift */, 4328E0221CFBE2C500E199AA /* CLKComplicationTemplate.swift */, + 4F7E8AC420E2AB9600AEA65E /* Date.swift */, + 4F73F5FB20E2E7FA00E8D82C /* GlucoseStore.swift */, 4328E0201CFBE2C500E199AA /* IdentifiableClass.swift */, 4328E0231CFBE2C500E199AA /* NSUserDefaults.swift */, 4328E0241CFBE2C500E199AA /* UIColor.swift */, @@ -764,20 +834,15 @@ 43757D131C06F26C00910CB9 /* Models */ = { isa = PBXGroup; children = ( - 43673E2E1F37BDA10058AC7C /* Insulin */, 43880F961D9D8052009061A8 /* ServiceAuthentication */, 43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */, C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */, - 4309786D1E73DAD100BEBC82 /* CGM.swift */, - 540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */, 43E397A21D56B9E40028E321 /* Glucose.swift */, 43C2FAE01EB656A500364AFF /* GlucoseEffectVelocity.swift */, 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */, - C178249D1E19B62300D9D25C /* GlucoseThreshold.swift */, - 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */, + 4374B5F1209D897600D17AA8 /* Locked.swift */, 436A0DA41D236A2A00104B24 /* LoopError.swift */, - 43D848B11E7DF42500DADCBC /* LoopSettings.swift */, - 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */, + 430B29942041F5CB00BA9F93 /* LoopSettings+Loop.swift */, 4F526D601DF8D9A900A04910 /* NetBasal.swift */, 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */, 43D848AF1E7DCBE100DADCBC /* Result.swift */, @@ -860,7 +925,6 @@ children = ( 439BED291E76093C00B0AED5 /* CGMManager.swift */, 439BED2B1E760A7A00B0AED5 /* DexCGMManager.swift */, - 439BED2D1E760BC600B0AED5 /* EnliteCGMManager.swift */, ); path = CGM; sourceTree = ""; @@ -891,6 +955,8 @@ 43A9438F1B926B7B0051FA24 /* Assets.xcassets */, 4328E0121CFBE1B700E199AA /* Controllers */, 4328E01F1CFBE2B100E199AA /* Extensions */, + 4FE3475F20D5D7FA00A86D03 /* Managers */, + 4F75F0052100146B00B5570E /* Scenes */, 43A943831B926B7B0051FA24 /* Supporting Files */, ); path = "WatchApp Extension"; @@ -944,23 +1010,20 @@ children = ( C17824991E1999FA00D9D25C /* CaseCountable.swift */, 4F6663931E905FD2009E74FC /* ChartColorPalette+Loop.swift */, - 4346D1F51C78501000ABAFE3 /* ChartPoint+Loop.swift */, 4389916A1E91B689000EEF90 /* ChartSettings+Loop.swift */, 4F08DE8E1E7BB871006741EA /* CollectionType+Loop.swift */, 43CE7CDD1CA8B63E003CC1B0 /* Data.swift */, - 4302F4E41D4EA75100F0FCAF /* DoseStore.swift */, 43C513181E864C4E001547C7 /* GlucoseRangeSchedule.swift */, C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */, 438172D81F4E9E37003C3328 /* NewPumpEvent.swift */, 43CEE6E51E56AFD400CB9116 /* NightscoutUploader.swift */, - 43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */, - 43441A9F1EDB4D390087958C /* OSLog.swift */, - 4381D2251F3C0FDD004ACCF9 /* RileyLinkDevice.swift */, + 43DACFFF20A2736F000F8529 /* PersistedPumpEvent.swift */, 43BFF0CA1E466C0900FF19A9 /* StateColorPalette.swift */, 43F41C361D3BF32400C11ED6 /* UIAlertController.swift */, 43BFF0BB1E45C80600FF19A9 /* UIColor+Loop.swift */, 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */, 434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */, + 430B29922041F5B200BA9F93 /* UserDefaults+Loop.swift */, ); path = Extensions; sourceTree = ""; @@ -980,8 +1043,6 @@ 4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */, 435CB6221F37967800C320C7 /* InsulinModelSettingsViewController.swift */, 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */, - 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */, - 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */, 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */, 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */, 4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */, @@ -1002,10 +1063,11 @@ 43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */, 430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */, 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */, - 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */, + 43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */, + 4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */, 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */, - 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */, 4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */, + 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */, ); path = Views; sourceTree = ""; @@ -1019,14 +1081,13 @@ 43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */, 4315D2891CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift */, 43F78D251C8FC000002152D1 /* DoseMath.swift */, - 4F08DEA01E81D90F006741EA /* GlucoseRangeScheduleCalculator.swift */, 43E2D8C51D204678004DA55F /* KeychainManager.swift */, 43E2D8C71D208D5B004DA55F /* KeychainManager+Loop.swift */, 43A567681C94880B00334FAC /* LoopDataManager.swift */, C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */, 43C094491CACCC73001F6403 /* NotificationManager.swift */, + 43C3B6F620BBCAA30026CAFA /* PumpManagerState.swift */, 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */, - 43045E571F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift */, 430C1ABC1E5568A80067F1AE /* StatusChartsManager+LoopKit.swift */, 4F70C20F1DE8FAC5006380B7 /* StatusExtensionDataManager.swift */, 4328E0341CFC0AE100E199AA /* WatchDataManager.swift */, @@ -1050,7 +1111,6 @@ 7D7076371FE06EDE004AC8EA /* Localizable.strings */, 4F70C1FD1DE8E662006380B7 /* Loop Status Extension.entitlements */, 4F70C1E51DE8DCA7006380B7 /* Info.plist */, - 4F08DEA21E81E12D006741EA /* DatedRangedContextCalculator.swift */, 43BFF0CC1E466C8400FF19A9 /* StateColorPalette.swift */, 4F70C1E01DE8DCA7006380B7 /* StatusViewController.swift */, 43BFF0BE1E45C8EA00FF19A9 /* UIColor+Widget.swift */, @@ -1105,12 +1165,19 @@ 4F08DE7D1E7BB6E5006741EA /* ChartAxisValueDoubleUnit.swift */, 4FB76FCD1E8C835D00B39636 /* ChartColorPalette.swift */, 4326BA631F3A44D9007CCAD4 /* ChartLineModel.swift */, - 43EA28611D517E42001BC233 /* SensorDisplayable.swift */, 43BFF0C81E465B0A00FF19A9 /* StateColorPalette.swift */, ); path = Models; sourceTree = ""; }; + 4F75F0052100146B00B5570E /* Scenes */ = { + isa = PBXGroup; + children = ( + 4F75F00120FCFE8C00B5570E /* GlucoseChartScene.swift */, + ); + path = Scenes; + sourceTree = ""; + }; 4FB76FC31E8C575900B39636 /* Managers */ = { isa = PBXGroup; children = ( @@ -1129,6 +1196,14 @@ path = Extensions; sourceTree = ""; }; + 4FE3475F20D5D7FA00A86D03 /* Managers */ = { + isa = PBXGroup; + children = ( + 4FDDD23620DC51DF00D04B16 /* LoopDataManager.swift */, + ); + path = Managers; + sourceTree = ""; + }; 4FF4D0FA1E1834BD00846527 /* Common */ = { isa = PBXGroup; children = ( @@ -1141,13 +1216,20 @@ 4FF4D0FB1E1834C400846527 /* Models */ = { isa = PBXGroup; children = ( + 43673E2E1F37BDA10058AC7C /* Insulin */, 435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */, 43DE92581C5479E4001FFDE1 /* CarbEntryUserInfo.swift */, + 4F11D3BF20DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift */, + 4309786D1E73DAD100BEBC82 /* CGM.swift */, 894B91CC1FF9F45900DA65F5 /* GlucoseRangeScheduleOverrideUserInfo.swift */, - 43EA285E1D50ED3D001BC233 /* GlucoseTrend.swift */, + 430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */, + 430B298C2041F56500BA9F93 /* LoopSettings.swift */, 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */, 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */, 4FF4D0FF1E18374700846527 /* WatchContext.swift */, + 4F11D3C120DD80B3006E072C /* WatchHistoricalGlucose.swift */, + 4F7E8AC620E2AC0300AEA65E /* WatchPredictedGlucose.swift */, + 4F7E8AC820E2AC3700AEA65E /* WatchDatedRange.swift */, ); path = Models; sourceTree = ""; @@ -1160,10 +1242,14 @@ 434F54561D287FDB002A9274 /* NibLoadable.swift */, 430DA58D1D4AEC230097D1CA /* NSBundle.swift */, 439897341CD2F7DE00223065 /* NSTimeInterval.swift */, + 430B29892041F54A00BA9F93 /* NSUserDefaults.swift */, 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */, 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */, + 4374B5EE209D84BE00D17AA8 /* OSLog.swift */, + 431E73471FF95A900069B5F7 /* PersistenceController.swift */, 43BFF0B11E45C18400FF19A9 /* UIColor.swift */, 43BFF0C31E4659E700FF19A9 /* UIColor+HIG.swift */, + 4344628D20A7ADD100C4BE6F /* UserDefaults+CGM.swift */, ); path = Extensions; sourceTree = ""; @@ -1171,17 +1257,19 @@ 968DCD53F724DE56FFE51920 /* Frameworks */ = { isa = PBXGroup; children = ( + 43709AE920DF3F8200F941B3 /* MinimedKitUI.framework */, + 4344628420A7A3BE00C4BE6F /* CGMBLEKit.framework */, + 4344628320A7A3BE00C4BE6F /* LoopKit.framework */, + 4344628120A7A37E00C4BE6F /* CoreBluetooth.framework */, + 4344627F20A7A37400C4BE6F /* HealthKit.framework */, + 434B288520661D29000EE07B /* LoopKit.framework */, C18852E12082AB1A00BECC8C /* RileyLinkKitUI.framework */, - 4353D177203D4DDA007B4ECD /* CoreBluetooth.framework */, - 4353D175203D4D3C007B4ECD /* HealthKit.framework */, 434FB6451D68F1CD007B9C70 /* Amplitude.framework */, - 43F78D481C914197002152D1 /* CarbKit.framework */, 43C246A71D89990F0031F8D1 /* Crypto.framework */, 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */, - 43F78D491C914197002152D1 /* GlucoseKit.framework */, 43F5C2C81B929C09003EB13D /* HealthKit.framework */, - 43C6407B1DA051850093E25D /* InsulinKit.framework */, 43F78D4B1C914197002152D1 /* LoopKit.framework */, + 437AFEE6203688CF008C4892 /* LoopKitUI.framework */, 43CA93361CB98079000026B5 /* MinimedKit.framework */, C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */, 4F70C1DD1DE8DCA7006380B7 /* NotificationCenter.framework */, @@ -1217,13 +1305,13 @@ 43776F8A1B8022E90074EA36 /* Resources */, 43A9439C1B926B7B0051FA24 /* Embed Watch Content */, 43A943AE1B928D400051FA24 /* Embed Frameworks */, - 438207721F2C4DD400886C13 /* Homebrew & Carthage Setup */, 43EDDBEF1C361BCE007D89B5 /* Copy Frameworks with Carthage */, 4F70C1EC1DE8DCA8006380B7 /* Embed App Extensions */, ); buildRules = ( ); dependencies = ( + 432CF87D20D8B8990066B889 /* PBXTargetDependency */, 4F7528971DFE1ED400C322D6 /* PBXTargetDependency */, 43A943931B926B7B0051FA24 /* PBXTargetDependency */, 4F70C1E71DE8DCA7006380B7 /* PBXTargetDependency */, @@ -1259,10 +1347,12 @@ 43A9437B1B926B7B0051FA24 /* Frameworks */, 43A9437C1B926B7B0051FA24 /* Resources */, 43C667D71C5577280050C674 /* Embed Frameworks */, + 43FF3DF620A8EFE800F8E62C /* Copy Frameworks with Carthage */, ); buildRules = ( ); dependencies = ( + 432CF88120D8BC460066B889 /* PBXTargetDependency */, ); name = "WatchApp Extension"; productName = "WatchApp Extension"; @@ -1335,6 +1425,7 @@ buildRules = ( ); dependencies = ( + 432CF87F20D8BC3B0066B889 /* PBXTargetDependency */, ); name = LoopUI; productName = LoopUI; @@ -1351,6 +1442,10 @@ LastUpgradeCheck = 0930; ORGANIZATIONNAME = "LoopKit Authors"; TargetAttributes = { + 432CF87720D8B8380066B889 = { + CreatedOnToolsVersion = 9.4; + ProvisioningStyle = Automatic; + }; 43776F8B1B8022E90074EA36 = { CreatedOnToolsVersion = 7.0; LastSwiftMigration = 0800; @@ -1443,6 +1538,7 @@ 4F75288A1DFE1DC600C322D6 /* LoopUI */, 43E2D8D01D20BF42004DA55F /* DoseMathTests */, 43E2D90A1D20C581004DA55F /* LoopTests */, + 432CF87720D8B8380066B889 /* Cartfile */, ); }; /* End PBXProject section */ @@ -1543,7 +1639,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 438207721F2C4DD400886C13 /* Homebrew & Carthage Setup */ = { + 432CF87B20D8B8490066B889 /* Build Carthage Dependencies */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Build Carthage Dependencies"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n echo \"Bootstrapping carthage dependencies\"\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi"; + }; + 432CF88220D8BCD90066B889 /* Homebrew & Carthage Setup */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1564,9 +1674,6 @@ ); inputPaths = ( "$(SRCROOT)/Carthage/Build/iOS/CGMBLEKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/CarbKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/GlucoseKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/InsulinKit.framework", "$(SRCROOT)/Carthage/Build/iOS/LoopKit.framework", "$(SRCROOT)/Carthage/Build/iOS/SwiftCharts.framework", "$(SRCROOT)/Carthage/Build/iOS/MinimedKit.framework", @@ -1578,13 +1685,12 @@ "$(SRCROOT)/Carthage/Build/iOS/Crypto.framework", "$(SRCROOT)/Carthage/Build/iOS/G4ShareSpy.framework", "$(SRCROOT)/Carthage/Build/iOS/RileyLinkKitUI.framework", + "$(SRCROOT)/Carthage/Build/iOS/LoopKitUI.framework", + "$(SRCROOT)/Carthage/Build/iOS/MinimedKitUI.framework", ); name = "Copy Frameworks with Carthage"; outputPaths = ( "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CGMBLEKit.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CarbKit.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/GlucoseKit.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/InsulinKit.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKit.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SwiftCharts.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/MinimedKit.framework", @@ -1596,10 +1702,30 @@ "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Crypto.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/G4ShareSpy.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/RileyLinkKitUI.framework", + "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKitUI.framework", + "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/MinimedKitUI.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + }; + 43FF3DF620A8EFE800F8E62C /* Copy Frameworks with Carthage */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/Carthage/Build/watchOS/CGMBLEKit.framework", + "$(SRCROOT)/Carthage/Build/watchOS/LoopKit.framework", + ); + name = "Copy Frameworks with Carthage"; + outputPaths = ( + "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CGMBLEKit.framework", + "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Rebuild using cache if we're developing in a workspace\nif [ -d $PROJECT_DIR/Loop2.xcworkspace ]; then\n /usr/local/bin/carthage build --platform \"$PLATFORM_NAME\" --cache-builds --project-directory \"$SRCROOT\"\nfi\n\n/usr/local/bin/carthage copy-frameworks"; + shellScript = "/usr/local/bin/carthage copy-frameworks"; }; /* End PBXShellScriptBuildPhase section */ @@ -1613,7 +1739,7 @@ 434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */, 43441A9C1EDB34810087958C /* StatusExtensionContext+LoopKit.swift in Sources */, 4FF4D1001E18374700846527 /* WatchContext.swift in Sources */, - 4381D2261F3C0FDD004ACCF9 /* RileyLinkDevice.swift in Sources */, + 430B298A2041F54A00BA9F93 /* NSUserDefaults.swift in Sources */, 4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */, 43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */, 4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */, @@ -1623,29 +1749,27 @@ 43A51E1F1EB6D62A000736CC /* CarbAbsorptionViewController.swift in Sources */, 43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */, 437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */, - 439BED2E1E760BC600B0AED5 /* EnliteCGMManager.swift in Sources */, + 430B29932041F5B300BA9F93 /* UserDefaults+Loop.swift in Sources */, 4341F4EB1EDB92AC001C936B /* LogglyService.swift in Sources */, 43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */, 43BFF0CB1E466C0900FF19A9 /* StateColorPalette.swift in Sources */, + 4F11D3C020DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift in Sources */, 43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */, - C11C87DD1E21E53500BB71D3 /* GlucoseThreshold.swift in Sources */, 434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */, 437CCADE1D2858FD0075D2C3 /* AuthenticationViewController.swift in Sources */, - 43A5676B1C96155700334FAC /* SwitchTableViewCell.swift in Sources */, 43A567691C94880B00334FAC /* LoopDataManager.swift in Sources */, 43D848B01E7DCBE100DADCBC /* Result.swift in Sources */, 43E397A31D56B9E40028E321 /* Glucose.swift in Sources */, 43B260491ED248FB008CAA77 /* CarbEntryTableViewCell.swift in Sources */, 4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */, 435CB6271F37AE5600C320C7 /* WalshInsulinModel.swift in Sources */, - 43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */, - 43045E581F25AC1700FD9CE1 /* RileyLinkDeviceManager.swift in Sources */, 43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */, C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */, 435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */, 43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */, 43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */, 43E2D8C81D208D5B004DA55F /* KeychainManager+Loop.swift in Sources */, + 430B298F2041F56500BA9F93 /* GlucoseThreshold.swift in Sources */, C17824A01E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift in Sources */, 435CB6251F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift in Sources */, 4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */, @@ -1664,61 +1788,64 @@ 4389916B1E91B689000EEF90 /* ChartSettings+Loop.swift in Sources */, 4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */, 4309786E1E73DAD100BEBC82 /* CGM.swift in Sources */, - 43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */, C178249A1E1999FA00D9D25C /* CaseCountable.swift in Sources */, - 4F08DEA11E81D90F006741EA /* GlucoseRangeScheduleCalculator.swift in Sources */, 43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */, + 4F7E8ACA20E2ACAE00AEA65E /* WatchDatedRange.swift in Sources */, 4FB76FBB1E8C42CF00B39636 /* UIColor.swift in Sources */, + 4374B5EF209D84BF00D17AA8 /* OSLog.swift in Sources */, 4F6663941E905FD2009E74FC /* ChartColorPalette+Loop.swift in Sources */, 4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */, 43D381621EBD9759007F8C8F /* HeaderValuesTableViewCell.swift in Sources */, 43BFF0C51E465A2D00FF19A9 /* UIColor+HIG.swift in Sources */, 4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */, 437CCAE01D285C7B0075D2C3 /* ServiceAuthentication.swift in Sources */, + 4374B5F4209D89A900D17AA8 /* TextFieldTableViewCell.swift in Sources */, 4FC8C8011DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift in Sources */, - 4302F4E51D4EA75100F0FCAF /* DoseStore.swift in Sources */, - 430DA5901D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift in Sources */, + 43DAD00020A2736F000F8529 /* PersistedPumpEvent.swift in Sources */, 4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */, 438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */, 43E93FB61E469A4000EAB8DB /* NumberFormatter.swift in Sources */, 4F08DE8F1E7BB871006741EA /* CollectionType+Loop.swift in Sources */, 435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */, 437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */, + 4344628F20A7ADD500C4BE6F /* UserDefaults+CGM.swift in Sources */, 894B91CD1FF9F45900DA65F5 /* GlucoseRangeScheduleOverrideUserInfo.swift in Sources */, 43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */, 433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */, 43D2E8231F00425400AE5CBF /* BolusViewController+LoopDataManager.swift in Sources */, 434F545F1D288345002A9274 /* ShareService.swift in Sources */, - 43441AA01EDB4D390087958C /* OSLog.swift in Sources */, + 430B29952041F5CB00BA9F93 /* LoopSettings+Loop.swift in Sources */, 43CEE6E61E56AFD400CB9116 /* NightscoutUploader.swift in Sources */, 4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */, 4F526D611DF8D9A900A04910 /* NetBasal.swift in Sources */, - 540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */, + 4F7E8ACB20E2ACB500AEA65E /* WatchPredictedGlucose.swift in Sources */, + 43C3B6EC20B650A80026CAFA /* SettingsImageTableViewCell.swift in Sources */, 436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */, + 4F11D3C220DD80B3006E072C /* WatchHistoricalGlucose.swift in Sources */, 435CB6231F37967800C320C7 /* InsulinModelSettingsViewController.swift in Sources */, 43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */, + 431E73481FF95A900069B5F7 /* PersistenceController.swift in Sources */, 439BED2C1E760A7A00B0AED5 /* DexCGMManager.swift in Sources */, - 433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */, 43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */, 438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */, 434F54611D28859B002A9274 /* ServiceCredential.swift in Sources */, 4F70C2101DE8FAC5006380B7 /* StatusExtensionDataManager.swift in Sources */, - 436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */, + 43DFB62320D4CAE7008A7BAE /* PumpManagerState.swift in Sources */, 435CB6291F37B01300C320C7 /* InsulinModelSettings.swift in Sources */, 431A8C401EC6E8AB00823B9C /* CircleMaskView.swift in Sources */, 439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */, 430D85891F44037000AF2D4F /* HUDViewTableViewCell.swift in Sources */, 43A51E211EB6DBDD000736CC /* ChartsTableViewController.swift in Sources */, - 4346D1F61C78501000ABAFE3 /* ChartPoint+Loop.swift in Sources */, 438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */, - 43D848B21E7DF42500DADCBC /* LoopSettings.swift in Sources */, 438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */, 43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */, 432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */, 43DE92591C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */, 434F54631D28DD80002A9274 /* ValidatingIndicatorView.swift in Sources */, 43DE92611C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift in Sources */, + 430B298E2041F56500BA9F93 /* LoopSettings.swift in Sources */, 43C2FAE11EB656A500364AFF /* GlucoseEffectVelocity.swift in Sources */, + 4374B5F2209D897600D17AA8 /* Locked.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1726,29 +1853,43 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4F2C15751E0209FA00E160D4 /* GlucoseTrend.swift in Sources */, 4F2C15741E0209F500E160D4 /* NSTimeInterval.swift in Sources */, 4FF4D1011E18375000846527 /* WatchContext.swift in Sources */, 435400311C9F744E00D5819C /* BolusSuggestionUserInfo.swift in Sources */, 43A9438A1B926B7B0051FA24 /* NotificationController.swift in Sources */, 43A943881B926B7B0051FA24 /* ExtensionDelegate.swift in Sources */, - 4328E0291CFBE2C500E199AA /* NSUserDefaults.swift in Sources */, + 4F75F00220FCFE8C00B5570E /* GlucoseChartScene.swift in Sources */, 4328E02F1CFBF81800E199AA /* WKInterfaceImage.swift in Sources */, 4F2C15811E0495B200E160D4 /* WatchContext+WatchApp.swift in Sources */, + 4FF0F75F20E1E5EF00FC6291 /* NSBundle.swift in Sources */, + 4344629820A8B2D700C4BE6F /* OSLog.swift in Sources */, 4328E02A1CFBE2C500E199AA /* UIColor.swift in Sources */, + 4FDDD23720DC51DF00D04B16 /* LoopDataManager.swift in Sources */, 4328E01B1CFBE1DA00E199AA /* BolusInterfaceController.swift in Sources */, + 4F82655020E69F9A0031A8F5 /* HUDInterfaceController.swift in Sources */, 4328E02B1CFBE2C500E199AA /* WKAlertAction.swift in Sources */, + 4365050520A793FA00EA8D7A /* CGM.swift in Sources */, + 4F7E8AC720E2AC0300AEA65E /* WatchPredictedGlucose.swift in Sources */, + 4344628E20A7ADD100C4BE6F /* UserDefaults+CGM.swift in Sources */, + 4F7E8AC520E2AB9600AEA65E /* Date.swift in Sources */, + 4FFEDFBF20E5CF22000BFC58 /* ChartHUDController.swift in Sources */, 894B91CE1FF9F45900DA65F5 /* GlucoseRangeScheduleOverrideUserInfo.swift in Sources */, + 4F11D3C420DD881A006E072C /* WatchHistoricalGlucose.swift in Sources */, 4328E0281CFBE2C500E199AA /* CLKComplicationTemplate.swift in Sources */, 4328E01E1CFBE25F00E199AA /* AddCarbsInterfaceController.swift in Sources */, - 43846ADB1D91057000799272 /* ContextUpdatable.swift in Sources */, 4328E0261CFBE2C500E199AA /* IdentifiableClass.swift in Sources */, + 4F73F5FC20E2E7FA00E8D82C /* GlucoseStore.swift in Sources */, + 432CF87520D8AC950066B889 /* NSUserDefaults.swift in Sources */, 43027F0F1DFE0EC900C51989 /* HKUnit.swift in Sources */, + 4344629220A7C19800C4BE6F /* ButtonGroup.swift in Sources */, + 4F7E8AC920E2AC3700AEA65E /* WatchDatedRange.swift in Sources */, 43CB2B2B1D924D450079823D /* WCSession.swift in Sources */, 43DE925A1C5479E4001FFDE1 /* CarbEntryUserInfo.swift in Sources */, + 4FF0F75E20E1E5D100FC6291 /* PersistenceController.swift in Sources */, 43BFF0B51E45C1E700FF19A9 /* NumberFormatter.swift in Sources */, 43A9438E1B926B7B0051FA24 /* ComplicationController.swift in Sources */, - 4328E01A1CFBE1DA00E199AA /* StatusInterfaceController.swift in Sources */, + 4328E01A1CFBE1DA00E199AA /* ActionHUDController.swift in Sources */, + 4F11D3C320DD84DB006E072C /* GlucoseBackfillRequestUserInfo.swift in Sources */, 435400351C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1757,7 +1898,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C17824A11E19E8C200D9D25C /* GlucoseThreshold.swift in Sources */, + 43C3B6ED20B884500026CAFA /* GlucoseThreshold.swift in Sources */, 43947D731F529FAA00A07D31 /* GlucoseRangeSchedule.swift in Sources */, 43E2D8DC1D20C049004DA55F /* DoseMath.swift in Sources */, 43E2D8DB1D20C03B004DA55F /* NSTimeInterval.swift in Sources */, @@ -1781,17 +1922,23 @@ buildActionMask = 2147483647; files = ( 4FAC02541E22F6B20087A773 /* NSTimeInterval.swift in Sources */, + 434B2888206B4F0A000EE07B /* InsulinModelSettings.swift in Sources */, 4FB76FBA1E8C42CE00B39636 /* UIColor.swift in Sources */, 4F2C15831E0757E600E160D4 /* HKUnit.swift in Sources */, + 430B29902041F57000BA9F93 /* GlucoseThreshold.swift in Sources */, + 434B2887206B4F07000EE07B /* WalshInsulinModel.swift in Sources */, 43E93FB51E4675E800EAB8DB /* NumberFormatter.swift in Sources */, 43BFF0CD1E466C8400FF19A9 /* StateColorPalette.swift in Sources */, - 4F08DEA31E81E12D006741EA /* DatedRangedContextCalculator.swift in Sources */, + 430B29912041F57200BA9F93 /* LoopSettings.swift in Sources */, 4F526D621DF9D95200A04910 /* NSBundle.swift in Sources */, 4FC8C8021DEB943800A1452E /* NSUserDefaults+StatusExtension.swift in Sources */, + 434B2889206B4F0C000EE07B /* ExponentialInsulinModelPreset.swift in Sources */, + 434B2886206628B3000EE07B /* PersistenceController.swift in Sources */, 43BFF0C71E465A4F00FF19A9 /* UIColor+HIG.swift in Sources */, 43BFF0BF1E45C8EA00FF19A9 /* UIColor+Widget.swift in Sources */, 4F70C2121DE900EA006380B7 /* StatusExtensionContext.swift in Sources */, 4F70C1E11DE8DCA7006380B7 /* StatusViewController.swift in Sources */, + 430B298B2041F55700BA9F93 /* NSUserDefaults.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1805,9 +1952,8 @@ 436961911F19D11E00447E89 /* ChartPointsContextFillLayer.swift in Sources */, 4FF4D0F81E1725B000846527 /* NibLoadable.swift in Sources */, 4326BA641F3A44D9007CCAD4 /* ChartLineModel.swift in Sources */, + 4374B5F0209D857E00D17AA8 /* OSLog.swift in Sources */, 4F7528AA1DFE215100C322D6 /* HKUnit.swift in Sources */, - 4F7528A91DFE212600C322D6 /* GlucoseTrend.swift in Sources */, - 4F7528A71DFE20CE00C322D6 /* SensorDisplayable.swift in Sources */, 4FB76FB61E8C426900B39636 /* ChartPointsTouchHighlightLayerViewCache.swift in Sources */, 4F2C15931E09BF2C00E160D4 /* HUDView.swift in Sources */, 43BFF0B71E45C20C00FF19A9 /* NumberFormatter.swift in Sources */, @@ -1838,6 +1984,21 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 432CF87D20D8B8990066B889 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 432CF87720D8B8380066B889 /* Cartfile */; + targetProxy = 432CF87C20D8B8990066B889 /* PBXContainerItemProxy */; + }; + 432CF87F20D8BC3B0066B889 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 432CF87720D8B8380066B889 /* Cartfile */; + targetProxy = 432CF87E20D8BC3B0066B889 /* PBXContainerItemProxy */; + }; + 432CF88120D8BC460066B889 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 432CF87720D8B8380066B889 /* Cartfile */; + targetProxy = 432CF88020D8BC460066B889 /* PBXContainerItemProxy */; + }; 43A943811B926B7B0051FA24 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 43A9437D1B926B7B0051FA24 /* WatchApp Extension */; @@ -2023,6 +2184,22 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 432CF87920D8B8380066B889 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 432CF87A20D8B8380066B889 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 43776FB41B8022E90074EA36 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */; @@ -2055,7 +2232,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -2077,7 +2254,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.1; MAIN_APP_BUNDLE_IDENTIFIER = "$(inherited).Loop"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -2086,7 +2263,7 @@ SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = "-Wall"; - WATCHOS_DEPLOYMENT_TARGET = 3.2; + WATCHOS_DEPLOYMENT_TARGET = 4.3; }; name = Debug; }; @@ -2122,7 +2299,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -2138,7 +2315,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.1; MAIN_APP_BUNDLE_IDENTIFIER = "$(inherited).Loop"; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -2147,7 +2324,7 @@ TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = "-Wall"; - WATCHOS_DEPLOYMENT_TARGET = 3.2; + WATCHOS_DEPLOYMENT_TARGET = 4.3; }; name = Release; }; @@ -2192,6 +2369,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; + FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/watchOS"; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).LoopWatch.watchkitextension"; @@ -2211,6 +2389,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; + FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/watchOS"; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).LoopWatch.watchkitextension"; @@ -2230,6 +2409,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; + FRAMEWORK_SEARCH_PATHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2250,6 +2430,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; + FRAMEWORK_SEARCH_PATHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2364,11 +2545,11 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 48; + DYLIB_CURRENT_VERSION = 49; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = LoopUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -2391,11 +2572,11 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 48; + DYLIB_CURRENT_VERSION = 49; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = LoopUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -2411,6 +2592,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 432CF87820D8B8380066B889 /* Build configuration list for PBXAggregateTarget "Cartfile" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 432CF87920D8B8380066B889 /* Debug */, + 432CF87A20D8B8380066B889 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 43776F871B8022E90074EA36 /* Build configuration list for PBXProject "Loop" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme index ab563e3f5a..41e44bba86 100644 --- a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme +++ b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme @@ -1,6 +1,6 @@ + + + + - + - + @@ -20,7 +20,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -210,13 +210,13 @@ @@ -250,7 +250,7 @@ - + @@ -274,27 +274,27 @@ - + - + @@ -315,7 +315,7 @@ - + @@ -368,10 +368,10 @@ - + - + @@ -385,16 +385,16 @@ - + - + @@ -418,16 +418,16 @@ - +