caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DanaR preferences & preferences cleanup

Browse source
This commit is contained in:
Milos Kozak 2016-07-07 17:17:54 +02:00
parent ba015f1140
commit c844a2ad9a
15 changed files with 167 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

4
app/build.gradle
View file

@ -23,8 +23,8 @@ android {
applicationId "info.nightscout.androidaps"
minSdkVersion 21
targetSdkVersion 23
versionCode 1005
versionName "1.0.05"
versionCode 1006
versionName "1.0.06"
}
buildTypes {
release {

55
app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
View file

@ -1,20 +1,29 @@
package info.nightscout.androidaps;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.MultiSelectListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
import android.preference.PreferenceManager;
import android.os.Bundle;
import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.events.EventRefreshGui;
import info.nightscout.androidaps.plugins.DanaR.BluetoothDevicePreference;
import info.nightscout.utils.LocaleHelper;
public class PreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
MyPreferenceFragment myPreferenceFragment;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getFragmentManager().beginTransaction().replace(android.R.id.content, new MyPreferenceFragment()).commit();
myPreferenceFragment = new MyPreferenceFragment();
getFragmentManager().beginTransaction().replace(android.R.id.content, myPreferenceFragment).commit();
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
}
@ -22,12 +31,43 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
MainApp.bus().post(new EventPreferenceChange());
if (key.equals("language")) {
SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
String lang = SP.getString("language", "en");
String lang = sharedPreferences.getString("language", "en");
LocaleHelper.setLocale(getApplicationContext(), lang);
recreate();
MainApp.bus().post(new EventRefreshGui());
}
updatePrefSummary(myPreferenceFragment.getPreference(key));
}
private static void updatePrefSummary(Preference pref) {
if (pref instanceof ListPreference || pref instanceof BluetoothDevicePreference) {
ListPreference listPref = (ListPreference) pref;
pref.setSummary(listPref.getEntry());
}
if (pref instanceof EditTextPreference) {
EditTextPreference editTextPref = (EditTextPreference) pref;
if (pref.getTitle().toString().toLowerCase().contains("password"))
{
pref.setSummary("******");
} else {
pref.setSummary(editTextPref.getText());
}
}
if (pref instanceof MultiSelectListPreference) {
EditTextPreference editTextPref = (EditTextPreference) pref;
pref.setSummary(editTextPref.getText());
}
}
private static void initSummary(Preference p) {
if (p instanceof PreferenceGroup) {
PreferenceGroup pGrp = (PreferenceGroup) p;
for (int i = 0; i < pGrp.getPreferenceCount(); i++) {
initSummary(pGrp.getPreference(i));
}
} else {
updatePrefSummary(p);
}
}
public static class MyPreferenceFragment extends PreferenceFragment {
@ -42,9 +82,16 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
addPreferencesFromResource(R.xml.pref_openapsma);
if (Config.LOWSUSPEDENABLED)
addPreferencesFromResource(R.xml.pref_lowsuspend);
addPreferencesFromResource(R.xml.pref_nightscout);
if (Config.DANAR)
addPreferencesFromResource(R.xml.pref_danar);
if (Config.CAREPORTALENABLED)
addPreferencesFromResource(R.xml.pref_careportal);
initSummary(getPreferenceScreen());
}
public Preference getPreference (String key) {
return findPreference(key);
}
}
}

4
app/src/main/java/info/nightscout/androidaps/Services/DataService.java
View file

@ -2,7 +2,9 @@ package info.nightscout.androidaps.Services;
import android.app.IntentService;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import com.j256.ormlite.dao.Dao;
@ -224,6 +226,8 @@ public class DataService extends IntentService {
}
PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
if (pump != null) {
SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
if (SP.getBoolean("syncprofiletopump", false))
pump.setNewBasalProfile(nsProfile);
} else {
log.error("No active pump selected");

37
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/BluetoothDevicePreference.java Normal file
View file

@ -0,0 +1,37 @@
package info.nightscout.androidaps.plugins.DanaR;
import android.bluetooth.*;
import android.content.Context;
import android.preference.ListPreference;
import android.util.AttributeSet;
import java.util.Set;
public class BluetoothDevicePreference extends ListPreference {
public BluetoothDevicePreference(Context context, AttributeSet attrs) {
super(context, attrs);
BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter();
Integer size = 0;
if (bta != null) {
size += bta.getBondedDevices().size();
}
CharSequence[] entries = new CharSequence[size];
int i = 0;
if (bta != null) {
Set<BluetoothDevice> pairedDevices = bta.getBondedDevices();
for (BluetoothDevice dev : pairedDevices) {
entries[i] = dev.getName();
i++;
}
}
setEntries(entries);
setEntryValues(entries);
}
public BluetoothDevicePreference(Context context) {
this(context, null);
}
}

144
app/src/main/res/values-bg/strings.xml
View file

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">AndroidAPS</string>
<string name="closedloop">Closed Loop</string>
<string name="openloop">Otevřená smyčka</string>
<string name="alert">Аларма</string>
<string name="apsmode_title">APS режим</string>
<string name="avgdelta">Ср. изменение</string>
<string name="basal">Базал</string>
@ -68,154 +65,15 @@
<string name="en_lang">English</string>
<string name="entertreatmentquestion">Ново действие</string>
<string name="glucose">КЗ:</string>
<string name="limits_title">Лимит</string>
<string name="loop">Smyčka</string>
<string name="loop_aps_label">APS</string>
<string name="loop_constraintsprocessed_label">Po zpracování omezení</string>
<string name="loop_setbypump_label">Nastaveno pumpou</string>
<string name="loopdisabled">SMYČKA ZAKÁZÁNA OMEZENÍM</string>
<string name="lowsuspend">Low Suspend</string>
<string name="lowsuspend_low_title">Hodnota nízké glykémie</string>
<string name="manualenacts">Ručně spuštěno</string>
<string name="lowsuspend_lowprojected">Předpokládaná nízká glykémie:</string>
<string name="maxbasal_summary">Max U/h dočasného bázálu jsou</string>
<string name="maxbasal_title">Max bazál</string>
<string name="maxbasaliob_summary">Maximální množství nebolusového IOB, které může OpenAPS používat</string>
<string name="maxbasaliob_title">Maximální bazální IOB</string>
<string name="minago">min zpět</string>
<string name="minimalduration">Minimální trvání</string>
<string name="nav_backup">Záloha</string>
<string name="nav_exit">Ukončit</string>
<string name="nav_preferences">Nastavení</string>
<string name="nav_refreshtreatments">Aktualizuj ošetření z NS</string>
<string name="nav_resetdb">Inicializuj databáze</string>
<string name="nav_test_alarm">Test alarmu</string>
<string name="noapsselected">ŽÁDNÉ APS NEVYBRÁNO NEBO NEVRÁTILO VÝSLEDEK</string>
<string name="nochangerequested">Změna nepožadována</string>
<string name="noprofile">Dosud nebyl načten profil z NS</string>
<string name="ns_sync_use_absolute_summary">Používat absolutní hodnoty místo procent při nahrávání do NS</string>
<string name="ns_sync_use_absolute_title">Použít absolutní hodnoty</string>
<string name="nsclient">NSClient</string>
<string name="nsprofileview_activeprofile_label">Aktivní profil:</string>
<string name="nsprofileview_basal_label">Bazál:</string>
<string name="nsprofileview_dia_label">Trvání inzulínu:</string>
<string name="nsprofileview_ic_label">Inzulínosacharidový poměr:</string>
<string name="nsprofileview_noprofile_text">ŽÁDNÝ PROFIL NENASTAVEN</string>
<string name="nsprofileview_target_label">Cíl:</string>
<string name="nsprofileview_units_label">Jednotky:</string>
<string name="objectives">Cíle</string>
<string name="objectives_button_start">Začátek</string>
<string name="objectives_button_verify">Kontrola</string>
<string name="objectives_gate_label_string">Splnit:</string>
<string name="objectives_objective_label_string">Cíl:</string>
<string name="ok">OK</string>
<string name="openapsma_currenttemp_label">Součaný bazál</string>
<string name="openapsma_disabled">Modul zakázán</string>
<string name="openapsma_glucosestatus_label">Vstupní glykémie</string>
<string name="openapsma_inputparameters_label">Vstupní parametry</string>
<string name="openapsma_iobdata_label">IOB data</string>
<string name="openapsma_lastenact_label">Poslední provedení</string>
<string name="openapsma_lastrun_label">Poslední spuštění</string>
<string name="openapsma_mealdata_label">Data o jídle</string>
<string name="openapsma_minbg_label">Cílová nízká glykémie</string>
<string name="openapsma_noglucosedata">Nedostupná data o glykémiích</string>
<string name="openapsma_noprofile">Nedostupný profil</string>
<string name="openapsma_nopump">Žádná pumpa</string>
<string name="openapsma_profile_label">Profil</string>
<string name="openapsma_request_label">Požadavek</string>
<string name="openapsma_result_label">Výsledek</string>
<string name="openapsma_run">Sputit teď</string>
<string name="openloop_newsuggestion">Dostupné nové doporučení</string>
<string name="overview">Přehled</string>
<string name="overview_calculator_label">Kalkulačka</string>
<string name="overview_newtempbasal_basal_label">Hodnota bazálu</string>
<string name="overview_newtempbasal_percent_label">% (100% = současný)</string>
<string name="overview_bolus_label">Bolus</string>
<string name="profileviewer">NS profil</string>
<string name="pumpstatusavailableinns">Stav pumpy dostupný v NS</string>
<string name="rate">Hodnota:</string>
<string name="reason">Zdůvodnění:</string>
<string name="refreshfromnightscout">Opravdu aktualizovat ošetření z NS</string>
<string name="safety">Bezpečnost</string>
<string name="safety_useextended_summary">Použít kombo bolusy pro bazály větší než 100%</string>
<string name="safety_useextended_title">Použít kombo bolusy</string>
<string name="setextendedbolusquestion">Spustit nový kombo bolus:</string>
<string name="setbasalquestion">Spustit nový dočasný bazál:</string>
<string name="simpleprofile">Jednoduchý profil</string>
<string name="tempbasals">Dočasné bazály</string>
<string name="tempbasals_iob_label_string">IOB:</string>
<string name="tempbasals_iobtotal_label_string">Celkové IOB:</string>
<string name="tempbasals_netinsulin_label_string">Inz:</string>
<string name="tempbasals_netratio_label_string">Hodn:</string>
<string name="tempbasals_realduration_label_string">Trv:</string>
<string name="title_activity_preferences">Nastavení</string>
<string name="treatmentdeliveryerror">Chyba podání bolusu</string>
<string name="treatments">Ošetření</string>
<string name="treatments_activity_string">Aktivita:</string>
<string name="treatments_carbs_label_string">Sacharidy:</string>
<string name="treatments_insulin_label_string">Inzulín:</string>
<string name="treatments_iob_label_string">IOB:</string>
<string name="treatments_iobactivitytotal_label_string">Celková aktivita IOB:</string>
<string name="treatments_iobtotal_label_string">Celkové IOB:</string>
<string name="treatments_newtreatment_carbsamount_label">Množtví sacharidů</string>
<string name="treatments_newtreatment_insulinamount_label">Množství inzulínu</string>
<string name="treatments_wizard_basaliob_label">Bazální IOB</string>
<string name="treatments_wizard_bg_label">Glykémie</string>
<string name="treatments_wizard_bolusiob_label">Bolusové IOB</string>
<string name="treatments_wizard_carbs_label">Sacharidy</string>
<string name="treatments_wizard_correction_label">Korekce</string>
<string name="treatments_wizard_total_label">CELKEM</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="treatmentssafety_maxbolus_title">Max. povolený bolus</string>
<string name="treatmentssafety_maxcarbs_title">Max. povolené sacharidy</string>
<string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
<string name="unsupportedclientver">Nepodporovaná verze NSClient</string>
<string name="virtualpump">Virtualní pumpa</string>
<string name="virtualpump_basebasalrate_label">Základní hodnota bazálu:</string>
<string name="virtualpump_battery_label">Baterie:</string>
<string name="virtualpump_extendedbolus_label">Kombo bolus:</string>
<string name="virtualpump_reservoir_label">Zásobník:</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">Chyba databáze</string>
<string name="virtualpump_tempbasal_label">Dočasný bazál:</string>
<string name="vitualpump_label">VIRTUÁLNÍ PUMPA</string>
<string name="xdrip">xDrip</string>
<string name="overview_extendedbolus_button">Kombo bolus</string>
<string name="overview_tempbasal_button">Dočasný bazál</string>
<string name="nsprofileview_isf_label">Citlivost:</string>
<string name="nsclientnotinstalled">NSClient není nainstalován. Záznam je ztracen!</string>
<string name="lowsuspend_lowprojectedmessage">Předpokládaná nízká glykémie: Dočasný bazál 0%</string>
<string name="lowsuspend_lowmessage">Nízká glykémie: Dočasný bazál 0%</string>
<string name="lowsuspend_cancelmessage">Low Suspend: Zrušení dočasného bazálu</string>
<string name="lowsuspend_low">Low Suspend:</string>
<string name="careportal_newnstreatment_eventtype">Тип събитие</string>
<string name="careportal_newnstreatment_glucosetype">КЗ тип</string>
<string name="title_activity_main">AndroidAPS</string>
<string name="openapsma">OpenAPS MA</string>
<string name="configbuilder_nightscoutversion_label">Nightscout версия:</string>
<string name="configbuilder_nsclientversion_label">NSClient версия:</string>
<string name="send">POSLAT</string>
<string name="missing">Chybí</string>
<string name="enabled">Enabled</string>
<string name="visible">Viditelný</string>
<string name="up">Nahoru</string>
<string name="exported">Настройките са експортирани</string>
<string name="setting_imported">Nastavení importováno</string>
<string name="import_from">Импортирай настройки от:</string>
<string name="filenotfound">Файлът не съществува</string>
<string name="export_to">Експортирай настройки до</string>
<string name="nav_export">Exportovat nastavení</string>
<string name="nav_import">Importovat nastavení</string>
<string name="de_lang">German</string>
<string name="openapsma_apslimits_label">Limity APS</string>
<string name="openapsma_high_summary">Maximální hodnota ještě v rozsahu</string>
<string name="openapsma_high_title">Horní limit</string>
<string name="openapsma_low_summary">Minimální hodnota ještě v rozsahu</string>
<string name="openapsma_low_title">Dolní limit</string>
<string name="openapsma_maxbasal_summary">Maximální povolený bazál [U/h]</string>
<string name="openapsma_maxbasal_title">Maximální bazál</string>
<string name="openapsma_maxbasaliob_title">Maximální IOB z bazálů</string>
<string name="openapsma_maxiob_summary">Maximální nebolusové IOB, které může OpenAPS použít</string>
<string name="openapsma_targetrange_label">Cílový rozsah pro OpenAPS</string>
<string name="bg_lang">български</string>
<string name="nightscout">Nightscout</string>
</resources>

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

@ -3,7 +3,6 @@
<string name="app_name">AndroidAPS</string>
<string name="closedloop">Uzavřená smyčka</string>
<string name="openloop">Otevřená smyčka</string>
<string name="alert">Výstaha</string>
<string name="apsmode_title">Typ smyčky</string>
<string name="avgdelta">Prům. změna</string>
<string name="basal">Bazál</string>
@ -68,7 +67,6 @@
<string name="en_lang">English</string>
<string name="entertreatmentquestion">Zadej nové ošetření</string>
<string name="glucose">Glykémie:</string>
<string name="limits_title">Limity</string>
<string name="loop">Smyčka</string>
<string name="loop_aps_label">APS</string>
<string name="loop_constraintsprocessed_label">Po zpracování omezení</string>
@ -78,10 +76,6 @@
<string name="lowsuspend_low_title">Hodnota nízké glykémie</string>
<string name="manualenacts">Ručně spuštěno</string>
<string name="lowsuspend_lowprojected">Předpokládaná nízká glykémie:</string>
<string name="maxbasal_summary">Max U/h dočasného bázálu jsou</string>
<string name="maxbasal_title">Max bazál</string>
<string name="maxbasaliob_summary">Maximální množství nebolusového IOB, které může OpenAPS používat</string>
<string name="maxbasaliob_title">Maximální bazální IOB</string>
<string name="minago">min zpět</string>
<string name="minimalduration">Minimální trvání</string>
<string name="nav_backup">Záloha</string>
@ -93,8 +87,7 @@
<string name="noapsselected">ŽÁDNÉ APS NEVYBRÁNO NEBO NEVRÁTILO VÝSLEDEK</string>
<string name="nochangerequested">Změna nepožadována</string>
<string name="noprofile">Dosud nebyl načten profil z NS</string>
<string name="ns_sync_use_absolute_summary">Používat absolutní hodnoty místo procent při nahrávání do NS</string>
<string name="ns_sync_use_absolute_title">Použít absolutní hodnoty</string>
<string name="ns_sync_use_absolute_title">Vždy použít absolutní hodnoty bazálu</string>
<string name="nsclient">NSClient</string>
<string name="nsprofileview_activeprofile_label">Aktivní profil:</string>
<string name="nsprofileview_basal_label">Bazál:</string>
@ -137,8 +130,7 @@
<string name="reason">Zdůvodnění:</string>
<string name="refreshfromnightscout">Opravdu aktualizovat ošetření z NS</string>
<string name="safety">Bezpečnost</string>
<string name="safety_useextended_summary">Použít kombo bolusy pro bazály větší než 100%</string>
<string name="safety_useextended_title">Použít kombo bolusy</string>
<string name="danar_useextended_title">Použít kombo bolusy pro >200%</string>
<string name="setextendedbolusquestion">Spustit nový kombo bolus:</string>
<string name="setbasalquestion">Spustit nový dočasný bazál:</string>
<string name="simpleprofile">Jednoduchý profil</string>
@ -148,7 +140,6 @@
<string name="tempbasals_netinsulin_label_string">Inz:</string>
<string name="tempbasals_netratio_label_string">Hodn:</string>
<string name="tempbasals_realduration_label_string">Trv:</string>
<string name="title_activity_preferences">Nastavení</string>
<string name="treatmentdeliveryerror">Chyba podání bolusu</string>
<string name="treatments">Ošetření</string>
<string name="treatments_activity_string">Aktivita:</string>
@ -166,8 +157,8 @@
<string name="treatments_wizard_correction_label">Korekce</string>
<string name="treatments_wizard_total_label">CELKEM</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="treatmentssafety_maxbolus_title">Max. povolený bolus</string>
<string name="treatmentssafety_maxcarbs_title">Max. povolené sacharidy</string>
<string name="treatmentssafety_maxbolus_title">Maximální povolený bolus [U]</string>
<string name="treatmentssafety_maxcarbs_title">Maximální povolené sacharidy [g]</string>
<string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
<string name="unsupportedclientver">Nepodporovaná verze NSClient</string>
<string name="virtualpump">Virtualní pumpa</string>
@ -190,7 +181,6 @@
<string name="lowsuspend_low">Low Suspend:</string>
<string name="careportal_newnstreatment_eventtype">Typ události</string>
<string name="careportal_newnstreatment_glucosetype">Zadání glykémie</string>
<string name="title_activity_main">AndroidAPS</string>
<string name="openapsma">OpenAPS MA</string>
<string name="configbuilder_nightscoutversion_label">Verze Nightscoutu:</string>
<string name="configbuilder_nsclientversion_label">Verze NSClienta:</string>
@ -207,16 +197,10 @@
<string name="nav_export">Exportovat nastavení</string>
<string name="nav_import">Importovat nastavení</string>
<string name="de_lang">German</string>
<string name="openapsma_apslimits_label">Limity APS</string>
<string name="openapsma_high_summary">Maximální hodnota ještě v rozsahu</string>
<string name="openapsma_high_title">Horní limit</string>
<string name="openapsma_low_summary">Minimální hodnota ještě v rozsahu</string>
<string name="openapsma_low_title">Dolní limit</string>
<string name="openapsma_high_summary">Maximální hodnota glykémie ještě v rozsahu</string>
<string name="openapsma_low_summary">Minimální hodnota glykémie ještě v rozsahu</string>
<string name="openapsma_maxbasal_summary">Maximální povolený bazál [U/h]</string>
<string name="openapsma_maxbasal_title">Maximální bazál</string>
<string name="openapsma_maxbasaliob_title">Maximální IOB z bazálů</string>
<string name="openapsma_maxiob_summary">Maximální nebolusové IOB, které může OpenAPS použít</string>
<string name="openapsma_targetrange_label">Cílový rozsah pro OpenAPS</string>
<string name="openapsma_maxiob_summary">Maximální bazální IOB [U]</string>
<string name="bg_lang">Bulgarian</string>
<string name="dismiss">POTVRDIT</string>
<string name="language">Jazyk</string>
@ -224,4 +208,8 @@
<string name="connecting">Připojuji</string>
<string name="danarpump">DanaR</string>
<string name="disconnected">Odpojeno</string>
<string name="danar_bt_name_title">DanaR Bluetooth zařízení</string>
<string name="danar_pump_settings">DanaR nastavení</string>
<string name="syncprofiletopump_title">Synchronizovat NS profil do pumpy</string>
<string name="nightscout">Nightscout</string>
</resources>

21
app/src/main/res/values-de/strings.xml
View file

@ -23,8 +23,6 @@
<string name="tempbasals_netinsulin_label_string">Ins:</string>
<string name="tempbasals_netratio_label_string">Ratio:</string>
<string name="tempbasals_realduration_label_string">Dur:</string>
<string name="title_activity_main">AndroidAPS</string>
<string name="title_activity_preferences">Einstellungen</string>
<string name="treatmentdeliveryerror">Bolus Abgabefehler</string>
<string name="virtualpump_battery_label">Batterie:</string>
<string name="virtualpump_resultok">OK</string>
@ -121,8 +119,7 @@
<string name="simpleprofile">Einfaches Profil</string>
<string name="setextendedbolusquestion">Setze neuen extended Bolus:</string>
<string name="setbasalquestion">Akzeptiere neue temp Basalrate:</string>
<string name="safety_useextended_title">Benutze extended Bolus</string>
<string name="safety_useextended_summary"><![CDATA[Benutze extended Bolus für hohe temps (\>200%)]]></string>
<string name="danar_useextended_title">Benutze extended Bolus für hohe temps (\>200%)></string>
<string name="refreshfromnightscout">Möchtest du die Treatments von Nightscout abrufen</string>
<string name="pumpstatusavailableinns">Pumpen Status verfügbar in NS</string>
<string name="overview_newtempbasal_percent_label">% (100% = current)</string>
@ -147,8 +144,7 @@
<string name="objectives">Objectives</string>
<string name="nsprofileview_noprofile_text">KEIN PROFIL GESETZT</string>
<string name="nsclientnotinstalled">NSClient nicht installiert. Record lost!</string>
<string name="ns_sync_use_absolute_title">Benutze absolute Werte</string>
<string name="ns_sync_use_absolute_summary">Use absolute basal values instead of percent in upload to NS</string>
<string name="ns_sync_use_absolute_title">Use absolute basal values instead of percent in upload to NS</string>
<string name="noprofile">Bisher noch kein Profil von NS geladen</string>
<string name="nochangerequested">No change requested</string>
<string name="noapsselected">NO APS SELECTED OR PROVIDED RESULT</string>
@ -179,20 +175,15 @@
<string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
<string name="loop_constraintsprocessed_label">After processed constraints</string>
<string name="loop">Loop</string>
<string name="limits_title">Limits</string>
<string name="lowsuspend_low_title">Low BG threshold</string>
<string name="lowsuspend_lowmessage">LOW: Temp basal 0%</string>
<string name="lowsuspend_lowprojected">Low projected:</string>
<string name="lowsuspend_lowprojectedmessage">LOW PROJECTED: Temp basal 0%</string>
<string name="manualenacts">Manual enacts</string>
<string name="maxbasal_summary">Max U/hr of Temp Basal can be set to</string>
<string name="carbsconstraintapplied">Carbs constraint applied</string>
<string name="nav_resetdb">Reset Datenbanken</string>
<string name="minimalduration">Minimale Dauer</string>
<string name="maxbasaliob_title">Max basal IOB</string>
<string name="minago">min ago</string>
<string name="maxbasaliob_summary">Maximum amount of non-bolus IOB OpenAPS can deliver</string>
<string name="maxbasal_title">Max basal</string>
<string name="nav_refreshtreatments">Erneure treatments von NS</string>
<string name="nav_exit">Exit</string>
<string name="missing">Fehlend</string>
@ -205,17 +196,11 @@
<string name="setting_imported">Einstellungen importiert</string>
<string name="nav_export">Einstellungen exportieren</string>
<string name="nav_import">Einstellungen importieren</string>
<string name="alert">Alarm</string>
<string name="de_lang">Deutsch</string>
<string name="openapsma_apslimits_label">APS Limit</string>
<string name="openapsma_high_title">Hoher Wert</string>
<string name="openapsma_low_title">Niedriger Wert</string>
<string name="openapsma_maxbasal_title">Max Basal</string>
<string name="openapsma_maxbasaliob_title">Max Basal IOB</string>
<string name="openapsma_targetrange_label">APS Zielbereich</string>
<string name="openapsma_maxbasal_summary">Max U/hr die man für eine Temp Basal setzen kann</string>
<string name="openapsma_maxiob_summary">Maximale Menge von nicht bolus IOB die OpenAPs abgeben kann</string>
<string name="openapsma_high_summary">Maximalwert für deinen persönlichen Zielbereich.</string>
<string name="openapsma_low_summary">Minimalwert für deinen persönlichen Zielbereich.</string>
<string name="bg_lang">Bulgarian</string>
<string name="nightscout">Nightscout</string>
</resources>

2
app/src/main/res/values/arrays.xml
View file

@ -13,11 +13,13 @@
<string-array name="languagesArray">
<item>@string/en_lang</item>
<item>@string/cs_lang</item>
<item>@string/de_lang</item>
<item>@string/bg_lang</item>
</string-array>
<string-array name="languagesValues" translatable="false">
<item>en</item>
<item>cs</item>
<item>de</item>
<item>bg</item>
</string-array>
</resources>

35
app/src/main/res/values/strings.xml
View file

@ -1,11 +1,8 @@
<resources>
<string name="app_name">AndroidAPS</string>
<string name="title_activity_main">AndroidAPS</string>
<string name="title_activity_preferences">Preferences</string>
<string name="treatmentssafety_title">Tratments safety</string>
<string name="treatmentssafety_maxbolus_title">Max allowed bolus</string>
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs</string>
<string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
<string name="nav_preferences">Preferences</string>
<string name="nav_refreshtreatments">Refresh treatments from NS</string>
@ -13,10 +10,9 @@
<string name="nav_test_alarm">Test alarm</string>
<string name="nav_resetdb">Reset databases</string>
<string name="nav_exit">Exit</string>
<string name="safety_useextended_title">Use extended boluses</string>
<string name="safety_useextended_summary">Use extended boluses for high temps (\>200%)</string>
<string name="ns_sync_use_absolute_title">Use absolute values</string>
<string name="ns_sync_use_absolute_summary">Use absolute basal values instead of percent in upload to NS</string>
<string name="danar_useextended_title">Use extended boluses for >200%</string>
<string name="danar_bt_name_title">DanaR Bluetooth device</string>
<string name="ns_sync_use_absolute_title">Always use basal absolute values</string>
<string name="objectives_objective_label_string">Objective:</string>
<string name="objectives_gate_label_string">Gate:</string>
@ -114,17 +110,11 @@
<string name="loop_constraintsprocessed_label">After processed constraints</string>
<string name="loop_setbypump_label">Set by pump</string>
<string name="openapsma_lastenact_label">Last enacted</string>
<string name="alert">Alert</string>
<string name="refreshfromnightscout">Do you want to refresh treatments from Nightscout</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>
<string name="noapsselected">NO APS SELECTED OR PROVIDED RESULT</string>
<string name="safety">Safety</string>
<string name="limits_title">Limits</string>
<string name="maxbasal_title">Max basal</string>
<string name="maxbasal_summary">Max U/hr of Temp Basal can be set to</string>
<string name="maxbasaliob_title">Max basal IOB</string>
<string name="maxbasaliob_summary">Maximum amount of non-bolus IOB OpenAPS can deliver</string>
<string name="lowsuspend_low_title">Low BG threshold</string>
<string name="openapsma_disabled">Plugin is disabled</string>
<string name="constraints_violation">Constraints violation</string>
@ -215,16 +205,10 @@
<string name="nav_export">Export settings</string>
<string name="nav_import">Import settings</string>
<string name="de_lang">German</string>
<string name="openapsma_targetrange_label">APS target BG range</string>
<string name="openapsma_low_summary">The minimum value you consider to be in range.</string>
<string name="openapsma_high_summary">The maximum value you consider to be in range.</string>
<string name="openapsma_low_title">Low Value</string>
<string name="openapsma_high_title">High Value</string>
<string name="openapsma_apslimits_label">APS Limits</string>
<string name="openapsma_low_summary">The minimum BG value to be in range.</string>
<string name="openapsma_high_summary">The maximum BG value to be in range.</string>
<string name="openapsma_maxbasal_summary">Max U/hr a Temp Basal can be set to</string>
<string name="openapsma_maxiob_summary">Maximum amount of non-bolus IOB OpenAPS can deliver</string>
<string name="openapsma_maxbasal_title">Max Basal</string>
<string name="openapsma_maxbasaliob_title">Max Basal IOB</string>
<string name="openapsma_maxiob_summary">Maximum basal IOB OpenAPS can deliver [U]</string>
<string name="bg_lang">Bulgarian</string>
<string name="dismiss">DISMISS</string>
<string name="language">Language</string>
@ -233,5 +217,8 @@
<string name="connecting">Connecting</string>
<string name="connected">Connected</string>
<string name="disconnected">Disconnected</string>
<string name="syncprofiletopump_title">Sync Nightscout profile to pump</string>
<string name="danar_pump_settings">DanaR pump settings</string>
<string name="nightscout">Nightscout</string>
</resources>

2
app/src/main/res/xml/pref_closedmode.xml
View file

@ -2,7 +2,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="aps_general"
android:title="General">
android:title="@string/loop">
<ListPreference
android:title="@string/apsmode_title"

17
app/src/main/res/xml/pref_danar.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="danar"
android:title="@string/danar_pump_settings">
<info.nightscout.androidaps.plugins.DanaR.BluetoothDevicePreference
android:dialogTitle="@string/danar_bt_name_title"
android:key="danar_bt_name"
android:title="@string/danar_bt_name_title" />
<SwitchPreference
android:defaultValue="false"
android:key="danar_useextended"
android:title="@string/danar_useextended_title" />
</PreferenceCategory>
</PreferenceScreen>

2
app/src/main/res/xml/pref_language.xml
View file

@ -2,7 +2,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="language"
android:title="@string/language">
android:title="@string/configbuilder_general">
<ListPreference
android:title="@string/language"

18
app/src/main/res/xml/pref_nightscout.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="nigthscout"
android:title="@string/nightscout">
<SwitchPreference
android:defaultValue="false"
android:key="syncprofiletopump"
android:title="@string/syncprofiletopump_title" />
<SwitchPreference
android:defaultValue="false"
android:key="ns_sync_use_absolute"
android:title="@string/ns_sync_use_absolute_title" />
</PreferenceCategory>
</PreferenceScreen>

20
app/src/main/res/xml/pref_openapsma.xml
View file

@ -1,37 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="bgRange"
android:title="@string/openapsma_targetrange_label">
android:key="openaps"
android:title="@string/openapsma">
<EditTextPreference
android:defaultValue=""
android:key="openapsma_min_bg"
android:numeric="decimal"
android:summary="@string/openapsma_low_summary"
android:title="@string/openapsma_low_title" />
android:title="@string/openapsma_low_summary" />
<EditTextPreference
android:defaultValue=""
android:key="openapsma_max_bg"
android:numeric="decimal"
android:summary="@string/openapsma_high_summary"
android:title="@string/openapsma_high_title" />
</PreferenceCategory>
<PreferenceCategory
android:key="aps_limits"
android:title="@string/openapsma_apslimits_label">
android:title="@string/openapsma_high_summary" />
<EditTextPreference
android:defaultValue="1"
android:key="openapsma_max_basal"
android:numeric="decimal"
android:summary="@string/openapsma_maxbasal_summary"
android:title="@string/openapsma_maxbasal_title" />
android:title="@string/openapsma_maxbasal_summary" />
<EditTextPreference
android:defaultValue="1.5"
android:key="openapsma_max_iob"
android:numeric="decimal"
android:summary="@string/openapsma_maxiob_summary"
android:title="@string/openapsma_maxbasaliob_title" />
android:title="@string/openapsma_maxiob_summary" />
</PreferenceCategory>
</PreferenceScreen>