Merge branch 'dev' into recommended-bolus-to-nightscout

CGMBLEKit

@@ -1 +1 @@
-Subproject commit b583df15f633fd29ad85ef22001af259cb544a75
+Subproject commit 1cc9e9e7627cf8fb76ccdb015dd6991196038e31

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.6.0
-APP_DEV_VERSION = 0.6.0.2
+APP_DEV_VERSION = 0.6.0.4
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

DanaKit

@@ -1 +1 @@
-Subproject commit 3e606b8e12d08d27a5942e7f4af9a07b642b676f
+Subproject commit 084de69f69b1b17c92b595b4d5afeaed5b5d1e55

G7SensorKit

@@ -1 +1 @@
-Subproject commit 84c5f4ea27fb445ed3e2108044569c8d881bc50b
+Subproject commit 9fa27889f0b216cbe0a23844e888de6698793b63

LibreTransmitter

@@ -1 +1 @@
-Subproject commit 709b22ea1a2ac1a096c9a7bb3d2e65f7839c2d51
+Subproject commit 1950f1fec2a0e9f256c1be6e5bafd06ff79d3144

LoopKit

@@ -1 +1 @@
-Subproject commit c2b0dd503cfbe4c056e61a6d6842d28f5c66af9a
+Subproject commit ddee20aca806f7635b8421617a675ddbd9c6d924

MinimedKit

@@ -1 +1 @@
-Subproject commit d367254415691ef1835cfd70a3af390b0a6aad81
+Subproject commit a1888623f398994e07ad970a0164be1117e9bec1

OmniBLE

@@ -1 +1 @@
-Subproject commit 99ded91567594c9ce0d5d0a86335670085ad5764
+Subproject commit e4378ba744a46c5f06f9507eabceb4072c058992

OmniKit

@@ -1 +1 @@
-Subproject commit 858618d2ed8fe5779152a8ce55e716fa1921e95d
+Subproject commit 1be14fcc27f22258cf8daa0355ac70c89737c0cc

RileyLinkKit

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

TidepoolService

@@ -1 +1 @@
-Subproject commit a25223890bf60e35f02a7096d1d2f76268d42930
+Subproject commit 59b0cd9384d180c7cccaf2cd2416fa2592a0ce45

Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -9473,6 +9473,7 @@
       }
     },
     "• A higher number means you're less sensitive to insulin" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -9578,6 +9579,9 @@
         }
       }
     },
+    "• A higher number means you're more sensitive (less resistant) to insulin" : {
+
+    },
     "• A lower number means you need more insulin for the same amount of carbs" : {
       "localizations" : {
         "bg" : {
@@ -9684,7 +9688,11 @@
         }
       }
     },
+    "• A lower number means you're less sensitive (more resistant) to insulin" : {
+
+    },
     "• A lower number means you're more sensitive to insulin" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -9790,7 +9798,72 @@
         }
       }
     },
+    "• A ratio of 10 g/U means 1 unit of insulin covers 10 g of carbs" : {
+      "localizations" : {
+        "da" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Et forhold på 10 g/E betyder 1 enhed insulin dækker 10 g kulhydrater"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Ein Verhältnis von 10 g/IE bedeutet, dass 1 IE Insulin 10 g Kohlenhydrate abdeckt"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• A ratio of 10 g/U means 1 unit of insulin covers 10 g of carbs"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• 10g/U의 비율은 인슐린 1단위가 탄수화물 10g을 처리하고 있음을 의미합니다"
+          }
+        },
+        "nb-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Et forhold på 10 g/E betyr at 1 enhet insulin dekker 10 g karbohydrater"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Een verhouding van 10 g/E betekent 1 eenheid insuline voor 10 g koolhydraten"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Stosunek 10 g/J oznacza, że 1 jednostka insuliny pokrywa 10 g węglowodanów"
+          }
+        },
+        "sv" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• En kvot på 10 g/E innebär att 1 enhet insulin täcker 10 g kolhydrater"
+          }
+        },
+        "vi" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Tỷ lệ 10 g/U có nghĩa là 1 đơn vị insulin dùng để xử lý 10 g carbs"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• 10 g/U 的比率代表著 1 單位的胰島素可以處理 10 g 的碳水化合物"
+          }
+        }
+      }
+    },
     "• A ratio of 10 g/U means 1 unit of insulin covers 10g of carbs" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -9896,7 +9969,78 @@
         }
       }
     },
+    "• An ISF of %@ %@/U means 1 U lowers your glucose by %@ %@" : {
+      "localizations" : {
+        "da" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• En ISF på %1$@ %2$@/E betyder, at 1 E sænker dit blodsukker med %3$@ %4$@"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Ein ISF von %1$@ %2$@/IE bedeutet, dass 1 IE Insulin die Glukose um %3$@ %4$@ senkt"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "• An ISF of %1$@ %2$@/U means 1 U lowers your glucose by %3$@ %4$@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Un ISF de %1$@ %2$@/U signifie qu’une unité d’insuline fait baisser votre mesure de glucose de %3$@ %4$@"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• ISF %1$@ %2$@/U 1 U이 혈당을 낮춥니다. %3$@ %4$@"
+          }
+        },
+        "nb-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• En ISF på %1$@ %2$@/E betyr at 1 E senker blodsukkeret ditt med %3$@ %4$@"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• Een ISF van %1$@ %2$@/U betekent dat 1 U je glucose met %3$@ %4$@ verlaagt"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• ISF %1$@ %2$@/J oznacza, że 1 J obniża poziom glukozy o %3$@ %4$@"
+          }
+        },
+        "sv" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• En ISF på %1$@ %2$@/E betyder att 1 E sänker ditt glukos med %3$@ %4$@"
+          }
+        },
+        "vi" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• ISF là %1$@ %2$@/U có nghĩa là 1 đơn vị insulin sẽ làm giảm đường huyết của bạn xuống %3$@ %4$@"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "• 一個 ISF 的 %1$@ %2$@/U 代表著 1 U 可以將您的血糖降低 %3$@ %4$@"
+          }
+        }
+      }
+    },
     "• An ISF of %@ means 1 U lowers your glucose by %@" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -100484,7 +100628,66 @@
         }
       }
     },
+    "For 45 g of carbs, you would need:" : {
+      "localizations" : {
+        "da" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "For 45 g kulhydrat ville du have brug for:"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Für 45 g Kohlenhydrate würdest Du benötigen:"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pour 45 g de glucides, vous auriez besoin de :"
+          }
+        },
+        "nb-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "For 45 g karbohydrater trenger du:"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Voor 45 g koolhydraten zou je nodig hebben:"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dla 45 g węglowodanów potrzebowałby:"
+          }
+        },
+        "sv" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "För 45 g kolhydrater skulle du behöva:"
+          }
+        },
+        "vi" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Với 45 g carbs, bạn sẽ cần:"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "對於 45 g 的碳水化合物，您需要："
+          }
+        }
+      }
+    },
     "For 45g of carbs, you would need:" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -233697,6 +233900,7 @@
       }
     },
     "Welcome to Trio - an automated insulin delivery system for iOS based on the OpenAPS algorithm with adaptations." : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {
@@ -233802,6 +234006,76 @@
         }
       }
     },
+    "Welcome to Trio — an automated insulin delivery system for iOS based on the OpenAPS algorithm with adaptations." : {
+      "localizations" : {
+        "da" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Velkommen til Trio — et automatiseret insulinleveringssystem til iOS baseret på OpenAPS-algoritmen med tilpasninger."
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Willkommen bei Trio — einem automatisierten Insulin Dosiersystem für iOS, basierend auf dem OpenAPS Algorithmus mit Anpassungen."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bienvenue dans Trio — un système de délivrance automatisée d’insuline pour iOS, basé sur l’algorithme OpenAPS avec des adaptations."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Welcome to Trio — an automated insulin delivery system for iOS based on the OpenAPS algorithm with adaptations."
+          }
+        },
+        "nb-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Velkommen til Trio — et system for automatisert insulinleveranse basert på OpenAPS-algoritmen."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Welkom bij Trio — een geautomatiseerd insulinetoedieningssysteem voor iOS op basis van het OpenAPS algoritme (met aanpassingen)."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Witamy w Trio — zautomatyzowanym systemie dostarczania insuliny dla systemu iOS opartym na algorytmie OpenAPS z adaptacjami."
+          }
+        },
+        "pt-PT" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Welcome to Trio — an automated insulin delivery system for iOS based on the OpenAPS algorithm with adaptations."
+          }
+        },
+        "sv" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Välkommen till Trio — ett automatiserat insulinleveranssystem för iOS baserat på OpenAPS-algoritmen med anpassningar."
+          }
+        },
+        "vi" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Chào mừng đến với Trio — hệ thống cung cấp insulin tự động cho iOS dựa trên thuật toán OpenAPS với nhiều cải tiến."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "歡迎來到 Trio 一個基於 OpenAPS 演算法的自動化胰島素輸送系統，適用於 iOS，並做了調整。"
+          }
+        }
+      }
+    },
     "What it Adjusts" : {
       "localizations" : {
         "bg" : {

Trio/Sources/Modules/Onboarding/View/OnboardingSteps/TherapySettings/CarbRatioStepView.swift

@@ -69,7 +69,7 @@ struct CarbRatioStepView: View {
                             .padding(.horizontal)
 
                         VStack(alignment: .leading, spacing: 8) {
-                            Text("For 45g of carbs, you would need:")
+                            Text("For 45 g of carbs, you would need:")
                                 .font(.subheadline)
                                 .padding(.horizontal)
 
@@ -79,7 +79,7 @@ struct CarbRatioStepView: View {
                                         .carbRatioRateValues[state.carbRatioItems.first!.rateIndex] as NSNumber
                                 )
                             Text(
-                                "45 \(String(localized: "g", comment: "Gram abbreviation")) / \(formatter.string(from: state.carbRatioRateValues[state.carbRatioItems.first!.rateIndex] as NSNumber) ?? "--")  = \(String(format: "%.1f", insulinNeeded))" +
+                                "45 \(String(localized: "g", comment: "Gram abbreviation")) / \(formatter.string(from: state.carbRatioRateValues[state.carbRatioItems.first!.rateIndex] as NSNumber) ?? "--") \(String(localized: "g/U")) = \(String(format: "%.1f", insulinNeeded))" +
                                     " " + String(localized: "U", comment: "Insulin unit abbreviation")
                             )
                             .font(.system(.body, design: .monospaced))
@@ -100,7 +100,7 @@ struct CarbRatioStepView: View {
                             .padding(.horizontal)
 
                         VStack(alignment: .leading, spacing: 4) {
-                            Text("• A ratio of 10 g/U means 1 unit of insulin covers 10g of carbs")
+                            Text("• A ratio of 10 g/U means 1 unit of insulin covers 10 g of carbs")
                             Text("• A lower number means you need more insulin for the same amount of carbs")
                             Text("• A higher number means you need less insulin for the same amount of carbs")
                             Text("• Different times of day may require different ratios")

Trio/Sources/Modules/Onboarding/View/OnboardingSteps/TherapySettings/InsulinSensitivityStepView.swift

@@ -106,13 +106,12 @@ struct InsulinSensitivityStepView: View {
                             .padding(.horizontal)
 
                         VStack(alignment: .leading, spacing: 4) {
-                            let isfValue = "\(state.units == .mgdL ? Decimal(50) : 50.asMmolL)" +
-                                "\(state.units.rawValue)"
+                            let isfValue = "\(state.units == .mgdL ? Decimal(50) : 50.asMmolL)"
                             Text(
-                                "• An ISF of \(isfValue) means 1 U lowers your glucose by \(isfValue)"
+                                "• An ISF of \(isfValue) \(state.units.rawValue)/U means 1 U lowers your glucose by \(isfValue) \(state.units.rawValue)"
                             )
-                            Text("• A lower number means you're more sensitive to insulin")
-                            Text("• A higher number means you're less sensitive to insulin")
+                            Text("• A lower number means you're less sensitive (more resistant) to insulin")
+                            Text("• A higher number means you're more sensitive (less resistant) to insulin")
                         }
                         .font(.caption)
                         .foregroundColor(.secondary)

Trio/Sources/Modules/Onboarding/View/OnboardingSteps/WelcomeStepView.swift

@@ -15,7 +15,7 @@ struct WelcomeStepView: View {
                     .multilineTextAlignment(.center)
 
                 Text(
-                    "Welcome to Trio - an automated insulin delivery system for iOS based on the OpenAPS algorithm with adaptations."
+                    "Welcome to Trio — an automated insulin delivery system for iOS based on the OpenAPS algorithm with adaptations."
                 )
                 .multilineTextAlignment(.leading)
                 .foregroundColor(.secondary)

dexcom-share-client-swift

@@ -1 +1 @@
-Subproject commit 2e9ebf07af058b6286f0e30e2051a62c9fe68a69
+Subproject commit 41cf95dab00f125f7a7602c433aac79fea8fc549

scripts/swiftformat.sh

@@ -97,4 +97,18 @@ trailingClosures \
 --typeattributes same-line \
 --varattributes same-line \
 --wrapcollections before-first \
---exclude Pods,Generated,R.generated.swift,fastlane/swift,Dependencies, LoopKit, LibreTransmitter,G7SensorKit,OmniKit, dexcom-share-client-swift,CGMBLEKit,RileyLinkKit,OmniBLE,MinimedKit,TidepoolService
+--exclude Pods, Generated, \
+  R.generated.swift, \
+  fastlane/swift, \
+  Dependencies,  \
+  LoopKit,  \
+  LibreTransmitter, \
+  G7SensorKit, \
+  OmniKit,  \
+  dexcom-share-client-swift, \
+  CGMBLEKit, \
+  RileyLinkKit, \
+  OmniBLE, \
+  MinimedKit, \
+  TidepoolService \
+  DanaKit