caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2022-03-30 14:15:19 +02:00
parent 5f163ac3a9 aa301ed459
commit 1c3ba6b380
18 changed files with 68 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
View file

@ -116,16 +116,16 @@ class FillDialog : DialogFragmentWithDate() {
if (insulinAfterConstraints > 0) {
actions.add(rh.gs(R.string.fillwarning))
actions.add("")
actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.colorInsulinButton))
actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(context, rh, R.attr.insulinButtonColor))
if (abs(insulinAfterConstraints - insulin) > 0.01)
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
}
val siteChange = binding.fillCatheterChange.isChecked
if (siteChange)
actions.add(rh.gs(R.string.record_pump_site_change).formatColor(rh, R.color.actionsConfirm))
actions.add(rh.gs(R.string.record_pump_site_change).formatColor(context, rh, R.attr.actionsConfirmColor))
val insulinChange = binding.fillCartridgeChange.isChecked
if (insulinChange)
actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(rh, R.color.actionsConfirm))
actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(context, rh, R.attr.actionsConfirmColor))
val notes: String = binding.notesLayout.notes.text.toString()
if (notes.isNotEmpty())
actions.add(rh.gs(R.string.notes_label) + ": " + notes)

9
app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
View file

@ -172,16 +172,17 @@ class InsulinDialog : DialogFragmentWithDate() {
val eatingSoonChecked = binding.startEatingSoonTt.isChecked
if (insulinAfterConstraints > 0) {
actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.bolus))
actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(context, rh, R.attr.bolusColor))
if (recordOnlyChecked)
actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(context, rh, R.attr.warningColor))
if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
}
val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration()
val eatingSoonTT = defaultValueHelper.determineEatingSoonTT()
if (eatingSoonChecked)
actions.add(rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(rh, R.color.tempTargetConfirmation))
actions.add(rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, eatingSoonTTDuration) + ")")
.formatColor(context, rh, R.attr.tempTargetConfirmation))
val timeOffset = binding.time.value.toInt()
val time = dateUtil.now() + T.mins(timeOffset.toLong()).msecs()

2
app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
View file

@ -118,7 +118,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
actions.add(rh.gs(R.string.tempbasal_label) + ": " + rh.gs(R.string.pump_basebasalrate, absolute))
actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes))
if (abs(absolute - basalAbsoluteInput) > 0.01)
actions.add(rh.gs(R.string.constraintapllied).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.constraintapllied).formatColor(context, rh, R.attr.warningColor))
}
activity?.let { activity ->
OKDialog.showConfirmation(activity, rh.gs(R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {

10
app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
View file

@ -128,16 +128,16 @@ class TreatmentDialog : DialogFragmentWithDate() {
val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
if (insulinAfterConstraints > 0) {
actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.bolus))
actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(context, rh, R.attr.bolusColor))
if (recordOnlyChecked)
actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(context, rh, R.attr.warningColor))
if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
}
if (carbsAfterConstraints > 0) {
actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(rh, R.color.carbs))
actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(context, rh, R.attr.carbsColor))
if (carbsAfterConstraints != carbs)
actions.add(rh.gs(R.string.carbsconstraintapplied).formatColor(rh, R.color.warning))
actions.add(rh.gs(R.string.carbsconstraintapplied).formatColor(context, rh, R.attr.warningColor))
}
if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
activity?.let { activity ->

6
app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
View file

@ -468,12 +468,12 @@ class WizardDialog : DaggerDialogFragment() {
}
if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) {
val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin).formatColor(rh, R.color.bolus) else ""
val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(R.string.format_carbs, carbsAfterConstraint).formatColor(rh, R.color.carbs) else ""
val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin).formatColor(context, rh, R.attr.bolusColor) else ""
val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(R.string.format_carbs, carbsAfterConstraint).formatColor(context, rh, R.attr.carbsColor) else ""
binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.result_insulin_carbs, insulinText, carbsText))
binding.okcancel.ok.visibility = View.VISIBLE
} else {
binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt()).formatColor(rh, R.color.carbs))
binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt()).formatColor(context, rh, R.attr.carbsColor))
binding.okcancel.ok.visibility = View.INVISIBLE
}
binding.percentUsed.text = rh.gs(R.string.format_percent, wizard.percentageCorrection)

4
app/src/main/res/values-cs-rCZ/strings.xml
View file

@ -985,6 +985,8 @@
<string name="wear_unknown_action_string">Neznámý příkaz k akci:</string>
<string name="overview_editquickwizard_percentage">Procentní podíl</string>
<string name="app_default">Výchozí nastavení aplikace</string>
<string name="show_invalidated_records">Zobrazit zneplatněné / odstraněné záznamy</string>
<string name="hide_invalidated_records">Skrýt zneplatněné / odstraněné záznamy</string>
<string name="select_profile">Vyberte profil pro úpravu</string>
<string name="refresh_from_nightscout">Obnovit z Nightscoutu</string>
<string name="remove_selected_items">Odstranit zvolené položky</string>
@ -1001,4 +1003,6 @@
<string name="below" comment="below &quot;in range&quot;">Pod</string>
<string name="in_range">V rozsahu</string>
<string name="above" comment="above &quot;in range&quot;">Nad</string>
<string name="show_loop_records">Zobrazit záznamy smyčky</string>
<string name="show_hide_records">Skrýt záznamy smyčky</string>
</resources>

6
app/src/main/res/values-es-rES/strings.xml
View file

@ -435,7 +435,7 @@
<string name="openapssmb">OpenAPS SMB</string>
<string name="openaps_smb_dynamic_isf">ISF Dinámico</string>
<string name="DynISFAdjust_title">Factor de ajuste de ISF Dinámico %</string>
<string name="DynISFAdjust_summary">Porcentaje del factor de ajuste para ISF Dinámico. Establece valores por encima del 100%, para correcciones más agresivas y por debajo para correcciones menos agresivas</string>
<string name="DynISFAdjust_summary">Porcentaje del factor de ajuste de ISF Dinámico\n Valor predeterminado: 100\nEstablecer valores por encima del 100% para que el algoritmo aplique correcciones más agresivas y valores por debajo del 100% para correcciones menos agresivas.</string>
<string name="enableuam">Activar UAM</string>
<string name="enablesmb">Activar SMB</string>
<string name="enablesmb_summary">Usar microbolos en lugar de basales temporales, para corregir más rápidamente</string>
@ -985,6 +985,8 @@
<string name="wear_unknown_action_string">Comando de acción desconocido:</string>
<string name="overview_editquickwizard_percentage">Porcentaje</string>
<string name="app_default">Aplicación por defecto</string>
<string name="show_invalidated_records">Mostrar registros eliminados o invalidados</string>
<string name="hide_invalidated_records">Ocultar registros eliminados o invalidados</string>
<string name="select_profile">Seleccione el perfil a editar</string>
<string name="refresh_from_nightscout">Actualizar de Nightscout</string>
<string name="remove_selected_items">Eliminar los elementos seleccionados</string>
@ -1001,4 +1003,6 @@
<string name="below" comment="below &quot;in range&quot;">Bajo</string>
<string name="in_range">En rango</string>
<string name="above" comment="above &quot;in range&quot;">Alto</string>
<string name="show_loop_records">Mostrar registros del lazo</string>
<string name="show_hide_records">Ocultar registros del lazo</string>
</resources>

4
app/src/main/res/values-no-rNO/strings.xml
View file

@ -985,6 +985,8 @@
<string name="wear_unknown_action_string">Ukjent kommando:</string>
<string name="overview_editquickwizard_percentage">Prosent</string>
<string name="app_default">Standardverdi</string>
<string name="show_invalidated_records">Vis ugyldige / slettede registreringer</string>
<string name="hide_invalidated_records">Skjul ugyldige / slettede registreringer</string>
<string name="select_profile">Velg profil du vil redigere</string>
<string name="refresh_from_nightscout">Oppdater fra Nightscout</string>
<string name="remove_selected_items">Fjern valgte elementer</string>
@ -1001,4 +1003,6 @@
<string name="below" comment="below &quot;in range&quot;">Under</string>
<string name="in_range">I målområdet</string>
<string name="above" comment="above &quot;in range&quot;">Over</string>
<string name="show_loop_records">Vis loop registreringer</string>
<string name="show_hide_records">Skjul loop registreringer</string>
</resources>

5
app/src/main/res/values-ru-rRU/strings.xml
View file

@ -161,6 +161,7 @@
<string name="end_user_license_agreement">лицензионное соглашение с пользователем</string>
<string name="end_user_license_agreement_text">НЕ ДОЛЖНО ИСПОЛЬЗОВАТЬСЯ ДЛЯ ПРИНЯТИЯ МЕДИЦИНСКИХ РЕШЕНИЙ. ПРОГРАММА НЕ ДАЕТ ГАРАНТИЙ В РАМКАХ СУЩЕСТВУЮЩЕГО ЗАКОНОДАТЕЛЬСТВА. ПРЕДОСТАВЛЯЕТСЯ \"КАК ЕСТЬ\" БЕЗ ЯВНЫХ ИЛИ СКРЫТЫХ ГАРАНТИЙ ВКЛЮЧАЯ НО НЕ ОГРАНИЧИВАЯСЬ ВОЗМОЖНОСТЬЮ КОММЕРЧЕСКОГО ИСПОЛЬЗОВАНИ ИЛИ СООТВЕТСТВИЯ КАКИМ-ЛИБО ЦЕЛЯМ. ВСЕ РИСКИ ЛОЖАТСЯ НА ВАС. В СЛУЧАЕ НЕРАБОТОСПОСОБНОСТИ ПРОГРАММЫ ВЫ НЕСЕТЕ ВСЕ РАСХОДЫ СВЯЗАННЫЕ С ОБСЛУЖИВАНИЕМ РЕМОНТОМ ИЛИ КОРРЕКТИРОВКОЙ. </string>
<string name="end_user_license_agreement_i_understand">я понимаю и принимаю</string>
<string name="save">Сохранить</string>
<string name="reloadprofile">обновить профиль</string>
<string name="smscommunicator">SMS коммуникатор</string>
<string name="smscommunicator_allowednumbers">разрешенные телефонные номера</string>
@ -432,6 +433,8 @@
<string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
<string name="openapssmb">Супер микро болюс OpenAPS</string>
<string name="openaps_smb_dynamic_isf">Динамический ISF</string>
<string name="DynISFAdjust_title">Коэффициент регулировки динамического диапазона чувствительности ISF %</string>
<string name="DynISFAdjust_summary">Коэффициент корректировки динамического диапазона чувствительности ISF. Установите более 100% для более агрессивных доз коррекции и менее 100% для менее агрессивной коррекции.</string>
<string name="enableuam">Включить непредвиденный прием пищи UAM</string>
<string name="enablesmb">Включить супер микро болюс SMB</string>
<string name="enablesmb_summary">Для ускорения действия используйте супер микро болюсы SMB вместо временного базала</string>
@ -664,6 +667,7 @@
<string name="show_invalidated">Показать недействительные</string>
<string name="hide_invalidated">Скрыть недействительные</string>
<string name="remove_items">Удалить элементы</string>
<string name="sort_items">Сортировать элементы</string>
<string name="storedsettingsfound">Найдены сохраненные параметры</string>
<string name="allow_hardware_pump_text">Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время.</string>
<string name="error_adding_treatment_title">Данные терапии неполные</string>
@ -878,6 +882,7 @@
<string name="ns_receive_profile_switch_summary">Принимать переключения профиля, введенные через NS или NSClient</string>
<string name="ns_receive_offline_event">Принимать события APS автономно</string>
<string name="ns_receive_offline_event_summary">Принимать события APS введенные через NS или клиент NS автономно</string>
<string name="ns_receive_tbr_eb">Получать временную базальную скорость TBR и пролонгированный болюс EB</string>
<string name="ns_receive_insulin">Принимать инсулин</string>
<string name="ns_receive_insulin_summary">Принимать инсулин, введенный через NS или NSClient (не подается, только рассчитывается как активный IOB)</string>
<string name="ns_receive_carbs">Принимать углеводы</string>

5
app/src/main/res/values-tr-rTR/strings.xml
View file

@ -986,6 +986,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
<string name="wear_unknown_action_string">Bilinmeyen eylem komutu:</string>
<string name="overview_editquickwizard_percentage">Yüzde</string>
<string name="app_default">Uygulama varsayılanı</string>
<string name="show_invalidated_records">Geçersiz kılınan / kaldırılan kayıtları göster</string>
<string name="hide_invalidated_records">Geçersiz kılınan / kaldırılan kayıtları gizle</string>
<string name="select_profile">Düzenlenecek profili seç</string>
<string name="refresh_from_nightscout">Nightscout\'tan Yenile</string>
<string name="remove_selected_items">Seçili nesneleri kaldır</string>
@ -998,7 +1000,10 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
<string name="show_loop">Döngüyü göster</string>
<string name="count_selected">%1$d seçildi</string>
<string name="sort_label">Sırala</string>
<string name="dialog_canceled">İletişim kutusu iptal edildi</string>
<string name="below" comment="below &quot;in range&quot;">Altında</string>
<string name="in_range">Aralık içinde</string>
<string name="above" comment="above &quot;in range&quot;">Üstünde</string>
<string name="show_loop_records">Döngü kayıtlarını göster</string>
<string name="show_hide_records">Döngü kayıtlarını gizle</string>
</resources>

1
app/src/main/res/values-zh-rCN/strings.xml
View file

@ -997,6 +997,7 @@
<string name="show_loop">显示闭环</string>
<string name="count_selected">已选中 %1$d</string>
<string name="sort_label">排序</string>
<string name="dialog_canceled">对话框已取消</string>
<string name="below" comment="below &quot;in range&quot;">底部</string>
<string name="in_range">在范围内</string>
<string name="above" comment="above &quot;in range&quot;">上方</string>

5
core/src/main/res/values-cs-rCZ/strings.xml
View file

@ -460,6 +460,11 @@
<string name="formatPercent">%1$.0f%%</string>
<string name="basal">Bazál</string>
<string name="basalpct">Bazál %</string>
<string name="count_selected">Vybráno: %1$d</string>
<string name="sort_label">Seřadit</string>
<string name="remove_items">Odebrat položky</string>
<string name="sort_items">Seřadit položky</string>
<string name="remove_selected_items">Odebrat vybrané položky</string>
<plurals name="days">
<item quantity="one">%1$d den</item>
<item quantity="few">%1$d dnů</item>

5
core/src/main/res/values-es-rES/strings.xml
View file

@ -460,6 +460,11 @@
<string name="formatPercent">%1$.0f%%</string>
<string name="basal">Basal</string>
<string name="basalpct">Basal %</string>
<string name="count_selected">%1$d seleccionados</string>
<string name="sort_label">Ordenar</string>
<string name="remove_items">Eliminar elementos</string>
<string name="sort_items">Ordenar elementos</string>
<string name="remove_selected_items">Eliminar los elementos seleccionados</string>
<plurals name="days">
<item quantity="one">%1$d día</item>
<item quantity="other">%1$d días</item>

2
core/src/main/res/values-night/styles.xml
View file

@ -142,6 +142,8 @@
<item name="infoColor">@color/info</item>
<!---Bolus wizard -->
<item name="cobAlertColor">@color/cobAlert</item>
<!---Fill dialog -->
<item name="actionsConfirmColor">@color/actionsConfirm</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

5
core/src/main/res/values-no-rNO/strings.xml
View file

@ -460,6 +460,11 @@
<string name="formatPercent">%1$.0f%%</string>
<string name="basal">Basal</string>
<string name="basalpct">Basal %</string>
<string name="count_selected">%1$d valgt</string>
<string name="sort_label">Sorter</string>
<string name="remove_items">Slett elementer</string>
<string name="sort_items">Sorter elementer</string>
<string name="remove_selected_items">Slett valgte elementer</string>
<plurals name="days">
<item quantity="one">%1$d dag</item>
<item quantity="other">%1$d dager</item>

5
core/src/main/res/values-tr-rTR/strings.xml
View file

@ -460,6 +460,11 @@
<string name="formatPercent">%1$.0f%%</string>
<string name="basal">Bazal</string>
<string name="basalpct">Bazal %</string>
<string name="count_selected">%1$d seçildi</string>
<string name="sort_label">Sırala</string>
<string name="remove_items">Öğeleri kaldır</string>
<string name="sort_items">Öğeleri Sırala</string>
<string name="remove_selected_items">Seçilen öğeleri kaldır</string>
<plurals name="days">
<item quantity="one">%1$d gün</item>
<item quantity="other">%1$d gün</item>

2
core/src/main/res/values/attrs.xml
View file

@ -116,4 +116,6 @@
<attr name="infoColor" format="reference|color" />
<!---Bolus wizard -->
<attr name="cobAlertColor" format="reference|color" />
<!---Fill dialog -->
<attr name="actionsConfirmColor" format="reference|color" />
</resources>

2
core/src/main/res/values/styles.xml
View file

@ -141,6 +141,8 @@
<item name="infoColor">@color/info</item>
<!---Bolus wizard -->
<item name="cobAlertColor">@color/cobAlert</item>
<!---Fill dialog -->
<item name="actionsConfirmColor">@color/actionsConfirm</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>