Skip to content

Commit

Permalink
Merge branch 'Artificial-Pancreas:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lasse-Fisker authored Sep 5, 2024
2 parents 1098e64 + c41c712 commit 8dea090
Show file tree
Hide file tree
Showing 172 changed files with 5,805 additions and 2,059 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,7 @@ fastlane/FastlaneRunner

ConfigOverride.xcconfig

branch.txt
branch.txt
package-lock.json
node_modules
oref0
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 = 4.2.1
APP_VERSION = 5.0.2
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
DEVELOPER_TEAM = ##TEAM_ID##
Expand Down
19 changes: 17 additions & 2 deletions Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23G93" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="ActiveProfile" representedClassName="ActiveProfile" syncable="YES" codeGenerationType="class">
<attribute name="active" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="name" optional="YES" attributeType="String"/>
</entity>
<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 @@ -71,6 +76,10 @@
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="number" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
</entity>
<entity name="Onboarding" representedClassName="Onboarding" syncable="YES" codeGenerationType="class">
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="firstRun" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
</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"/>
Expand Down Expand Up @@ -126,6 +135,11 @@
<attribute name="fat" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="protein" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
<entity name="Profiles" representedClassName="Profiles" syncable="YES" codeGenerationType="class">
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="uploaded" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
</entity>
<entity name="Protein" representedClassName="Protein" syncable="YES" codeGenerationType="class">
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="enteredBy" optional="YES" attributeType="String"/>
Expand All @@ -146,6 +160,7 @@
<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" defaultDateTimeInterval="737559660" usesScalarValueType="NO"/>
<attribute name="eventualBG" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<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"/>
Expand Down Expand Up @@ -184,4 +199,4 @@
<attribute name="dev" optional="YES" attributeType="String"/>
<attribute name="nr" optional="YES" attributeType="String"/>
</entity>
</model>
</model>
26 changes: 13 additions & 13 deletions Dependencies/CGMBLEKit/CGMBLEKit/ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
/* CGM display title */
"Dexcom G5" = "Dexcom G5";
"Dexcom G5" = "ديكسكوم G5";

/* CGM display title */
"Dexcom G6" = "Dexcom G6";
"Dexcom G6" = "ديكسكوم G6";

/* Error description for unreliable state */
"Glucose data is unavailable" = "Glucose data is unavailable";
"Glucose data is unavailable" = "قراءات السكر غير متوفرة";

/* Describes a low battery */
"Low Battery" = "Low Battery";
"Low Battery" = "البطارية منخفضة";

/* Describes a functioning transmitter */
"OK" = "موافق";

/* invlid config error description */
"Peripheral command was invalid" = "Peripheral command was invalid";
"Peripheral command was invalid" = "أمر الجهاز الطرفي غير صالح";

/* Timeout error description */
"Peripheral did not respond in time" = "Peripheral did not respond in time";
"Peripheral did not respond in time" = "الجهاز الطرفي لم يستجب في الوقت المحدد";

/* Not ready error description */
"Peripheral isnʼt connected" = "Peripheral isnʼt connected";
"Peripheral isnʼt connected" = "الجهاز الطرفي غير متصل";

/* The description of sensor calibration state when sensor calibration is ok. */
"Sensor calibration is OK" = "Sensor calibration is OK";
"Sensor calibration is OK" = "معايرة المستشعر مضبوطة";

/* The description of sensor calibration 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" = "المستشعر في حالة غير معروفة %1$d";

/* The description of sensor calibration state when sensor sensor is stopped. */
"Sensor is stopped" = "Sensor is stopped";
"Sensor is stopped" = "المستشعر متوقف";

/* The description of sensor calibration state when sensor sensor is warming up. */
"Sensor is warming up" = "Sensor is warming up";
"Sensor is warming up" = "المستشعر تحت الإحماء";

/* The description of sensor calibration state when sensor needs calibration. */
"Sensor needs calibration" = "Sensor needs calibration";
"Sensor needs calibration" = "المستشعر بحاجة الى معايرة";

/* Error description */
"Unknown characteristic" = "Unknown characteristic";
"Unknown characteristic" = "خاصية مجهولة";
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Dexcom G5" = "Dexcom G 5";

/* CGM display title */
"Dexcom G6" = "Dexcom G6";
"Dexcom G6" = "德康 G6";

/* Error description for unreliable state */
"Glucose data is unavailable" = "葡萄糖数据不可用";
Expand All @@ -14,7 +14,7 @@
"OK" = "Ok";

/* invlid config error description */
"Peripheral command was invalid" = "Peripheral command was invalid";
"Peripheral command was invalid" = "外围命令无效";

/* Timeout error description */
"Peripheral did not respond in time" = "外设没有及时响应";
Expand Down
30 changes: 15 additions & 15 deletions Dependencies/CGMBLEKit/CGMBLEKitUI/ar.lproj/Localizable.strings
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" = "%@ دقيقة";

/* Confirmation message for deleting a CGM */
"Are you sure you want to delete this CGM?" = "هل أنت متأكد أنك تريد حذف هذا CGM؟";
Expand All @@ -8,7 +8,7 @@
"Cancel" = "إلغاء";

/* Title describing glucose date */
"Date" = "Date";
"Date" = "التاريخ";

/* Button title to delete CGM
Title text for the button to remove a CGM from Loop */
Expand All @@ -18,43 +18,43 @@ Title text for the button to remove a CGM from Loop */
"Glucose" = "قراءات السكر";

/* Describes a glucose value adjusted to reflect a recent calibration */
"Glucose (Adjusted)" = "Glucose (Adjusted)";
"Glucose (Adjusted)" = "جلوكوز (معدّلة)";

/* Section title for latest glucose calibration */
"Latest Calibration" = "Latest Calibration";
"Latest Calibration" = "أحدث معايرة";

/* Section title for latest glucose reading */
"Latest Reading" = "Latest Reading";
"Latest Reading" = "آخر قراءة";

/* Section title for latest connection date */
"Latest Connection" = "Latest Connection";
"Latest Connection" = "آخر اتصال";

/* Button title to open CGM app */
"Open App" = "Open App";
"Open App" = "فتح التطبيق";

/* Title describing sensor session age */
"Session Age" = "Session Age";
"Session Age" = "عمر الجلسة";

/* Section title for remote data synchronization */
"Remote Data Synchronization" = "Remote Data Synchronization";
"Remote Data Synchronization" = "مزامنة البيانات عن بعد";

/* Title describing sensor expiration */
"Sensor Expires" = "Sensor Expires";
"Sensor Expires" = "ينتهي المستشعر";

/* Title describing past sensor expiration */
"Sensor Expired" = "Sensor Expired";
"Sensor Expired" = "إنتهت صلاحية المستشعر";

/* Title describing CGM calibration and battery state */
"Status" = "الحالة";

/* Title describing transmitter session age */
"Transmitter Age" = "Transmitter Age";
"Transmitter Age" = "عمر جهاز الإرسال";

/* The title text for the Dexcom G5/G6 transmitter ID config value */
"Transmitter ID" = "Transmitter ID";
"Transmitter ID" = "معرف المرسل";

/* Title describing glucose trend */
"Trend" = "Trend";
"Trend" = "إتجاه";

/* The title text for the upload glucose switch cell */
"Upload Readings" = "Upload Readings";
"Upload Readings" = "رفع القراءات";
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/* Class = "UILabel"; text = "Credentials"; ObjectID = "5oU-vK-JHQ"; */
"5oU-vK-JHQ.text" = "Credentials";
"5oU-vK-JHQ.text" = "بيانات التسجيل";

/* Class = "UITableViewController"; title = "Transmitter Setup"; ObjectID = "Dds-49-o7G"; */
"Dds-49-o7G.title" = "Transmitter Setup";
"Dds-49-o7G.title" = "إعداد جهاز الإرسال";

/* Class = "UILabel"; text = "Detail"; ObjectID = "GOT-KQ-cEh"; */
"GOT-KQ-cEh.text" = "تفاصيل";

/* 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" = "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.";
"Qub-6B-0aB.footerTitle" = "يمكن العثور على معرف جهاز الإرسال مطبوعا على الجزء الخلفي من الجهاز، على جانب الصندوق الذي أتى به، ومن داخل قوائم الإعدادات الخاصة بالمستلم والتطبيق الموبايل.";

/* Class = "UITableViewSection"; headerTitle = "Transmitter ID"; ObjectID = "Qub-6B-0aB"; */
"Qub-6B-0aB.headerTitle" = "Transmitter ID";
"Qub-6B-0aB.headerTitle" = "معرف المرسل";

/* 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" = "Data can be downloaded over the Internet from Share when the transmitter connection fails.";
"k1N-Rg-XDy.footerTitle" = "يمكن تحميل البيانات عبر الإنترنت من تطبيق Share عند فشل اتصال المرسل.";

/* Class = "UITableViewSection"; headerTitle = "Dexcom Share"; ObjectID = "k1N-Rg-XDy"; */
"k1N-Rg-XDy.headerTitle" = "Dexcom Share";
"k1N-Rg-XDy.headerTitle" = "ديكسكوم شير";

/* Class = "UITextField"; placeholder = "Enter the 6-digit transmitter ID"; ObjectID = "nKX-TW-GhD"; */
"nKX-TW-GhD.placeholder" = "Enter the 6-digit transmitter ID";
"nKX-TW-GhD.placeholder" = "أدخل معرف جهاز الإرسال المكون من 6 أرقام";
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"Dds-49-o7G.title" = "Cài đặt Transmitter";

/* Class = "UILabel"; text = "Detail"; ObjectID = "GOT-KQ-cEh"; */
"GOT-KQ-cEh.text" = "Chi tiết";
"GOT-KQ-cEh.text" = "Chi tiết";

/* 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" = "Số ID của Transmitter có thể được tìm thấy trên vỏ hộp hoặc bên hông hộp và trong phần Menu cài đặt cũng như trên ứng dụng của điện thoại.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Title text for the button to remove a CGM from Loop */
"Remote Data Synchronization" = "远程数据同步";

/* Title describing sensor expiration */
"Sensor Expires" = "Sensor Expires";
"Sensor Expires" = "传感器已过期";

/* Title describing past sensor expiration */
"Sensor Expired" = "传感器已过期";
Expand Down
Loading

0 comments on commit 8dea090

Please sign in to comment.