rename button to activate profile

This commit is contained in:
Milos Kozak 2017-10-04 23:33:02 +02:00
parent 3d58fe6bb5
commit f08809ff9e
16 changed files with 4 additions and 26 deletions

View file

@ -500,11 +500,7 @@ public class CircadianPercentageProfileFragment extends SubscriberFragment {
public void run() { public void run() {
if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) { if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
profileswitchButton.setVisibility(View.GONE); profileswitchButton.setVisibility(View.GONE);
} else if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable) {
profileswitchButton.setText(MainApp.instance().getText(R.string.activate_profile));
profileswitchButton.setVisibility(View.VISIBLE);
} else { } else {
profileswitchButton.setText(MainApp.instance().getText(R.string.send_to_pump));
profileswitchButton.setVisibility(View.VISIBLE); profileswitchButton.setVisibility(View.VISIBLE);
} }
} }

View file

@ -153,11 +153,7 @@ public class LocalProfileFragment extends SubscriberFragment {
public void run() { public void run() {
if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) { if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
profileswitchButton.setVisibility(View.GONE); profileswitchButton.setVisibility(View.GONE);
} else if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable) {
profileswitchButton.setText(MainApp.instance().getText(R.string.activate_profile));
profileswitchButton.setVisibility(View.VISIBLE);
} else { } else {
profileswitchButton.setText(MainApp.instance().getText(R.string.send_to_pump));
profileswitchButton.setVisibility(View.VISIBLE); profileswitchButton.setVisibility(View.VISIBLE);
} }
} }

View file

@ -157,11 +157,7 @@ public class SimpleProfileFragment extends SubscriberFragment {
public void run() { public void run() {
if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) { if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
profileswitchButton.setVisibility(View.GONE); profileswitchButton.setVisibility(View.GONE);
} else if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable) {
profileswitchButton.setText(MainApp.instance().getText(R.string.activate_profile));
profileswitchButton.setVisibility(View.VISIBLE);
} else { } else {
profileswitchButton.setText(MainApp.instance().getText(R.string.send_to_pump));
profileswitchButton.setVisibility(View.VISIBLE); profileswitchButton.setVisibility(View.VISIBLE);
} }
} }

View file

@ -114,7 +114,7 @@
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/send_to_pump" android:text="@string/activate_profile"
android:textColor="@color/colorProfileSwitchButton" /> android:textColor="@color/colorProfileSwitchButton" />

View file

@ -97,7 +97,7 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/send_to_pump" android:text="@string/activate_profile"
android:textColor="@color/colorProfileSwitchButton" /> android:textColor="@color/colorProfileSwitchButton" />
</LinearLayout> </LinearLayout>

View file

@ -125,7 +125,7 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/send_to_pump" android:text="@string/activate_profile"
android:textColor="@color/colorProfileSwitchButton" /> android:textColor="@color/colorProfileSwitchButton" />
</LinearLayout> </LinearLayout>

View file

@ -351,7 +351,6 @@
<string name="button3">Бутон 3</string> <string name="button3">Бутон 3</string>
<string name="percentagefactor_hint">% с който базовият профил ще бъде променен.</string> <string name="percentagefactor_hint">% с който базовият профил ще бъде променен.</string>
<string name="timeshift_hint">Точен брой часове, с които ще бъде изместен профила!</string> <string name="timeshift_hint">Точен брой часове, с които ще бъде изместен профила!</string>
<string name="send_to_pump">ИЗПРАТИ КЪМ ПОМПАТА</string>
<string name="units">Единици:</string> <string name="units">Единици:</string>
<string name="mgdl">мг/дл</string> <string name="mgdl">мг/дл</string>
<string name="mmol">ммол/л</string> <string name="mmol">ммол/л</string>

View file

@ -340,7 +340,6 @@
<string name="pumpshutdown">Pumpa vypnuta</string> <string name="pumpshutdown">Pumpa vypnuta</string>
<string name="resend_all_data">Znovu poslat všechny data</string> <string name="resend_all_data">Znovu poslat všechny data</string>
<string name="reset_db_confirm">Opravdu resetovat všechny databáze</string> <string name="reset_db_confirm">Opravdu resetovat všechny databáze</string>
<string name="send_to_pump">POSLAT DO PUMPY</string>
<string name="target_range">Cílový rozsah:</string> <string name="target_range">Cílový rozsah:</string>
<string name="timeshift_hint">Čas v hodinách, o který bude bazál posunutý.</string> <string name="timeshift_hint">Čas v hodinách, o který bude bazál posunutý.</string>
<string name="units">Jednotky:</string> <string name="units">Jednotky:</string>

View file

@ -288,7 +288,6 @@
<string name="lowbattery">Niedrige Batterie</string> <string name="lowbattery">Niedrige Batterie</string>
<string name="pumpbusy">Pumpe ist beschäftigt</string> <string name="pumpbusy">Pumpe ist beschäftigt</string>
<string name="pumperror">Pumpenfehler</string> <string name="pumperror">Pumpenfehler</string>
<string name="send_to_pump">an Pumpe senden</string>
<string name="target_range">Zielbereich:</string> <string name="target_range">Zielbereich:</string>
<string name="units">Einheiten:</string> <string name="units">Einheiten:</string>
<string name="wrongpumpdriverselected">Falscher Pumpentreiber ausgewählt</string> <string name="wrongpumpdriverselected">Falscher Pumpentreiber ausgewählt</string>

View file

@ -377,7 +377,6 @@
<string name="pumpshutdown">Apagando Bomba</string> <string name="pumpshutdown">Apagando Bomba</string>
<string name="removerecord">Eliminar registro:</string> <string name="removerecord">Eliminar registro:</string>
<string name="resend_all_data">Enviar todos los datos</string> <string name="resend_all_data">Enviar todos los datos</string>
<string name="send_to_pump">ENVIAR A BOMBA</string>
<string name="short_avgdelta">Media corta delta</string> <string name="short_avgdelta">Media corta delta</string>
<string name="sms_bolus">Bolo:</string> <string name="sms_bolus">Bolo:</string>
<string name="sms_lastbg">Último BG:</string> <string name="sms_lastbg">Último BG:</string>

View file

@ -330,7 +330,6 @@
<string name="save">Salva</string> <string name="save">Salva</string>
<string name="send">Esci</string> <string name="send">Esci</string>
<string name="setbasalquestion">Accettare il nuovo basale temp</string> <string name="setbasalquestion">Accettare il nuovo basale temp</string>
<string name="send_to_pump">INVIARE ALLA POMPA</string>
<string name="setextendedbolusquestion">Impostare il nuovo bollo esteso</string> <string name="setextendedbolusquestion">Impostare il nuovo bollo esteso</string>
<string name="setting_imported">Impostazioni importate</string> <string name="setting_imported">Impostazioni importate</string>
<string name="settingextendedbolus">Impostazioni aggiuntive bolus</string> <string name="settingextendedbolus">Impostazioni aggiuntive bolus</string>

View file

@ -351,7 +351,6 @@
<string name="button3">버튼3</string> <string name="button3">버튼3</string>
<string name="percentagefactor_hint">Percentage factor by which the base profile will be multiplied.</string> <string name="percentagefactor_hint">Percentage factor by which the base profile will be multiplied.</string>
<string name="timeshift_hint">Time in hours by which the profile will be shifted round robin.</string> <string name="timeshift_hint">Time in hours by which the profile will be shifted round robin.</string>
<string name="send_to_pump">SEND TO PUMP</string>
<string name="units">Units:</string> <string name="units">Units:</string>
<string name="mgdl">mg/dl</string> <string name="mgdl">mg/dl</string>
<string name="mmol">mmol/l</string> <string name="mmol">mmol/l</string>

View file

@ -185,7 +185,6 @@
<string name="safety">Veiligheid</string> <string name="safety">Veiligheid</string>
<string name="send">VERZEND</string> <string name="send">VERZEND</string>
<string name="send_calibration" formatted="false">Verzend calibratie %.1f naar xDrip?</string> <string name="send_calibration" formatted="false">Verzend calibratie %.1f naar xDrip?</string>
<string name="send_to_pump">VERZEND NAAR POMP</string>
<string name="sensitivity_warning">Vergeet niet alle gegeten koolhydraten in te geven bij het activeren van de Autosens functie. Anders zullen BG wijzigingen door maaltijden foutief geïnterpreteerd worden!!</string> <string name="sensitivity_warning">Vergeet niet alle gegeten koolhydraten in te geven bij het activeren van de Autosens functie. Anders zullen BG wijzigingen door maaltijden foutief geïnterpreteerd worden!!</string>
<string name="sensitivityaaps">Gevoeligheid AAPS</string> <string name="sensitivityaaps">Gevoeligheid AAPS</string>
<string name="sensitivityoref0">Gevoeligheid Oref0</string> <string name="sensitivityoref0">Gevoeligheid Oref0</string>

View file

@ -427,7 +427,6 @@
<string name="save">сохранить</string> <string name="save">сохранить</string>
<string name="send">ОТПРАВИТЬ</string> <string name="send">ОТПРАВИТЬ</string>
<string name="send_calibration" formatted="false">отправить калибровку %.1f на xdrip?</string> <string name="send_calibration" formatted="false">отправить калибровку %.1f на xdrip?</string>
<string name="send_to_pump">ОТПРАВИТЬ НА ПОМПУ</string>
<string name="setbasalquestion">принять новый врем базал:</string> <string name="setbasalquestion">принять новый врем базал:</string>
<string name="setextendedbolusquestion">установить новый расширенн болюс:</string> <string name="setextendedbolusquestion">установить новый расширенн болюс:</string>
<string name="setting_imported">настройки импортированы</string> <string name="setting_imported">настройки импортированы</string>

View file

@ -413,7 +413,6 @@
<string name="setting_imported">inställningar importerade</string> <string name="setting_imported">inställningar importerade</string>
<string name="setextendedbolusquestion">Ställ in ny förlängd bolus:</string> <string name="setextendedbolusquestion">Ställ in ny förlängd bolus:</string>
<string name="setbasalquestion">Acceptera ny temp basal:</string> <string name="setbasalquestion">Acceptera ny temp basal:</string>
<string name="send_to_pump">SKICKA TILL PUMP</string>
<string name="send_calibration" formatted="false">Skicka kalibrering %.1f till xDrip?</string> <string name="send_calibration" formatted="false">Skicka kalibrering %.1f till xDrip?</string>
<string name="send">SKICKA</string> <string name="send">SKICKA</string>
<string name="save">Spara</string> <string name="save">Spara</string>

View file

@ -362,7 +362,6 @@
<string name="button3">Button 3</string> <string name="button3">Button 3</string>
<string name="percentagefactor_hint">Percentage factor by which the base profile will be multiplied.</string> <string name="percentagefactor_hint">Percentage factor by which the base profile will be multiplied.</string>
<string name="timeshift_hint">Time in hours by which the profile will be shifted round robin.</string> <string name="timeshift_hint">Time in hours by which the profile will be shifted round robin.</string>
<string name="send_to_pump">SEND TO PUMP</string>
<string name="units">Units:</string> <string name="units">Units:</string>
<string name="mgdl">mg/dl</string> <string name="mgdl">mg/dl</string>
<string name="mmol">mmol/l</string> <string name="mmol">mmol/l</string>