UI work

Dependencies/G7SensorKit/G7SensorKitUI/ru.lproj/Localizable.strings

@@ -99,7 +99,7 @@
 "Sensor failed" = "Сбой датчика";
 
 /* title for g7 settings row showing sensor start time */
-"Sensor Start" = "Start sensor";
+"Sensor Start" = "Запуск датчика";
 
 /* G7 Status highlight text for signal loss */
 "Signal\nLoss" = "Сигнал\nПотерян";

FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -30,7 +30,7 @@
  },
  {
  "package": "SwiftCharts",
- "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts",
+ "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts.git",
  "state": {
  "branch": "master",
  "revision": "c354c1945bb35a1f01b665b22474f6db28cba4a2",

FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json

@@ -22,10 +22,10 @@
  "color" : {
  "color-space" : "srgb",
  "components" : {
- "alpha" : "1.000",
- "blue" : "1.000",
- "green" : "1.000",
- "red" : "1.000"
+ "alpha" : "0.500",
+ "blue" : "0.988",
+ "green" : "0.588",
+ "red" : "0.118"
  }
  },
  "idiom" : "universal"

FreeAPS/Resources/json/defaults/preferences.json

@@ -49,5 +49,6 @@
  "enableSMB_high_bg" : false,
  "enableSMB_high_bg_target" : 110,
  "threshold_setting" : 65,
- "updateInterval" : 20
+ "updateInterval" : 20,
+ "combineTreatmentsHistory" : false
 }

FreeAPS/Sources/APS/CGM/dexcomSourceG7.swift

@@ -135,6 +135,15 @@ extension DexcomSourceG7: CGMManagerDelegate {
  debug(.deviceManager, "DEXCOMG7 - Process CGM Reading Result launched")
  switch readingResult {
  case let .newData(values):
+
+ var activationDate: Date = .distantPast
+ var sessionStart: Date = .distantPast
+ if let cgmG7Manager = cgmManager as? G7CGMManager {
+ activationDate = cgmG7Manager.sensorActivatedAt ?? .distantPast
+ sessionStart = cgmG7Manager.sensorFinishesWarmupAt ?? .distantPast
+ print("Activastion date: " + activationDate.description)
+ }
+
  let bloodGlucose = values.compactMap { newGlucoseSample -> BloodGlucose? in
  let quantity = newGlucoseSample.quantity
  let value = Int(quantity.doubleValue(for: .milligramsPerDeciliter))
@@ -148,7 +157,9 @@ extension DexcomSourceG7: CGMManagerDelegate {
  filtered: nil,
  noise: nil,
  glucose: value,
- type: "sgv"
+ type: "sgv",
+ activationDate: activationDate,
+ sessionStartDate: sessionStart
  )
  }
 

FreeAPS/Sources/APS/Storage/PumpHistoryStorage.swift

@@ -45,7 +45,8 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
  rate: nil,
  temp: nil,
  carbInput: nil,
- isSMB: dose.automatic
+ isSMB: dose.automatic,
+ isNonPumpInsulin: dose.manuallyEntered
  )]
  case .tempBasal:
  guard let dose = event.dose else { return [] }
@@ -210,6 +211,16 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
  }
  }
 
+ func determineBolusEventType(for event: PumpHistoryEvent) -> EventType {
+ if event.isSMB ?? false {
+ return .smb
+ }
+ if event.isNonPumpInsulin ?? false {
+ return .nonPumpInsulin
+ }
+ return event.type
+ }
+
  func nightscoutTretmentsNotUploaded() -> [NigtscoutTreatment] {
  let events = recent()
  guard !events.isEmpty else { return [] }
@@ -250,13 +261,14 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
  let bolusesAndCarbs = events.compactMap { event -> NigtscoutTreatment? in
  switch event.type {
  case .bolus:
+ let eventType = determineBolusEventType(for: event)
  return NigtscoutTreatment(
  duration: event.duration,
  rawDuration: nil,
  rawRate: nil,
  absolute: nil,
  rate: nil,
- eventType: (event.isSMB ?? false) ? .smb : .bolus,
+ eventType: eventType,
  createdAt: event.timestamp,
  enteredBy: NigtscoutTreatment.local,
  bolus: event,

FreeAPS/Sources/Localizations/Main/ar.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Add Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Delete carbs?";
+"Delete Carbs?" = "Delete Carbs?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Treatments";

FreeAPS/Sources/Localizations/Main/ca.lproj/Localizable.strings

@@ -490,10 +490,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Delete carbs?";
+"Delete Carbs?" = "Delete Carbs?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Treatments";

FreeAPS/Sources/Localizations/Main/da.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Tilføj Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Delete carbs?";
+"Delete Carbs?" = "Delete Carbs?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Treatments";

FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Medtronic-Pumpe hinzufügen";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temporäre Ziele";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Kohlenhydrate löschen?";
+"Delete Carbs?" = "Kohlenhydrate löschen?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Insulin löschen?";
+"Delete Insulin?" = "Insulin löschen?";
 
 /* Treatments list */
 "Treatments" = "Behandlungen";
@@ -1168,6 +1171,9 @@ Enact a temp Basal or a temp target */
 /* An Automatic delivered bolus (SMB) */
 "SMB" = "SMB";
 
+/* A manually entered dose of non-pump insulin */
+"Non-pump Insulin" = "Externes Insulin";
+
 /* Status highlight when manual temp basal is running. */
 "Manual Basal" = "Manuelle Temporäre Basalrate";
 

FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -537,20 +537,48 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Delete carbs?";
+"Delete Carbs?" = "Delete Carbs?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
+
+/* Delete fpus alert title */
+"Delete Carb Equivalents?" = "Delete Carb Equivalents?";
+
+/* Delete Glucose alert title */
+"Delete Glucose?" = "Delete Glucose?";
 
 /* Treatments list */
 "Treatments" = "Treatments";
 
+/* Meals list */
+"Meals" = "Meals";
+
+/* No data text when no entries in history list */
+"No data." = "No data.";
+
 /* " min" in Treatments list */
 " min" = " min";
 
 /* */
 "Unable to change anything" = "Unable to change anything";
 
+/* Non-pump insulin maxBolus * 3 alert text */
+"**⚠️ Warning!** The entered insulin amount is greater than your Max Bolus setting!" = "**⚠️ Warning!** The entered insulin amount is greater than your Max Bolus setting!";
+
+/* Log non-pump insulin button text */
+"Log non-pump insulin" = "Log non-pump insulin";
+
+/* Non-Pump Insulin button text */
+"Non-Pump Insulin" = "Non-Pump Insulin";
+
+/* Glucose button text */
+"Glucose" = "Glucose";
+
+/* Add glucose dialog title */
+"Add Glucose" = "Add Glucose";
+
+
 
 /* Calendar and Libre transmitter settings ---------------
  */
@@ -569,6 +597,9 @@ Enact a temp Basal or a temp target */
 /* Automatic delivered treatments */
 "Automatic" = "Automatic";
 
+/* Non-pump insulin treatments */
+"Non-Pump" = "Non-Pump";
+
 /* */
 "Other" = "Other";
 
@@ -1172,6 +1203,9 @@ Enact a temp Basal or a temp target */
 /* An Automatic delivered bolus (SMB) */
 "SMB" = "SMB";
 
+/* A manually entered dose of non-pump insulin */
+"Non-pump Insulin" = "Non-pump Insulin";
+
 /* Status highlight when manual temp basal is running. */
 "Manual Basal" = "Manual Basal";
 
@@ -1580,6 +1614,9 @@ Enact a temp Basal or a temp target */
 /* In Range */
 "In Range" = "In Range";
 
+/* Display treatment history with 2 tabs (treatments+glucose) or 3 tabs (treatments split in insulin and meals + glucose) */
+"Combine Treatments in History" = "Combine Treatments in History";
+
 /* Display % */
 "Change HbA1c Unit" = "Change HbA1c Unit";
 

FreeAPS/Sources/Localizations/Main/es.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Añadir Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "¿Eliminar carbohidratos?";
+"Delete Carbs?" = "¿Eliminar carbohidratos?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Tratamientos";

FreeAPS/Sources/Localizations/Main/fi.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Add Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Delete carbs?";
+"Delete Carbs?" = "Delete Carbs?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Treatments";

FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Ajouter une pompe Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Cibles temporaires";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Supprimer les glucides ?";
+"Delete Carbs?" = "Supprimer les glucides ?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Traitements";

FreeAPS/Sources/Localizations/Main/he.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Add Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Temp Targets";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Delete carbs?";
+"Delete Carbs?" = "Delete Carbs?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Delete insulin?";
+"Delete Insulin?" = "Delete Insulin?";
 
 /* Treatments list */
 "Treatments" = "Treatments";

FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings

@@ -350,6 +350,9 @@ Enact a temp Basal or a temp target */
 /* Import Error */
 "Can't find the default Nightscout Profile." = "Can't find the default Nightscout Profile.";
 
+/* Add Blood Glucose Test, header */
+"Blood Glucose Test" = "Blood Glucose Test";
+
 /* Add Medtronic pump */
 "Add Medtronic" = "Aggiungi microinfusore Medtronic";
 
@@ -534,10 +537,10 @@ Enact a temp Basal or a temp target */
 "Temp Targets" = "Obiettivi Temporanei";
 
 /* Delete carbs from data table and Nightscout */
-"Delete carbs?" = "Cancella carboidrati?";
+"Delete Carbs?" = "Cancella carboidrati?";
 
 /* Delete insulin from pump history and Nightscout */
-"Delete insulin?" = "Cancella l'insulina?";
+"Delete Insulin?" = "Cancella l'insulina?";
 
 /* Treatments list */
 "Treatments" = "Trattamenti";