Skip to content

Commit

Permalink
V4 (#661)
Browse files Browse the repository at this point in the history
See release notes, tag v4.0.0 for all details.

Co-authored-by: Joe Moran <[email protected]>
Co-authored-by: Thomas Vargiu <[email protected]>
Co-authored-by: yurique <[email protected]>
  • Loading branch information
4 people authored May 8, 2024
1 parent 6383f62 commit 398ed72
Show file tree
Hide file tree
Showing 175 changed files with 6,959 additions and 2,545 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_iAPS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
if [[ "$(gh api -H "Accept: application/vnd.github+json" /repos/${{ github.repository_owner }}/iAPS/branches | jq --raw-output 'any(.name=="alive")')" == "true" ]]; then
if [[ "$(gh api -H "Accept: application/vnd.github+json" /repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/branches | jq --raw-output 'any(.name=="alive")')" == "true" ]]; then
echo "Branch 'alive' exists."
echo "ALIVE_BRANCH_EXISTS=true" >> $GITHUB_ENV # Set ALIVE_BRANCH_EXISTS to true
else
Expand All @@ -80,7 +80,7 @@ jobs:
--method POST \
-H "Authorization: token $GITHUB_TOKEN" \
-H "Accept: application/vnd.github.v3+json" \
/repos/${{ github.repository_owner }}/iAPS/git/refs \
/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/git/refs \
-f ref='refs/heads/alive' \
-f sha=$SHA
Expand Down
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 = 3.4.1
APP_VERSION = 4.0.0
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
DEVELOPER_TEAM = ##TEAM_ID##
Expand Down
26 changes: 22 additions & 4 deletions Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22522" systemVersion="22G313" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="BGaverages" representedClassName="BGaverages" syncable="YES" codeGenerationType="class">
<attribute name="average" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="average_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
Expand Down Expand Up @@ -31,6 +31,9 @@
<attribute name="hba1c_7" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="hba1c_30" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
<entity name="Identifier" representedClassName="Identifier" syncable="YES" codeGenerationType="class">
<attribute name="id" optional="YES" attributeType="String"/>
</entity>
<entity name="ImportError" representedClassName="ImportError" syncable="YES" codeGenerationType="class">
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="error" optional="YES" attributeType="String"/>
Expand Down Expand Up @@ -80,6 +83,8 @@
<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="maxIOB" optional="YES" attributeType="Decimal" defaultValueString="0"/>
<attribute name="overrideMaxIOB" optional="YES" attributeType="Boolean" 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"/>
Expand All @@ -104,7 +109,9 @@
<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="maxIOB" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="overrideMaxIOB" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<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"/>
Expand All @@ -124,18 +131,29 @@
<attribute name="enteredBy" optional="YES" attributeType="String"/>
<attribute name="protein" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
<entity name="Pump" representedClassName="Pump" syncable="YES" codeGenerationType="class">
<attribute name="basal" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="bolus" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
</entity>
<entity name="Readings" representedClassName="Readings" syncable="YES" codeGenerationType="class">
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="direction" optional="YES" attributeType="String"/>
<attribute name="glucose" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="id" optional="YES" attributeType="String"/>
</entity>
<entity name="Reasons" representedClassName="Reasons" syncable="YES" codeGenerationType="class">
<attribute name="cob" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="cr" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="iob" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="isf" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="minPredBG" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
<entity name="StatsData" representedClassName="StatsData" syncable="YES" codeGenerationType="class">
<attribute name="lastrun" attributeType="Date" defaultDateTimeInterval="704497620" usesScalarValueType="NO"/>
</entity>
<entity name="Target" representedClassName="Target" syncable="YES" codeGenerationType="class">
<attribute name="current" optional="YES" attributeType="Decimal" defaultValueString="100"/>
</entity>
<entity name="TDD" representedClassName="TDD" syncable="YES" codeGenerationType="class">
<attribute name="tdd" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Format string for glucose trend per minute. (1: glucose value and unit) */
"%@/min" = "%@/min";
"%@/min" = "%@ min";

/* Confirmation message for deleting a CGM */
"Are you sure you want to delete this CGM?" = "¿Está seguro de que quiere eliminar este MCG?";
Expand All @@ -18,7 +18,7 @@ Title text for the button to remove a CGM from Loop */
"Glucose" = "Glucosa";

/* Describes a glucose value adjusted to reflect a recent calibration */
"Glucose (Adjusted)" = "Glucose (Adjusted)";
"Glucose (Adjusted)" = "Glucosa (ajustada)";

/* Section title for latest glucose calibration */
"Latest Calibration" = "Calibración más reciente";
Expand Down Expand Up @@ -51,7 +51,7 @@ Title text for the button to remove a CGM from Loop */
"Transmitter Age" = "Edad del transmisor";

/* The title text for the Dexcom G5/G6 transmitter ID config value */
"Transmitter ID" = "Identificación del transmisor";
"Transmitter ID" = "Identificador del transmisor";

/* Title describing glucose trend */
"Trend" = "Tendencia";
Expand Down
48 changes: 24 additions & 24 deletions Dependencies/G7SensorKit/G7SensorKitUI/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -39,79 +39,79 @@
"Glucose" = "Glucosa";

/* title for g7 settings row showing sensor grace period end time */
"Grace Period End" = "Grace Period End";
"Grace Period End" = "Fin periodo de gracia";

/* G7 Progress bar label when sensor grace period progress showing */
"Grace period remaining" = "Grace period remaining";
"Grace period remaining" = "Tiempo de gracia restante";

/* String displayed instead of a glucose value above the CGM range */
"HIGH" = "HIGH";
"HIGH" = "ALTO";

/* title for g7 settings row showing sensor last connect time */
"Last Connect" = "Last Connect";
"Last Connect" = "Última conexión";

/* No comment provided by engineer. */
"Last Reading" = "Last Reading";
"Last Reading" = "Última lectura";

/* Descriptive text on G7StartupView */
"iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.";
"iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "iAPS puede leer datos del G7, pero deberá utilizar la aplicación Dexcom G7 para emparejar, calibrar y otras gestiones del sensor.";

/* String displayed instead of a glucose value below the CGM range */
"LOW" = "LOW";
"LOW" = "BAJO";

/* title for g7 settings row showing BLE Name */
"Name" = "Nombre";

/* No comment provided by engineer. */
"Scan for new sensor" = "Scan for new sensor";
"Scan for new sensor" = "Buscar nuevo sensor";

/* title for g7 settings connection status when scanning */
"Scanning" = "Scanning";
"Scanning" = "Buscando";

/* G7 Status highlight text for searching for sensor */
"Searching for\nSensor" = "Searching for\nSensor";
"Searching for\nSensor" = "Buscando\nsensor";

/* G7 Progress bar label when searching for sensor */
"Searching for sensor" = "Searching for sensor";
"Searching for sensor" = "Buscando sensor";

/* G7 Status highlight text for sensor expired */
"Sensor\nExpired" = "Sensor\nExpired";
"Sensor\nExpired" = "Sensor\ncaducado";

/* G7 Status highlight text for sensor failed */
"Sensor\nFailed" = "Sensor\nFailed";
"Sensor\nFailed" = "Sensor\nfallido";

/* G7 Status highlight text for sensor error */
"Sensor\nIssue" = "Sensor\nIssue";
"Sensor\nIssue" = "Problema\nde sensor";

/* G7 Status highlight text for sensor warmup */
"Sensor\nWarmup" = "Sensor\nWarmup";
"Sensor\nWarmup" = "Calentamiento\ndel sensor";

/* title for g7 settings row showing sensor expiration time */
"Sensor Expiration" = "Sensor Expiration";
"Sensor Expiration" = "Caducidad del sensor";

/* G7 Progress bar label when sensor expired */
"Sensor expired" = "Sensor expired";
"Sensor expired" = "El sensor ha caducado";

/* G7 Progress bar label when sensor lifetime progress showing */
"Sensor expires" = "Sensor expires";
"Sensor expires" = "El sensor caduca";

/* G7 Progress bar label when sensor failed */
"Sensor failed" = "Sensor failed";
"Sensor failed" = "El sensor ha fallado";

/* title for g7 settings row showing sensor start time */
"Sensor Start" = "Start sensor";
"Sensor Start" = "Iniciar sensor";

/* G7 Status highlight text for signal loss */
"Signal\nLoss" = "Signal\nLoss";
"Signal\nLoss" = "Pérdida\nde señal";

/* Field label */
"Time" = "Tiempo";

/* Field label */
"Trend" = "Trend";
"Trend" = "Tendencia";

/* title for g7 config settings to upload readings */
"Upload Readings" = "Upload Readings";
"Upload Readings" = "Subir lecturas";

/* G7 Progress bar label when sensor in warmup */
"Warmup completes" = "Warmup completes";
"Warmup completes" = "Calentamiento completado";
64 changes: 32 additions & 32 deletions Dependencies/G7SensorKit/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Dexcom G7" = "Dexcom G7";

/* Descriptive text on G7StartupView */
"iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.";
"iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "iAPS puede leer datos del G7, pero deberá utilizar la aplicación Dexcom G7 para emparejar, calibrar y otras gestiones del sensor.";

/* Button title for starting setup */
"Continue" = "Continuar";
Expand All @@ -11,51 +11,51 @@
"Cancel" = "Cancelar";

/* Error description for unreliable state */
"Glucose data is unavailable" = "Glucose data is unavailable";
"Glucose data is unavailable" = "Datos de glucosa no disponibles";

/* The description of sensor algorithm state when sensor is ok. */
"Sensor is OK" = "Sensor is OK";
"Sensor is OK" = "El sensor está bien";

/* The description of sensor algorithm state when sensor is stopped." */
"Sensor is stopped" = "Sensor is stopped";
"Sensor is stopped" = "El sensor está parado";

/* The description of sensor algorithm state when sensor is warming up. */
"Sensor is warming up" = "Sensor is warming up";
"Sensor is warming up" = "El sensor está calentando";

/* The description of sensor algorithm state when sensor is expired. */
"Sensor expired" = "Sensor expired";
"Sensor expired" = "El sensor ha caducado";

/* The description of sensor algorithm state when sensor failed. */
"Sensor failed" = "Sensor failed";
"Sensor failed" = "El sensor ha fallado";

/* The description of sensor algorithm state when raw value is unknown. (1: missing data details) */
"Sensor is in unknown state %1$d" = "Sensor is in unknown state %1$d";
"Sensor is in unknown state %1$d" = "El sensor está en un estado desconocido %1$d";

/* title for g7 settings row showing sensor start time */
"Sensor Start" = "Sensor Start";
"Sensor Start" = "Inicio del sensor";

/* title for g7 settings row showing sensor expiration time */
"Sensor Expiration" = "Sensor Expiration";
"Sensor Expiration" = "Caducidad del sensor";

/* title for g7 settings row showing sensor grace period end time */
"Grace Period End" = "Grace Period End";
"Grace Period End" = "Fin periodo de gracia";

/* Field label */
"Glucose" = "Glucosa";

"Last Reading" = "Last Reading";
"Last Reading" = "Última lectura";

"Time" = "Tiempo";

"Trend" = "Trend";
"Trend" = "Tendencia";

"Bluetooth" = "Bluetooth";

/* title for g7 settings row showing BLE Name */
"Name" = "Nombre";

/* title for g7 settings connection status when scanning */
"Scanning" = "Scanning";
"Scanning" = "Buscando";

/* title for g7 settings connection status when connected */
"Connected" = "Conectado";
Expand All @@ -64,66 +64,66 @@
"Connecting" = "Conectando";

/* title for g7 settings row showing sensor last connect time */
"Last Connect" = "Last Connect";
"Last Connect" = "Última conexión";

/* Configuration */
"Configuration" = "Configuracion";

/* title for g7 config settings to upload readings */
"Upload Readings" = "Upload Readings";
"Upload Readings" = "Subir lecturas";

/* Button */
"Scan for new sensor" = "Scan for new sensor";
"Scan for new sensor" = "Buscar nuevo sensor";

/* Button label for removing CGM */
"Delete CGM" = "Eliminar MCG";

/* No glucose value representation (3 dashes for mg/dL) */
"– – –" = "– – –";
/* String displayed instead of a glucose value below the CGM range */
"LOW" = "LOW";
"LOW" = "BAJO";

/* String displayed instead of a glucose value above the CGM range */
"HIGH" = "HIGH";
"HIGH" = "ALTO";

/* Format string for glucose trend per minute. (1: glucose value and unit) */
"%@/min" = "%@/min";

/* G7 Progress bar label when searching for sensor */
"Searching for sensor" = "Searching for sensor";
"Searching for sensor" = "Buscando sensor";

/* G7 Progress bar label when sensor expired */
"Sensor expired" = "Sensor expired";
"Sensor expired" = "El sensor ha caducado";

/* G7 Progress bar label when sensor in warmup */
"Warmup completes" = "Warmup completes";
"Warmup completes" = "Calentamiento completado";

/* G7 Progress bar label when sensor in warmup */
"Warmup completes" = "Warmup completes";
"Warmup completes" = "Calentamiento completado";

/* G7 Progress bar label when sensor failed */
"Sensor failed" = "Sensor failed";
"Sensor failed" = "El sensor ha fallado";

/* G7 Progress bar label when sensor lifetime progress showing */
"Sensor expires" = "Sensor expires";
"Sensor expires" = "El sensor caduca";

/* G7 Progress bar label when sensor grace period progress showing */
"Grace period remaining" = "Grace period remaining";
"Grace period remaining" = "Tiempo de gracia restante";

/* G7 Status highlight text for searching for sensor */
"Searching for\nSensor" = "Searching for\nSensor";
"Searching for\nSensor" = "Buscando\nsensor";

/* G7 Status highlight text for sensor expired */
"Sensor\nExpired" = "Sensor\nExpired";
"Sensor\nExpired" = "Sensor\ncaducado";

/* G7 Status highlight text for signal loss */
"Sensor\nFailed" = "Sensor\nFailed";
"Sensor\nFailed" = "Sensor\nfallido";

/* G7 Status highlight text for signal loss */
"Signal\nLoss" = "Signal\nLoss";
"Signal\nLoss" = "Pérdida\nde señal";

/*G7 Status highlight text for sensor error */
"Sensor\nIssue" = "Sensor\nIssue";
"Sensor\nIssue" = "Problema\nde sensor";

/* G7 Status highlight text for sensor warmup */
"Sensor\nWarmup" = "Sensor\nWarmup";
"Sensor\nWarmup" = "Calentamiento\ndel sensor";
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"A bolus is already in progress" = "Un bolo ya está en progreso";

/* The description of AlarmClockReminderPumpEvent */
"AlarmClockReminder" = "AlarmClockReminder";
"AlarmClockReminder" = "Recordatorio de alarma";

/* The description of AlarmSensorPumpEvent */
"AlarmSensor" = "AlarmSensor";
"AlarmSensor" = "Sensor de alarma";

/* Describing the battery chemistry as Alkaline */
"Alkaline" = "Alcalina";
Expand Down
Loading

0 comments on commit 398ed72

Please sign in to comment.