diff --git a/app/build.gradle b/app/build.gradle index 77d1bde228..d7f83ead97 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ def generateGitBuild = { -> stringBuilder.append('NoGitSystemAvailable') } stringBuilder.append('-') - stringBuilder.append((new Date()).format('yyyy.MM.dd')) + stringBuilder.append((new Date()).format('yyyy.MM.dd-HH:mm')) stringBuilder.append('"') return stringBuilder.toString() } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java index dda2e61006..7b9b8570d6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java @@ -179,10 +179,10 @@ public class FillDialog extends DialogFragment implements OnClickListener { } if (pumpSiteChangeCheckbox.isChecked()) - confirmMessage.add("" + "" + MainApp.gs(R.string.record_pump_site_change) + ""); + confirmMessage.add("" + "" + MainApp.gs(R.string.record_pump_site_change) + ""); if (insulinCartridgeChangeCheckbox.isChecked()) - confirmMessage.add("" + "" + MainApp.gs(R.string.record_insulin_cartridge_change) + ""); + confirmMessage.add("" + "" + MainApp.gs(R.string.record_insulin_cartridge_change) + ""); final String notes = notesEdit.getText().toString(); if (!notes.isEmpty()) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java index 4360e2ed34..3951b8415f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java @@ -303,21 +303,21 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C if (currentProfile.getUnits().equals(Constants.MMOL)) { unitLabel = "mmol/l"; } - - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " min)"); - + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " min)"); } if (startEatingSoonTTCheckbox.isChecked()) { if (currentProfile.getUnits().equals(Constants.MMOL)) { - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)"); - } else - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)"); + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)"); + } else { + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)"); + } } if (startHypoTTCheckbox.isChecked()) { if (currentProfile.getUnits().equals(Constants.MMOL)) { - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(hypoTT) + " mmol/l (" + hypoTTDuration + " min)"); - } else - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to0Decimal(hypoTT) + " mg/dl (" + hypoTTDuration + " min)"); + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(hypoTT) + " mmol/l (" + hypoTTDuration + " min)"); + } else { + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to0Decimal(hypoTT) + " mg/dl (" + hypoTTDuration + " min)"); + } } int timeOffset = editTime.getValue().intValue(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java index 875d207352..c4aba7004a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java @@ -217,9 +217,9 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener if (startEatingSoonTTCheckbox.isChecked()) { if (currentProfile.getUnits().equals(Constants.MMOL)) { - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)"); + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(eatingSoonTT) + " mmol/l (" + eatingSoonTTDuration + " min)"); } else - actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)"); + actions.add(MainApp.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to0Decimal(eatingSoonTT) + " mg/dl (" + eatingSoonTTDuration + " min)"); } int timeOffset = editTime.getValue().intValue(); diff --git a/app/src/main/java/info/nightscout/utils/T.java b/app/src/main/java/info/nightscout/utils/T.java index ce8541dd8c..99f4e573c3 100644 --- a/app/src/main/java/info/nightscout/utils/T.java +++ b/app/src/main/java/info/nightscout/utils/T.java @@ -7,6 +7,12 @@ package info.nightscout.utils; public class T { private long time; // in msec + public static T now() { + T t = new T(); + t.time = System.currentTimeMillis(); + return t; + } + public static T msecs(long msec) { T t = new T(); t.time = msec; @@ -56,4 +62,12 @@ public class T { public long days() { return time / 24 / 60 / 60 / 1000L; } + + public T plus(T plus) { + return T.msecs(time + plus.time); + } + + public T minus(T minus) { + return T.msecs(time - minus.time); + } } diff --git a/app/src/main/res/layout/actions_fill_dialog.xml b/app/src/main/res/layout/actions_fill_dialog.xml index 2883485bf7..21fb5d3c66 100644 --- a/app/src/main/res/layout/actions_fill_dialog.xml +++ b/app/src/main/res/layout/actions_fill_dialog.xml @@ -11,27 +11,24 @@ android:padding="10dp"> diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml index 3a51ecec3c..85f8e82317 100644 --- a/app/src/main/res/layout/overview_calibration_dialog.xml +++ b/app/src/main/res/layout/overview_calibration_dialog.xml @@ -11,8 +11,8 @@ android:layout_height="match_parent"> @@ -20,10 +20,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:padding="10dp" - android:text="@string/overview_calibration_bg_label" + android:text="@string/overview_calibration" + android:textColor="@color/colorCalibrationButton" android:textAppearance="?android:attr/textAppearanceLarge" /> + + diff --git a/app/src/main/res/layout/overview_newinsulin_dialog.xml b/app/src/main/res/layout/overview_newinsulin_dialog.xml index 8103f4378b..e4647fac38 100644 --- a/app/src/main/res/layout/overview_newinsulin_dialog.xml +++ b/app/src/main/res/layout/overview_newinsulin_dialog.xml @@ -17,26 +17,23 @@ android:padding="10dp"> @@ -59,7 +56,7 @@ android:id="@+id/newinsulin_record_only" android:layout_width="wrap_content" android:layout_height="match_parent" - android:text="@string/don_t_bolus_record_only" /> + android:text="@string/do_not_bolus_record_only" /> @@ -124,6 +121,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_marginRight="5dp" android:text="@string/insulin_unit_shortname" /> diff --git a/app/src/main/res/layout/overview_newtreatment_dialog.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml index a332cece9a..348c182a7a 100644 --- a/app/src/main/res/layout/overview_newtreatment_dialog.xml +++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml @@ -29,7 +29,7 @@ android:id="@+id/newtreatment_record_only" android:layout_width="wrap_content" android:layout_height="match_parent" - android:text="@string/don_t_bolus_record_only" /> + android:text="@string/do_not_bolus_record_only" /> Избор на данни Позволява автоматично изпращане на данни за грешки и статистически данни до разработчиците чрез fabric.io service. Моля обновете G5 приложението до поддържана версия. - Не доставяй болус, само запис + Не доставяй болус, само запис Категория Подкатегория Болусът ще бъде само записан diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d4b1a0f9dc..bfe0605b44 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -810,7 +810,7 @@ Spustit Dočasný cíl Blížící se jídlo DoCíl min - Nepouštět bolus, jen zaznamenat + Nepouštět bolus, jen zaznamenat Podkategorie Kategorie Bolus bude pouze zaznamenán diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9d990334ff..10d46dd495 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -797,4 +797,6 @@ Verbindungs-Einstellungen Zielsetzung %d nicht gestartet Zielsetzung %d nicht abgeschlossen + Bolus nur erfassen + Bolus wird nur erfasst diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a39ab1ce48..dc96612c1c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -744,7 +744,7 @@ El Bolo solo será anotado Categoría Subcategoría - No administrar Bolo, solo anotar + No administrar Bolo, solo anotar min TT Inicio TT Actividad diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6a32c1dd18..7701908beb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -835,7 +835,7 @@ Rozpocznij TT Ćwiczenia Rozpocznij TT WkrótcePosiłek TT - Nie podawaj bolusa, tylko zapisz rekord + Nie podawaj bolusa, tylko zapisz rekord Kategoria Podkategoria Bolus zostanie tylko zapisany w rekordach diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0c7c0bb55e..35132e4423 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -813,7 +813,7 @@ Vänligen uppdatera din G5-app till en supportad version Starta \"Träning\" Starta \"Äta snart\" - Ge ingen bolus, logga bara + Ge ingen bolus, logga bara Kategori Underkategori Bolusen sparas bara i loggboken diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 32df48e57c..6ae1ed06e1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,7 @@ #00FF00 #FF0000 #FFFF00 + #FFFF00 #505050 #f0003f59 #FF33B5E5 @@ -28,6 +29,7 @@ #424242 #77dd77 + #77dd77 #303F9F diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 234931971e..fd895ef4c5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -923,7 +923,7 @@ Start Activity TT Start Eating soon TT TT - Don\'t bolus, record only + Do not bolus, record only Category Subcategory Bolus will be recorded only diff --git a/app/src/test/java/info/nightscout/utils/TTest.java b/app/src/test/java/info/nightscout/utils/TTest.java index ca7bb7cdaf..764754623e 100644 --- a/app/src/test/java/info/nightscout/utils/TTest.java +++ b/app/src/test/java/info/nightscout/utils/TTest.java @@ -9,11 +9,11 @@ import org.powermock.modules.junit4.PowerMockRunner; * Created by mike on 26.03.2018. */ -@RunWith(PowerMockRunner.class) +//@RunWith(PowerMockRunner.class) public class TTest { @Test - public void doTests() { + public void toUnits() { Assert.assertEquals(1, T.msecs(1000).secs()); Assert.assertEquals(1, T.secs(60).mins()); Assert.assertEquals(1, T.mins(60).hours()); @@ -21,4 +21,31 @@ public class TTest { Assert.assertEquals(24, T.days(1).hours()); Assert.assertEquals(60000, T.mins(1).msecs()); } + + @Test + public void now() { + Assert.assertTrue(Math.abs(T.now().msecs() - System.currentTimeMillis()) < 5000); + } + + @Test + public void additions() { + long nowMsecs = System.currentTimeMillis(); + T now = T.msecs(nowMsecs); + + Assert.assertEquals(now.plus(T.secs(5)).msecs(), nowMsecs + 5 * 1000); + Assert.assertEquals(now.plus(T.mins(5)).msecs(), nowMsecs + 5 * 60 * 1000); + Assert.assertEquals(now.plus(T.hours(5)).msecs(), nowMsecs + 5 * 60 * 60 * 1000); + Assert.assertEquals(now.plus(T.days(5)).msecs(), nowMsecs + 5 * 24 * 60 * 60 * 1000); + } + + @Test + public void subtractions() { + long nowMsecs = System.currentTimeMillis(); + T now = T.msecs(nowMsecs); + + Assert.assertEquals(now.minus(T.secs(5)).msecs(), nowMsecs - 5 * 1000); + Assert.assertEquals(now.minus(T.mins(5)).msecs(), nowMsecs - 5 * 60 * 1000); + Assert.assertEquals(now.minus(T.hours(5)).msecs(), nowMsecs - 5 * 60 * 60 * 1000); + Assert.assertEquals(now.minus(T.days(5)).msecs(), nowMsecs - 5 * 24 * 60 * 60 * 1000); + } }