Skip to content

Commit

Permalink
Release 2.0.0 (#78)
Browse files Browse the repository at this point in the history
* Profiles. Save profiles as presets. Use Button from Home View to stop/open profile settings. Overrride settings deleted from settings. Open with profiles button instead. 

* Bug fixes

* Deleted some unnecessary CoreData saving code. 

* Localization fixes and translations from iAPS Crowdin translators (Thank you all Crowdin translators!).
  • Loading branch information
Jon-b-m authored May 26, 2023
1 parent d71d8ae commit 69edd7c
Show file tree
Hide file tree
Showing 106 changed files with 3,282 additions and 778 deletions.
2 changes: 1 addition & 1 deletion Config.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_DISPLAY_NAME = iAPS
APP_VERSION = 1.6.5
APP_VERSION = 2.0.0
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
DEVELOPER_TEAM = ##TEAM_ID##
Expand Down
33 changes: 30 additions & 3 deletions Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<attribute name="average_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="average_7" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="average_30" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="average_90" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
</entity>
<entity name="BGmedian" representedClassName="BGmedian" syncable="YES" codeGenerationType="class">
Expand All @@ -14,7 +13,6 @@
<attribute name="median_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="median_7" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="median_30" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="median_90" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
<entity name="Carbohydrates" representedClassName="Carbohydrates" syncable="YES" codeGenerationType="class">
<attribute name="carbs" optional="YES" attributeType="Decimal" defaultValueString="0"/>
Expand All @@ -27,7 +25,6 @@
<attribute name="hba1c_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="hba1c_7" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="hba1c_30" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="hba1c_90" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
<entity name="InsulinDistribution" representedClassName="InsulinDistribution" syncable="YES" codeGenerationType="class">
<attribute name="bolus" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
Expand All @@ -47,13 +44,43 @@
<relationship name="computedTDD" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TDD" inverseName="computed" inverseEntity="TDD"/>
</entity>
<entity name="Override" representedClassName="Override" syncable="YES" codeGenerationType="class">
<attribute name="advancedSettings" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="cr" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="duration" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="end" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="id" optional="YES" attributeType="String"/>
<attribute name="indefinite" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="isf" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="isfAndCr" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="isPreset" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="percentage" optional="YES" attributeType="Double" defaultValueString="100" usesScalarValueType="YES"/>
<attribute name="smbIsAlwaysOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="smbIsOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="smbMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
<attribute name="start" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="100"/>
<attribute name="uamMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
</entity>
<entity name="OverridePresets" representedClassName="OverridePresets" syncable="YES" codeGenerationType="class">
<attribute name="advancedSettings" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="cr" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="duration" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="end" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="id" optional="YES" attributeType="String"/>
<attribute name="indefinite" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isf" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="isfAndCr" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="percentage" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="smbIsAlwaysOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="smbIsOff" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="smbMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
<attribute name="start" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="uamMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
</entity>
<entity name="Presets" representedClassName="Presets" syncable="YES" codeGenerationType="class">
<attribute name="carbs" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Unbekannte Charakteristik";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Característica desconocida";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Caractéristique inconnue";

13 changes: 6 additions & 7 deletions Dependencies/CGMBLEKit/CGMBLEKit/it.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,25 @@
"Peripheral command was invalid" = "Il comando della periferica non era valido";

/* Timeout error description */
"Peripheral did not respond in time" = "La periferica non ha risposto nel tempo limite";
"Peripheral did not respond in time" = "La periferica non ha risposto entro il tempo limite";

/* Not ready error description */
"Peripheral isnʼt connected" = "La periferica non e' connessa";
"Peripheral isnʼt connected" = "La periferica non è connessa";

/* The description of sensor calibration state when sensor calibration is ok. */
"Sensor calibration is OK" = "La calibrazione del sensore e' valida";
"Sensor calibration is OK" = "La calibrazione del sensore è valida";

/* The description of sensor calibration state when raw value is unknown. (1: missing data details) */
"Sensor is in unknown state %1$d" = "Il Sensore e' in un stato%1$d sconosciuto";
"Sensor is in unknown state %1$d" = "Il Sensore è in un stato %1$d sconosciuto";

/* The description of sensor calibration state when sensor sensor is stopped. */
"Sensor is stopped" = "Il Sensore e' fermato";
"Sensor is stopped" = "Il Sensore è fermo";

/* The description of sensor calibration state when sensor sensor is warming up. */
"Sensor is warming up" = "Il Sensore si sta riscaldando";
"Sensor is warming up" = "Il sensore è in fase di avvio";

/* The description of sensor calibration state when sensor needs calibration. */
"Sensor needs calibration" = "Il sensore necessita di calibrazione";

/* Error description */
"Unknown characteristic" = "Caratteristica sconosciuta";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Ukjent karakteristikk";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Onbekende eigenschap";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Nieznany błąd";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "Неизвестная характеристика";

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@

/* Error description */
"Unknown characteristic" = "未知特性";

12 changes: 0 additions & 12 deletions Dependencies/CGMBLEKit/CGMBLEKitUI/da.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ Title text for the button to remove a CGM from Loop */
/* Section title for latest glucose calibration */
"Latest Calibration" = "Seneste kalibrering";

/* Section title for latest connection date */
"Latest Connection" = "Seneste forbindelse";

/* Section title for latest glucose reading */
"Latest Reading" = "Seneste aflæsning";

Expand All @@ -35,15 +32,6 @@ Title text for the button to remove a CGM from Loop */
/* Button title to open CGM app */
"Open App" = "Åben app";

/* Section title for remote data synchronization */
"Remote Data Synchronization" = "Synkronisering af fjerndata";

/* Title describing past sensor expiration */
"Sensor Expired" = "Sensor udløbet";

/* Title describing sensor expiration */
"Sensor Expires" = "Sensor udløber";

/* Title describing sensor session age */
"Session Age" = "Session-alder";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,3 @@

/* Class = "UITextField"; placeholder = "Enter the 6-digit transmitter ID"; ObjectID = "nKX-TW-GhD"; */
"nKX-TW-GhD.placeholder" = "Indtast det 6-cifrede sender-ID";

/* Class = "UITableViewSection"; footerTitle = "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app."; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.footerTitle" = "Sender-ID'et kan findes trykt på bagsiden af ​​enheden, på den side af boksen, den kom i, og fra indstillingsmenuerne på modtageren og mobilappen.";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "Sender ID";

12 changes: 0 additions & 12 deletions Dependencies/CGMBLEKit/CGMBLEKitUI/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ Title text for the button to remove a CGM from Loop */
/* Section title for latest glucose calibration */
"Latest Calibration" = "Letzte Kalibrierung";

/* Section title for latest connection date */
"Latest Connection" = "Letzte Verbindung";

/* Section title for latest glucose reading */
"Latest Reading" = "Letzter Wert";

Expand All @@ -35,15 +32,6 @@ Title text for the button to remove a CGM from Loop */
/* Button title to open CGM app */
"Open App" = "App öffnen";

/* Section title for remote data synchronization */
"Remote Data Synchronization" = "Remote Daten Synchronisation";

/* Title describing past sensor expiration */
"Sensor Expired" = "Sensor abgelaufen";

/* Title describing sensor expiration */
"Sensor Expires" = "Sensor-Ablaufzeitpunkt";

/* Title describing sensor session age */
"Session Age" = "Sitzungsalter";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
/* Class = "UILabel"; text = "Detail"; ObjectID = "GOT-KQ-cEh"; */
"GOT-KQ-cEh.text" = "Detail";

/* Class = "UITableViewSection"; footerTitle = "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app."; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.footerTitle" = "Die Transmitter-ID befindet sich auf der Rückseite des Transmitters, an der Seite der Verpackung und in den Einstellungsmenüs des Empfängers sowie der Dexcom-App.";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "Transmitter-ID";

/* Class = "UITableViewSection"; footerTitle = "Data can be downloaded over the Internet from Share when the transmitter connection fails."; ObjectID = "k1N-Rg-XDy"; */
"k1N-Rg-XDy.footerTitle" = "Daten können über das Internet von Share heruntergeladen werden, wenn die Verbindung zum Transmitter unterbrochen ist.";

Expand All @@ -15,10 +21,3 @@

/* Class = "UITextField"; placeholder = "Enter the 6-digit transmitter ID"; ObjectID = "nKX-TW-GhD"; */
"nKX-TW-GhD.placeholder" = "Geben Sie die 6-stellige Transmitter-ID ein";

/* Class = "UITableViewSection"; footerTitle = "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app."; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.footerTitle" = "Die Transmitter-ID befindet sich auf der Rückseite des Transmitters, an der Seite der Verpackung und in den Einstellungsmenüs des Empfängers sowie der Dexcom-App.";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "Transmitter-ID";

12 changes: 0 additions & 12 deletions Dependencies/CGMBLEKit/CGMBLEKitUI/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ Title text for the button to remove a CGM from Loop */
/* Section title for latest glucose calibration */
"Latest Calibration" = "Calibración más reciente";

/* Section title for latest connection date */
"Latest Connection" = "Conexión más reciente";

/* Section title for latest glucose reading */
"Latest Reading" = "Dato más reciente";

Expand All @@ -35,15 +32,6 @@ Title text for the button to remove a CGM from Loop */
/* Button title to open CGM app */
"Open App" = "Abrir App";

/* Section title for remote data synchronization */
"Remote Data Synchronization" = "Sincronización remota de datos";

/* Title describing past sensor expiration */
"Sensor Expired" = "Sensor caducado";

/* Title describing sensor expiration */
"Sensor Expires" = "El sensor caduca";

/* Title describing sensor session age */
"Session Age" = "Tiempo de sesión del sensor";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
/* Class = "UILabel"; text = "Detail"; ObjectID = "GOT-KQ-cEh"; */
"GOT-KQ-cEh.text" = "Detalle";

/* Class = "UITableViewSection"; footerTitle = "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app."; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.footerTitle" = "La identificación del transmisor puede encontrarse en la parte trasera del dispositivo, en el lateral de la caja en la que venía, o en los menús de ajustes del receptor y la app del teléfono móvil. ";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "Identificación del transmisor";

/* Class = "UITableViewSection"; footerTitle = "Data can be downloaded over the Internet from Share when the transmitter connection fails."; ObjectID = "k1N-Rg-XDy"; */
"k1N-Rg-XDy.footerTitle" = "Los datos pueden descargarse, vía internet, desde el Share cuando la conexión del transmisor falla.";

Expand All @@ -15,10 +21,3 @@

/* Class = "UITextField"; placeholder = "Enter the 6-digit transmitter ID"; ObjectID = "nKX-TW-GhD"; */
"nKX-TW-GhD.placeholder" = "Introduzca la identificación de 6 cifras del transmisor";

/* Class = "UITableViewSection"; footerTitle = "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app."; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.footerTitle" = "La identificación del transmisor puede encontrarse en la parte trasera del dispositivo, en el lateral de la caja en la que venía, o en los menús de ajustes del receptor y la app del teléfono móvil. ";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "Identificación del transmisor";

12 changes: 0 additions & 12 deletions Dependencies/CGMBLEKit/CGMBLEKitUI/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ Title text for the button to remove a CGM from Loop */
/* Section title for latest glucose calibration */
"Latest Calibration" = "Dernier étalonnage";

/* Section title for latest connection date */
"Latest Connection" = "Dernière connexion";

/* Section title for latest glucose reading */
"Latest Reading" = "Dernière mesure";

Expand All @@ -35,15 +32,6 @@ Title text for the button to remove a CGM from Loop */
/* Button title to open CGM app */
"Open App" = "Ouvrir l’application";

/* Section title for remote data synchronization */
"Remote Data Synchronization" = "Synchronisation des données à distance";

/* Title describing past sensor expiration */
"Sensor Expired" = "Capteur expiré";

/* Title describing sensor expiration */
"Sensor Expires" = "Le capteur expire";

/* Title describing sensor session age */
"Session Age" = "L’âge de la session";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,3 @@

/* Class = "UITextField"; placeholder = "Enter the 6-digit transmitter ID"; ObjectID = "nKX-TW-GhD"; */
"nKX-TW-GhD.placeholder" = "Entrez l’ID du transmetteur, composé de 6 lettres et chiffres";

/* Class = "UITableViewSection"; footerTitle = "The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app."; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.footerTitle" = "L’ID du transmetteur se trouve sur le dos de l’appareil, sur la boîte dans laquelle il est fourni, et depuis les menus de réglages du récepteur et de l’application mobile.";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "ID du transmetteur";

11 changes: 4 additions & 7 deletions Dependencies/CGMBLEKit/CGMBLEKitUI/he.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ Title text for the button to remove a CGM from Loop */
/* Section title for latest glucose calibration */
"Latest Calibration" = "Latest Calibration";

/* Section title for latest connection date */
"Latest Connection" = "חיבור אחרון";

/* Section title for latest glucose reading */
"Latest Reading" = "Latest Reading";

Expand All @@ -35,17 +32,17 @@ Title text for the button to remove a CGM from Loop */
/* Button title to open CGM app */
"Open App" = "Open App";

/* Title describing past sensor expiration */
"Sensor Expired" = "Sensor Expired";
/* Title describing sensor session age */
"Session Age" = "Session Age";

/* Section title for remote data synchronization */
"Remote Data Synchronization" = "Remote Data Synchronization";

/* Title describing sensor expiration */
"Sensor Expires" = "Sensor Expires";

/* Title describing sensor session age */
"Session Age" = "Session Age";
/* Title describing past sensor expiration */
"Sensor Expired" = "Sensor Expired";

/* Title describing CGM calibration and battery state */
"Status" = "Status";
Expand Down
Loading

0 comments on commit 69edd7c

Please sign in to comment.