Merge pull request #1529 from LoopKit/loop-release/v2.2.5

Loop release v2.2.5

Author: ps2

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" "dev"
-github "LoopKit/CGMBLEKit" "dev"
+github "LoopKit/LoopKit" "loop-release/v2.2.5"
+github "LoopKit/CGMBLEKit" "loop-release/v2.2.5"
 github "i-schuetz/SwiftCharts" == 0.6.5
-github "LoopKit/dexcom-share-client-swift" "dev"
-github "LoopKit/G4ShareSpy" "dev"
-github "ps2/rileylink_ios" "carthage-pin"
-github "LoopKit/Amplitude-iOS" "decreepify"
+github "LoopKit/dexcom-share-client-swift" "loop-release/v2.2.5"
+github "LoopKit/G4ShareSpy" "loop-release/v2.2.5"
+github "ps2/rileylink_ios" "loop-release/v2.2.5"
+github "LoopKit/Amplitude-iOS" "main"

Cartfile.resolved

@@ -1,8 +1,8 @@
-github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "7b4c1022eb6b91ae3975bfc8ce93fde8e496b4f3"
-github "LoopKit/G4ShareSpy" "3b749bc7f6323ad8303af6c755ba9b5649eff816"
-github "LoopKit/LoopKit" "5f459ee56ecd17c740c5fa0142353f3eb5b6120d"
+github "LoopKit/Amplitude-iOS" "de32f16cf1d4d83002bafa31b0aab129b991f82b"
+github "LoopKit/CGMBLEKit" "4fea57fb346ab7480c9740ec813bb58acb7fa686"
+github "LoopKit/G4ShareSpy" "c80eedb4260b47fdad56b1c568275f8ad1b814a5"
+github "LoopKit/LoopKit" "82dbcd84445976a698c01b214ec2afc6bec17155"
 github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
-github "LoopKit/dexcom-share-client-swift" "68ea5d08588e00bf148518b126416b8352dbef64"
+github "LoopKit/dexcom-share-client-swift" "b9acf057851271aea0b5759c3062acd58ed9e8f9"
 github "i-schuetz/SwiftCharts" "0.6.5"
-github "ps2/rileylink_ios" "1d0ca309f3131ee58da26f31d89eecad8781c77b"
+github "ps2/rileylink_ios" "3c5b31a04e0164321343cb0e8c829b625224bd09"

Common/Extensions/NSBundle.swift

@@ -17,7 +17,7 @@ extension Bundle {
     var bundleDisplayName: String {
         return object(forInfoDictionaryKey: "CFBundleDisplayName") as! String
     }
-
+    
     var localizedNameAndVersion: String {
         return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, shortVersionString)
     }
@@ -61,4 +61,16 @@ extension Bundle {
     var xcodeVersion: String? {
         return object(forInfoDictionaryKey: "com-loopkit-Loop-xcode-version") as? String
     }
+    
+    var profileExpiration: Date? {
+        return object(forInfoDictionaryKey: "com-loopkit-Loop-profile-expiration") as? Date
+    }
+
+    var profileExpirationString: String {
+        if let profileExpiration = profileExpiration {
+            return "\(profileExpiration)"
+        } else {
+            return "N/A"
+        }
+    }
 }

Common/Extensions/NSTimeInterval.swift

@@ -18,9 +18,14 @@ extension TimeInterval {
         return TimeInterval(minutes: minutes)
     }
 
+
     static func hours(_ hours: Double) -> TimeInterval {
         return TimeInterval(hours: hours)
     }
+    
+    static func days(_ days: Double) -> TimeInterval {
+        return TimeInterval(days: days)
+    }
 
     init(minutes: Double) {
         self.init(minutes * 60)
@@ -30,6 +35,10 @@ extension TimeInterval {
         self.init(minutes: hours * 60)
     }
 
+    init(days: Double) {
+        self.init(hours: days * 24)
+    }
+
     var minutes: Double {
         return self / 60.0
     }