Browse Source

Merge branch 'dev' into remote-apns-feedback

Jonas Björkert 7 months ago
parent
commit
266b82bc8a

+ 1 - 1
CGMBLEKit

@@ -1 +1 @@
-Subproject commit cd8f6faec67b30231987b79daf0117dfcbb54741
+Subproject commit b583df15f633fd29ad85ef22001af259cb544a75

+ 1 - 1
Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 0.5.1
-APP_DEV_VERSION = 0.5.1.23
+APP_DEV_VERSION = 0.5.1.28
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

+ 1 - 1
DanaKit

@@ -1 +1 @@
-Subproject commit 33a8d4705fc82b371daf4bd5977ed2cfaf420204
+Subproject commit 3e606b8e12d08d27a5942e7f4af9a07b642b676f

+ 1 - 1
G7SensorKit

@@ -1 +1 @@
-Subproject commit 7a9341c77c89b3493254da25912e3dc558e1ae26
+Subproject commit 84c5f4ea27fb445ed3e2108044569c8d881bc50b

+ 1 - 0
Gemfile

@@ -4,3 +4,4 @@ source "https://rubygems.org"
 
 # This branch uses fastlane 2.228.0 plus pr 29596
 gem "fastlane",  git: "https://github.com/loopandlearn/fastlane.git", ref: "a670d4b092b274d58ebb5497126e47fc6a84f533"
+gem "rexml", ">=3.4.2"

+ 17 - 14
Gemfile.lock

@@ -58,25 +58,27 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1116.0)
-    aws-sdk-core (3.225.2)
+    aws-partitions (1.1163.0)
+    aws-sdk-core (3.232.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.112.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.189.1)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.199.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
+    bigdecimal (3.2.3)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -105,10 +107,10 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -163,13 +165,13 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.2)
-    jwt (2.10.1)
+    json (2.15.0)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
@@ -185,15 +187,15 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList
@@ -233,6 +235,7 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane!
+  rexml (>= 3.4.2)
 
 BUNDLED WITH
    2.6.2

+ 1 - 1
LibreTransmitter

@@ -1 +1 @@
-Subproject commit a80ffb4bbc1cc72778cbf4eb69e90b4ff63dd5bf
+Subproject commit 709b22ea1a2ac1a096c9a7bb3d2e65f7839c2d51

+ 1 - 1
LoopKit

@@ -1 +1 @@
-Subproject commit edb69560cb921a8848ea0a450c89bd26cbe54046
+Subproject commit c2b0dd503cfbe4c056e61a6d6842d28f5c66af9a

+ 1 - 1
MinimedKit

@@ -1 +1 @@
-Subproject commit ecd3588bdab3844617e17601ba2da1c28e786e77
+Subproject commit d367254415691ef1835cfd70a3af390b0a6aad81

+ 1 - 1
OmniBLE

@@ -1 +1 @@
-Subproject commit 97fe52f1a43edad69a80fccce5fddb10cc813b3d
+Subproject commit 99ded91567594c9ce0d5d0a86335670085ad5764

+ 1 - 1
OmniKit

@@ -1 +1 @@
-Subproject commit 12058d3d0394cd4269468513d838e570faf5853b
+Subproject commit 858618d2ed8fe5779152a8ce55e716fa1921e95d

+ 1 - 1
RileyLinkKit

@@ -1 +1 @@
-Subproject commit eddfd4f00bbf0d78035dc31e6f7715e72252c566
+Subproject commit 2ab3daa50553b8886b411f67d9773a2f32fc7e8c

+ 1 - 1
TidepoolService

@@ -1 +1 @@
-Subproject commit b28625628e181b96f0db7ec3739d920a3c92465b
+Subproject commit a25223890bf60e35f02a7096d1d2f76268d42930

+ 2 - 0
Trio/Resources/Info.plist

@@ -107,6 +107,8 @@
 		<string>remote-notification</string>
 		<string>audio</string>
 	</array>
+    <key>UIDesignRequiresCompatibility</key>
+    <true/>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchScreen</key>

+ 15 - 0
Trio/Sources/Modules/Stat/View/ViewElements/Glucose/GlucosePercentileChart.swift

@@ -36,6 +36,20 @@ struct GlucosePercentileChart: View {
         return hourlyStats.first { Int($0.hour) == hour }
     }
 
+    /// The minimum Y-axis value based on the lowest possible cgm reading
+    private var minYValue: Double {
+        40.0.asUnit(units)
+    }
+
+    /// The maximum Y-axis value based on the highest 90th percentile
+    private var maxYValue: Double {
+        let topLimit = 400.0.asUnit(units)
+        let validStats = hourlyStats.filter { $0.median > 0 }
+        guard !validStats.isEmpty else { return topLimit }
+        let maxPercentile90 = validStats.map(\.percentile90).max() ?? topLimit
+        return maxPercentile90.asUnit(units)
+    }
+
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
             Text("Ambulatory Glucose Profile (AGP)")
@@ -131,6 +145,7 @@ struct GlucosePercentileChart: View {
                     }
                 }
             }
+            .chartYScale(domain: minYValue ... maxYValue)
             .chartYAxis {
                 AxisMarks(position: .trailing) { value in
                     if let glucose = value.as(Double.self) {

+ 1 - 1
dexcom-share-client-swift

@@ -1 +1 @@
-Subproject commit 21d8657d727f26df76342188e580022bf4884714
+Subproject commit 2e9ebf07af058b6286f0e30e2051a62c9fe68a69