Skip to content

Commit b6e96de

Browse files
ps2novalegraJean-Phi37MatteBmylma
authored
Release 2.2.1 (LoopKit#1354)
* Bump version for dev * Add Spanish translations * Add back comment * Updated French translations * Updated French translations (Watch) * Updated French translations (carb-entry-title-add title) * Bump carthage rev * Bump carthage revisions * Bump cartfile revs * Swedish translation update (LoopKit#1317) Added translation for new strings in Loop 2.2. Co-authored-by: Pete Schwamb <[email protected]> * Update HealthKit usage Finnish description (LoopKit#1295) * Bump cartfile revisions * Bump carthage revisions for translation updates * Use prediction that includes pending insulin Use prediction that includes pending insulin in: * Nightscout uploads * Issue Report * Status Extension * Update DeviceDataManager.swift (LoopKit#1328) Add markdown for easy parsing of Loop Version * Adding Arabic translation (LoopKit#1332) * Fix app icon link in README.md (LoopKit#1311) * Create ar.lproj * Delete ar.lproj * Add files via upload * Update Localizable.strings * Update Main.strings * Update InfoPlist.strings * Update Main.strings * Update Localizable.strings * Add files via upload * Update Intents.strings * Update Localizable.strings * Add files via upload * Update Localizable.strings * Update Main.strings * Add files via upload * Update Localizable.strings * Add files via upload Co-authored-by: Pete Schwamb <[email protected]> Co-authored-by: James Woglom <[email protected]> * Bump carthage revisions * Dev-Complete ِArabic translations (LoopKit#1334) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update Localizable.strings * Add files via upload * Delete Interface.strings * Add files via upload * Delete Interface.strings * Add files via upload * Delete Interface.strings * Add files via upload * Update Arabic translations * Update Interface.strings * back to English Co-authored-by: AQ <[email protected]> Co-authored-by: Jean-Philippe Baud <[email protected]> Co-authored-by: MatteB <[email protected]> Co-authored-by: Marko Myllyaho <[email protected]> Co-authored-by: Marion Barker <[email protected]> Co-authored-by: Ahmed <[email protected]> Co-authored-by: James Woglom <[email protected]>
1 parent 5b3f10a commit b6e96de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1906
-147
lines changed

Diff for: ‎Cartfile.resolved

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
2-
github "LoopKit/CGMBLEKit" "edcf503ef8fe260b69ca98eae508e679dfd9ad69"
3-
github "LoopKit/G4ShareSpy" "88c5a296e83ce618319ae365a7e6da76d9be126b"
4-
github "LoopKit/LoopKit" "6940ab10d258b21e0a33aa5729b1111a8d332d77"
2+
github "LoopKit/CGMBLEKit" "7b4c1022eb6b91ae3975bfc8ce93fde8e496b4f3"
3+
github "LoopKit/G4ShareSpy" "3b749bc7f6323ad8303af6c755ba9b5649eff816"
4+
github "LoopKit/LoopKit" "953b58e617379354b89ea33e0fd8f220ccc2d366"
55
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
6-
github "LoopKit/dexcom-share-client-swift" "c37d87fcf121c44721e87c9e6d2bea94e48728cc"
6+
github "LoopKit/dexcom-share-client-swift" "146cccfe4eba5f536487777a72e0e47834fff64e"
77
github "i-schuetz/SwiftCharts" "0.6.5"
8-
github "ps2/rileylink_ios" "c33115c038a7d133234cfa8b73c80603ff10a599"
8+
github "ps2/rileylink_ios" "802cc005e3eb10cb5e407586210ceb62a57f8c22"

Diff for: ‎Common/es.lproj/Intents.strings

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66

77
/* INIntentDescription */
88
"yc02Yq" = "Agregar registro de carbs a Loop";
9+

Diff for: ‎Common/es.lproj/Localizable.strings

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
/* Title of the user activity for adding carbs */
55
"Add Carb Entry" = "Agregar Registro de Carbs";
66

7+
/* Lesson subtitle */
8+
"Computes the percentage of glucose measurements within a specified range" = "Calcula el porcentaje de medidas de glucosa entre una gama especificada";
9+
710
/* The short unit display string for decibles */
811
"dB" = "dB";
912

@@ -19,5 +22,12 @@
1922
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
2023
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
2124

25+
/* Section title for glucose range */
26+
"Range" = "Rango";
27+
28+
/* Title of config entry */
29+
"Start Date" = "Fecha de Inicio";
30+
2231
/* The short unit display string for international units of insulin */
2332
"U" = "U";
33+

Diff for: ‎Common/fr.lproj/Localizable.strings

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
/* Title of the user activity for adding carbs */
55
"Add Carb Entry" = "Ajouter des glucides";
66

7+
/* Lesson subtitle */
8+
"Computes the percentage of glucose measurements within a specified range" = "Ceci calcule le pourcentage des mesures de glycémie dans une plage spécifique";
9+
710
/* The short unit display string for decibles */
811
"dB" = "dB";
912

@@ -19,6 +22,12 @@
1922
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
2023
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
2124

25+
/* Section title for glucose range */
26+
"Range" = "Plage";
27+
28+
/* Title of config entry */
29+
"Start Date" = "Date de commencement";
30+
2231
/* The short unit display string for international units of insulin */
2332
"U" = "U";
2433

Diff for: ‎Common/‏‏ar.lproj/Intents.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* INIntentTitle */
2+
"80eo5o" = "أضف كمية الكارب";
3+
4+
/* INIntentParameterCombinationTitle */
5+
"OcNxIj" = "أضف كمية الكارب";
6+
7+
/* INIntentDescription */
8+
"yc02Yq" = "أضف كمية الكارب للتطبيق";

Diff for: ‎Common/‏‏ar.lproj/Localizable.strings

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
2+
"%1$@ v%2$@" = "%1$@ v%2$@";
3+
4+
/* Title of the user activity for adding carbs */
5+
"Add Carb Entry" = "أضف كمية الكارب";
6+
7+
/* Lesson subtitle */
8+
"Computes the percentage of glucose measurements within a specified range" = "لحساب النسبة المئوية لقراءات سكر الدم ضمن نطاق محدد";
9+
10+
/* Title of the button to begin lesson execution */
11+
"Continue" = "متابعة";
12+
13+
/* The short unit display string for decibles */
14+
"dB" = "dB";
15+
16+
/* The short unit display string for grams */
17+
"g" = "g";
18+
19+
/* Placeholder for upper range entry */
20+
"Maximum" = "الحد الأعلى";
21+
22+
/* The short unit display string for milligrams of glucose per decilter */
23+
"mg/dL" = "mg/dl";
24+
25+
/* Placeholder for lower range entry */
26+
"Minimum" = "الحد الأدنى";
27+
28+
/* The short unit display string for millimoles of glucose per liter */
29+
"mmol/L" = "mmol/l";
30+
31+
/* Lesson title */
32+
"Modal Day" = "يوم طبيعي";
33+
34+
/* Lesson result text for no data */
35+
"No data available" = "لا يوجد بيانات متاحة";
36+
37+
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
38+
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
39+
40+
/* Section title for glucose range */
41+
"Range" = "النطاق";
42+
43+
/* Title of config entry */
44+
"Start Date" = "تاريخ البداية";
45+
46+
/* Lesson title */
47+
"Time in Range" = "الوقت في النطاق";
48+
49+
/* The short unit display string for international units of insulin */
50+
"U" = "وحدة";
51+
52+
/* Lesson subtitle */
53+
"Visualizes the most frequent glucose values by time of day" = "يعرض قراءات سكر الدم الأكثر شيوعًا في أوقات مختلفة من اليوم";
54+
55+
/* Unit string for a count of calendar weeks */
56+
"Weeks" = "أسابيع";

Diff for: ‎DoseMathTests/ar.lproj/Localizable.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Message when offering bolus recommendation even though bg is below range. (1: glucose value) */
2+
"Current glucose of %1$@ is below correction range." = "سكر الدم الحالي %1$@ أقل من نطاق التصحيح.";
3+
4+
/* The short unit display string for decibles */
5+
"dB" = "dB";
6+
7+
/* The short unit display string for grams */
8+
"g" = "g";
9+
10+
/* The short unit display string for milligrams of glucose per decilter */
11+
"mg/dL" = "mg/dL";
12+
13+
/* The short unit display string for millimoles of glucose per liter */
14+
"mmol/L" = "mmol/L";
15+
16+
/* Message when offering bolus recommendation even though bg is below range and minBG is in future. (1: glucose time)(2: glucose number) */
17+
"Predicted glucose at %1$@ is %2$@." = "متوقع سكر الدم خلال %1$@ هو %2$@.";
18+
19+
/* Notice message when recommending bolus when BG is below the suspend threshold. (1: glucose value) */
20+
"Predicted glucose of %1$@ is below your suspend threshold setting." = "متوقع سكر الدم %1$@ أقل من إعدادات التعليق المؤقت.";
21+
22+
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
23+
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
24+
25+
/* The short unit display string for international units of insulin */
26+
"U" = "وحدة";
27+

Diff for: ‎Interface.strings

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
2+
/* Class = "WKInterfaceButton"; title = "🌮"; ObjectID = "0fo-Z3-hTi"; */
3+
"0fo-Z3-hTi.title" = "🌮";
4+
5+
/* Class = "WKInterfaceLabel"; text = "15"; ObjectID = "CWt-7U-cnK"; */
6+
"CWt-7U-cnK.text" = "15";
7+
8+
/* Class = "WKInterfaceLabel"; text = "—"; ObjectID = "CsQ-fc-KLC"; */
9+
"CsQ-fc-KLC.text" = "—";
10+
11+
/* Class = "WKInterfaceButton"; accessibilityLabel = "Add"; ObjectID = "DZc-Gn-RLu"; */
12+
"DZc-Gn-RLu.accessibilityLabel" = "Add";
13+
14+
/* Class = "WKInterfaceButton"; title = "+"; ObjectID = "DZc-Gn-RLu"; */
15+
"DZc-Gn-RLu.title" = "+";
16+
17+
/* Class = "WKInterfaceButton"; accessibilityLabel = "Subtract"; ObjectID = "Dh9-HV-fXy"; */
18+
"Dh9-HV-fXy.accessibilityLabel" = "Subtract";
19+
20+
/* Class = "WKInterfaceButton"; title = "−"; ObjectID = "Dh9-HV-fXy"; */
21+
"Dh9-HV-fXy.title" = "−";
22+
23+
/* Class = "WKInterfaceLabel"; text = "---"; ObjectID = "Dt1-kz-jMZ"; */
24+
"Dt1-kz-jMZ.text" = "---";
25+
26+
/* Class = "WKInterfaceLabel"; text = "—"; ObjectID = "IRi-4t-ESO"; */
27+
"IRi-4t-ESO.text" = "—";
28+
29+
/* Class = "WKInterfaceLabel"; text = "Running"; ObjectID = "JXa-s1-PJx"; */
30+
"JXa-s1-PJx.text" = "Running";
31+
32+
/* Class = "WKInterfaceLabel"; text = "TITLE"; ObjectID = "MZU-QV-PtZ"; */
33+
"MZU-QV-PtZ.text" = "TITLE";
34+
35+
/* Class = "WKInterfaceLabel"; text = "—"; ObjectID = "Mhe-aR-kQQ"; */
36+
"Mhe-aR-kQQ.text" = "—";
37+
38+
/* Class = "WKInterfaceButton"; title = "Bolus"; ObjectID = "Qsq-p5-1J0"; */
39+
"Qsq-p5-1J0.title" = "Bolus";
40+
41+
/* Class = "WKInterfaceLabel"; text = "Label"; ObjectID = "T4U-wP-dSW"; */
42+
"T4U-wP-dSW.text" = "Label";
43+
44+
/* Class = "WKInterfaceLabel"; text = "🏃‍♀️"; ObjectID = "UVY-pa-SUL"; */
45+
"UVY-pa-SUL.text" = "🏃‍♀️";
46+
47+
/* Class = "WKInterfaceLabel"; text = "10:09 AM"; ObjectID = "Ury-of-vQg"; */
48+
"Ury-of-vQg.text" = "10:09 AM";
49+
50+
/* Class = "WKInterfaceLabel"; text = "<body>"; ObjectID = "XkS-y5-khE"; */
51+
"XkS-y5-khE.text" = "<body>";
52+
53+
/* Class = "WKInterfaceButton"; title = "Add Carbs"; ObjectID = "b6f-3I-jki"; */
54+
"b6f-3I-jki.title" = "Add Carbs";
55+
56+
/* Class = "WKInterfaceButton"; title = "🍕"; ObjectID = "dPF-QZ-sh6"; */
57+
"dPF-QZ-sh6.title" = "🍕";
58+
59+
/* Class = "WKInterfaceMenuItem"; title = "2 hours"; ObjectID = "dPh-7b-Tfv"; */
60+
"dPh-7b-Tfv.title" = "2 hours";
61+
62+
/* Class = "WKInterfaceLabel"; text = "TOTAL CARBS"; ObjectID = "dea-qG-va8"; */
63+
"dea-qG-va8.text" = "TOTAL CARBS";
64+
65+
/* Class = "WKInterfaceButton"; accessibilityLabel = "Add"; ObjectID = "eu3-pj-GH3"; */
66+
"eu3-pj-GH3.accessibilityLabel" = "Add";
67+
68+
/* Class = "WKInterfaceButton"; title = "+"; ObjectID = "eu3-pj-GH3"; */
69+
"eu3-pj-GH3.title" = "+";
70+
71+
/* Class = "WKInterfaceLabel"; text = "Pre-Meal"; ObjectID = "f5G-bS-9pd"; */
72+
"f5G-bS-9pd.text" = "Pre-Meal";
73+
74+
/* Class = "WKInterfaceMenuItem"; title = "3 hours"; ObjectID = "fR1-7h-SNe"; */
75+
"fR1-7h-SNe.title" = "3 hours";
76+
77+
/* Class = "WKInterfaceButton"; title = "🍭"; ObjectID = "gAn-qe-OvX"; */
78+
"gAn-qe-OvX.title" = "🍭";
79+
80+
/* Class = "WKInterfaceButton"; accessibilityLabel = "Subtract"; ObjectID = "hjF-xr-cwO"; */
81+
"hjF-xr-cwO.accessibilityLabel" = "Subtract";
82+
83+
/* Class = "WKInterfaceButton"; title = "−"; ObjectID = "hjF-xr-cwO"; */
84+
"hjF-xr-cwO.title" = "−";
85+
86+
/* Class = "WKInterfaceLabel"; text = "Carbs"; ObjectID = "hln-CI-MRP"; */
87+
"hln-CI-MRP.text" = "Carbs";
88+
89+
/* Class = "WKInterfaceLabel"; text = "Bolus Failed"; ObjectID = "jj3-Gq-HBy"; */
90+
"jj3-Gq-HBy.text" = "Bolus Failed";
91+
92+
/* Class = "WKInterfaceLabel"; text = "0.000"; ObjectID = "mpK-zY-UvA"; */
93+
"mpK-zY-UvA.text" = "0.000";
94+
95+
/* Class = "WKInterfaceLabel"; text = "Override"; ObjectID = "nC0-X3-oFJ"; */
96+
"nC0-X3-oFJ.text" = "Override";
97+
98+
/* Class = "WKInterfaceController"; title = "Loop"; ObjectID = "rNf-Mh-tID"; */
99+
"rNf-Mh-tID.title" = "Loop";
100+
101+
/* Class = "WKInterfaceLabel"; text = "UNITS"; ObjectID = "rV7-d9-n6u"; */
102+
"rV7-d9-n6u.text" = "UNITS";
103+
104+
/* Class = "WKInterfaceLabel"; text = "Bolus"; ObjectID = "smL-Rc-IZh"; */
105+
"smL-Rc-IZh.text" = "Bolus";
106+
107+
/* Class = "WKInterfaceController"; title = "Loop"; ObjectID = "v5b-sO-bb8"; */
108+
"v5b-sO-bb8.title" = "Loop";
109+
110+
/* Class = "WKInterfaceMenuItem"; title = "1 hour"; ObjectID = "vL1-NA-WZ1"; */
111+
"vL1-NA-WZ1.title" = "1 hour";
112+
113+
/* Class = "WKInterfaceLabel"; text = "ACTIVE CARBS"; ObjectID = "ycL-5X-a05"; */
114+
"ycL-5X-a05.text" = "ACTIVE CARBS";
115+
116+
/* Class = "WKInterfaceLabel"; text = "---"; ObjectID = "yl8-ZP-c3l"; */
117+
"yl8-ZP-c3l.text" = "---";
118+
119+
/* Class = "WKInterfaceLabel"; text = "Label"; ObjectID = "zO8-x6-bZd"; */
120+
"zO8-x6-bZd.text" = "Label";

Diff for: ‎Learn/ar.lproj/Localizable.strings

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* Lesson subtitle */
2+
"Computes the percentage of glucose measurements within a specified range" = "حساب النسبة المئوية لقراءات سكر الدم ضمن نطاق محدد";
3+
4+
/* Title of the button to begin lesson execution */
5+
"Continue" = "متابعة";
6+
7+
/* Placeholder for upper range entry */
8+
"Maximum" = "الحد الأعلى";
9+
10+
/* Placeholder for lower range entry */
11+
"Minimum" = "الحد الأدنى";
12+
13+
/* Lesson title */
14+
"Modal Day" = "يوم طبيعي";
15+
16+
/* Lesson result text for no data */
17+
"No data available" = "لا يوجد بيانات متاحة";
18+
19+
/* Section title for glucose range */
20+
"Range" = "النطاق";
21+
22+
/* Title of config entry */
23+
"Start Date" = "تاريخ البداية";
24+
25+
/* Lesson title */
26+
"Time in Range" = "الوقت في النطاق";
27+
28+
/* Lesson subtitle */
29+
"Visualizes the most frequent glucose values by time of day" = "يعرض قراءات سكر الدم الأكثر شيوعًا في أوقات مختلفة من اليوم";
30+
31+
/* Unit string for a count of calendar weeks */
32+
"Weeks" = "أسابيع";

Diff for: ‎Learn/ar.lproj/Main.strings

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
/* Class = "UINavigationItem"; title = "Learn"; ObjectID = "8hF-Ij-B7m"; */
3+
"8hF-Ij-B7m.title" = "تعلم";

Diff for: ‎Learn/es.lproj/Main.strings

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
21
/* Class = "UINavigationItem"; title = "Learn"; ObjectID = "8hF-Ij-B7m"; */
32
"8hF-Ij-B7m.title" = "Aprender";
3+

Diff for: ‎Learn/fi.lproj/InfoPlist.strings

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/* Privacy - Health Share Usage Description */
2-
"NSHealthShareUsageDescription" = "Terveys-sovelluksen ateriatietoja käytetään glukoosivaikutusten määrittämiseen. Terveys-sovelluksen glukoositietoja käytetään graafeissa ja laskelmissa.";
2+
"NSHealthShareUsageDescription" = "Terveys-sovelluksen ateriatietoja käytetään glukoosivaikutusten määrittämiseen. Terveys-sovelluksen glukoositietoja käytetään graafeissa ja laskelmissa. Unitietoja käytetään Apple Watch -komplikaation toiminnan optimointiin hereillä olon aikana.";
33

Diff for: ‎Learn/fr.lproj/Localizable.strings

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Minimum" = "Minimum";
1212

1313
/* Lesson title */
14-
"Modal Day" = "Journée type</";
14+
"Modal Day" = "Journée type";
1515

1616
/* Lesson result text for no data */
1717
"No data available" = "Données indisponibles";

Diff for: ‎Loop Status Extension/ar.lproj/Localizable.strings

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/* The subtitle format describing eventual glucose. (1: localized glucose value description) */
2+
"Eventually %1$@" = "متوقع %1$@";
3+
4+
/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
5+
"IOB %1$@ U" = "أنسولين نشط %1$@ وحدة";

Diff for: ‎Loop Status Extension/ar.lproj/MainInterface.strings

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
/* Class = "UILabel"; text = "Eventually 92 mg/dL"; ObjectID = "9iF-xY-Bh4"; */
3+
"9iF-xY-Bh4.text" = "متوقع 92 mg/dL";
4+
5+
/* Class = "UILabel"; text = "IOB 1.0 U"; ObjectID = "UPi-dG-yYD"; */
6+
"UPi-dG-yYD.text" = "أنسولين نشط 1.0 وحدة";

Diff for: ‎Loop Status Extension/es.lproj/Localizable.strings

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33

44
/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
55
"IOB %1$@ U" = "IOB %1$@ U";
6+

Diff for: ‎Loop.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
MAIN_APP_BUNDLE_IDENTIFIER = com.${DEVELOPMENT_TEAM}.loopkit
1212
MAIN_APP_DISPLAY_NAME = Loop
1313

14-
LOOP_MARKETING_VERSION = 2.2.0
14+
LOOP_MARKETING_VERSION = 2.3.0
1515

1616
APPICON_NAME = AppIcon
1717

Diff for: ‎Loop/Managers/DeviceDataManager.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ final class DeviceDataManager {
208208
}
209209

210210
let report = [
211-
Bundle.main.localizedNameAndVersion,
211+
"## LoopVersion",
212+
"* Version: \(Bundle.main.localizedNameAndVersion)",
212213
"* gitRevision: \(Bundle.main.gitRevision ?? "N/A")",
213214
"* gitBranch: \(Bundle.main.gitBranch ?? "N/A")",
214215
"* sourceRoot: \(Bundle.main.sourceRoot ?? "N/A")",

Diff for: ‎Loop/Managers/LoopDataManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ extension LoopDataManager {
14881488

14891489
"predictedGlucose: [",
14901490
"* PredictedGlucoseValue(start, mg/dL)",
1491-
(state.predictedGlucose ?? []).reduce(into: "", { (entries, entry) in
1491+
(state.predictedGlucoseIncludingPendingInsulin ?? []).reduce(into: "", { (entries, entry) in
14921492
entries.append("* \(entry.startDate), \(entry.quantity.doubleValue(for: .milligramsPerDeciliter))\n")
14931493
}),
14941494
"]",

Diff for: ‎Loop/Managers/NightscoutDataManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ final class NightscoutDataManager {
178178
recommendedBolus = state.recommendedBolus?.recommendation.amount
179179

180180
let carbsOnBoard = state.carbsOnBoard
181-
let predictedGlucose = state.predictedGlucose
181+
let predictedGlucose = state.predictedGlucoseIncludingPendingInsulin
182182
let recommendedTempBasal = state.recommendedTempBasal
183183

184184
manager.doseStore.insulinOnBoard(at: Date()) { (result) in

Diff for: ‎Loop/Managers/StatusExtensionDataManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ final class StatusExtensionDataManager {
8585

8686
// Drop the first element in predictedGlucose because it is the currentGlucose
8787
// and will have a different interval to the next element
88-
if let predictedGlucose = state.predictedGlucose?.dropFirst(),
88+
if let predictedGlucose = state.predictedGlucoseIncludingPendingInsulin?.dropFirst(),
8989
predictedGlucose.count > 1 {
9090
let first = predictedGlucose[predictedGlucose.startIndex]
9191
let second = predictedGlucose[predictedGlucose.startIndex.advanced(by: 1)]

0 commit comments

Comments
 (0)