mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/JohanDegraeve/xdripswift into develop

This commit is contained in:
Johan Degraeve 2022-04-25 21:47:46 +02:00
parent 648dcfa28e e917ac4bb4
commit 8f56397159
16 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xdrip/Storyboards/Base.lproj/Main.storyboard
View File

@ -1840,10 +1840,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="Ltu-UO-Ypa">
<rect key="frame" x="35" y="219" width="320" height="406"/>
<rect key="frame" x="35" y="168" width="320" height="378"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="lph-Ca-ZpH">
<rect key="frame" x="36" y="0.0" width="248" height="150"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="lph-Ca-ZpH">
<rect key="frame" x="36" y="0.0" width="248" height="122"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="ZDj-72-yiq" userLabel="Carbs Stack">
<rect key="frame" x="0.0" y="0.0" width="248" height="34"/>
@ -1857,7 +1857,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Amount" textAlignment="center" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="saY-fP-EEW">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0" textAlignment="center" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="saY-fP-EEW">
<rect key="frame" x="148" y="0.0" width="100" height="34"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="o92-Cd-7bP"/>
@ -1868,7 +1868,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="4G8-c0-IhJ" userLabel="Insulin Stack">
<rect key="frame" x="0.0" y="58" width="248" height="34"/>
<rect key="frame" x="0.0" y="44" width="248" height="34"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Insulin (U):" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agq-m8-HZ9">
<rect key="frame" x="0.0" y="0.0" width="140" height="34"/>
@ -1879,18 +1879,18 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Amount" textAlignment="center" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="ggq-1D-Pj6">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.0" textAlignment="center" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="ggq-1D-Pj6">
<rect key="frame" x="148" y="0.0" width="100" height="34"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="KId-Tf-1aj"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="numberPad" smartInsertDeleteType="no" smartQuotesType="no"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="decimalPad" smartInsertDeleteType="no" smartQuotesType="no"/>
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="OJv-t7-QLZ" userLabel="Exercise Stack">
<rect key="frame" x="0.0" y="116" width="248" height="34"/>
<rect key="frame" x="0.0" y="88" width="248" height="34"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Exercise (min):" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9tx-02-GXf">
<rect key="frame" x="0.0" y="0.0" width="140" height="34"/>
@ -1901,7 +1901,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Amount" textAlignment="center" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kl9-iM-MlH">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0" textAlignment="center" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kl9-iM-MlH">
<rect key="frame" x="148" y="0.0" width="100" height="34"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="1kf-sW-mbf"/>
@ -1914,7 +1914,7 @@
</subviews>
</stackView>
<datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" style="wheels" translatesAutoresizingMaskIntoConstraints="NO" id="M5l-qV-xjH">
<rect key="frame" x="0.0" y="190" width="320" height="216"/>
<rect key="frame" x="0.0" y="162" width="320" height="216"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="textColor">
<color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -1929,7 +1929,7 @@
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Ltu-UO-Ypa" firstAttribute="centerX" secondItem="u0y-ki-EPd" secondAttribute="centerX" id="0AB-vn-joB"/>
<constraint firstItem="Ltu-UO-Ypa" firstAttribute="centerY" secondItem="u0y-ki-EPd" secondAttribute="centerY" id="aQT-9v-5xe"/>
<constraint firstItem="Ltu-UO-Ypa" firstAttribute="top" secondItem="mwU-Tw-d7Q" secondAttribute="top" constant="80" id="T43-7U-ObG"/>
</constraints>
</view>
<tabBarItem key="tabBarItem" title="Treatments" image="Home" id="ucH-hI-fdv"/>

4
xdrip/Storyboards/ar.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/de.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

2
xdrip/Storyboards/en.lproj/Treatments.strings
View File

@ -1,6 +1,6 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";

4
xdrip/Storyboards/es.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/fi.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/fr.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/it.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/nl.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/pl-PL.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/pt.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/ru.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/sl.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/sv.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

4
xdrip/Storyboards/zh.lproj/Treatments.strings
View File

@ -4,7 +4,7 @@
"treatments_title" = "Treatments";
"treatments_new_button" = "New";
"treatments_new_entry" = "New Entry";
"treatments_new_entry" = "New Treatment";
"treatments_carbs_with_unit" = "Carbs (g):";
"treatments_insulin_with_unit" = "Insulin (U):";
"treatments_exercise_with_unit" = "Exercise (min):";
@ -16,4 +16,4 @@
"treatments_exercise" = "Exercise";
"treatments_question_mark" = "?";
"treatments_success" = "Success";
"treatments_sync_complete" = "Synchronization complete.";
"treatments_sync_complete" = "Synchronization complete.";

2
xdrip/Texts/TextsTreatmentsView.swift
View File

@ -13,7 +13,7 @@ enum Texts_TreatmentsView {
}()
static let newEntryTitle:String = {
return NSLocalizedString("treatments_new_entry", tableName: filename, bundle: Bundle.main, value: "New Entry", comment: "New entry view title.")
return NSLocalizedString("treatments_new_entry", tableName: filename, bundle: Bundle.main, value: "New Treatment", comment: "New entry view title.")
}()
static let carbsWithUnit:String = {