caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

wizard tweaking

Browse source
This commit is contained in:
Milos Kozak 2017-06-28 23:11:17 +02:00
parent 39e83f0cfe
commit f58f70bdca
12 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
View file

@ -21,7 +21,6 @@ import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
@ -62,7 +61,6 @@ import info.nightscout.utils.DateUtil;
import info.nightscout.utils.DecimalFormatter;
import info.nightscout.utils.NumberPicker;
import info.nightscout.utils.OKDialog;
import info.nightscout.utils.PlusMinusEditText;
import info.nightscout.utils.SP;
import info.nightscout.utils.SafeParse;
import info.nightscout.utils.ToastUtils;
@ -521,7 +519,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U") : "";
String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
total.setText(getString(R.string.send) + " " + insulinText + " " + carbsText);
total.setText(getString(R.string.result) + ": " + insulinText + " " + carbsText);
okButton.setVisibility(View.VISIBLE);
} else {
total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");

4
app/src/main/res/layout/openapsama_fragment.xml
View file

@ -380,7 +380,7 @@
android:layout_weight="2"
android:gravity="center_horizontal"
android:paddingRight="5dp"
android:text="@string/openapsma_result_label"
android:text="@string/result"
android:textColor="@android:color/white"
android:textSize="14sp" />
@ -451,7 +451,7 @@
android:layout_weight="2"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/openapsma_result_label"
android:text="@string/result"
android:textSize="14sp" />
<TextView

4
app/src/main/res/layout/openapsma_fragment.xml
View file

@ -335,7 +335,7 @@
android:layout_weight="2"
android:gravity="center_horizontal"
android:paddingRight="5dp"
android:text="@string/openapsma_result_label"
android:text="@string/result"
android:textColor="@android:color/white"
android:textSize="14sp" />
@ -361,7 +361,7 @@
android:layout_weight="2"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/openapsma_result_label"
android:text="@string/result"
android:textSize="14sp" />
<TextView

9
app/src/main/res/layout/overview_wizard_dialog.xml
View file

@ -202,11 +202,18 @@
<include layout="@layout/mdtp_done_button" />
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="-15dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="-20dp"
android:orientation="horizontal">
<CheckBox

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

@ -111,7 +111,7 @@
<string name="openapsma_nopump">Няма данни за помпа</string>
<string name="openapsma_profile_label">Профил</string>
<string name="openapsma_request_label">Искане</string>
<string name="openapsma_result_label">Резултат</string>
<string name="result">Резултат</string>
<string name="openapsma_run">Старт сега</string>
<string name="openloop_newsuggestion">Достъпно е ново предложение</string>
<string name="overview">Преглед</string>

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

@ -111,7 +111,7 @@
<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="result">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>

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

@ -124,7 +124,7 @@
<string name="overview_extendedbolus_button">Extended Bolus</string>
<string name="overview">Übersicht</string>
<string name="openloop_newsuggestion">Neue Empfehlung verfügbar</string>
<string name="openapsma_result_label">Ergebnis</string>
<string name="result">Ergebnis</string>
<string name="openapsma_request_label">Anfrage</string>
<string name="openapsma_run">Run now</string>
<string name="openapsma_nopump">Keine Pumpe verfügbar</string>

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

@ -60,7 +60,7 @@
<string name="openapsma_iobdata_label">IOB datos</string>
<string name="openapsma_profile_label">Perfil</string>
<string name="openapsma_mealdata_label">Datos de comidas</string>
<string name="openapsma_result_label">Resultado</string>
<string name="result">Resultado</string>
<string name="openapsma_noglucosedata">No hay disponibles datos de glucosa</string>
<string name="openapsma_noprofile">Sin perfil disponible</string>
<string name="openapsma_nopump">No se dispone de bomba</string>

2
app/src/main/res/values-it/strings.xml
View file

@ -299,7 +299,7 @@
<string name="dont_show_again">Non mostrarlo più</string>
<string name="enablesuperbolus_summary">Abilita funzionalità superbolus nella procedura guidata. Non abilitare fino a quando non impari quello che realmente fa. PUÒ CAUSARE L\'INVERTIMENTO INSULINO SE USATO BLINDLY!</string>
<string name="openapsma_request_label">Richiesta</string>
<string name="openapsma_result_label">Esito</string>
<string name="result">Esito</string>
<string name="openapsma_run">Avvia ora</string>
<string name="openloop">Apertura Loop</string>
<string name="othersettings_title">Altro</string>

2
app/src/main/res/values-ko/strings.xml
View file

@ -62,7 +62,7 @@
<string name="openapsma_iobdata_label">IOB 데이터</string>
<string name="openapsma_profile_label">프로파일</string>
<string name="openapsma_mealdata_label">식사 데이터</string>
<string name="openapsma_result_label">결과</string>
<string name="result">결과</string>
<string name="openapsma_noglucosedata">혈당 데이터 없음</string>
<string name="openapsma_noprofile">프로파일 없음</string>
<string name="openapsma_nopump">No pump available</string>

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

@ -366,7 +366,7 @@
<string name="openapsma_nopump">помпа недоступна</string>
<string name="openapsma_profile_label">профиль</string>
<string name="openapsma_request_label">запрос</string>
<string name="openapsma_result_label">результат</string>
<string name="result">результат</string>
<string name="openapsma_run">выполнить сейчас</string>
<string name="openapsma_scriptdebugdata_label">отладка скрипта</string>
<string name="openapsma_target_bg">целевое значение для расчетов</string>

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

@ -63,7 +63,7 @@
<string name="openapsma_iobdata_label">IOB data</string>
<string name="openapsma_profile_label">Profile</string>
<string name="openapsma_mealdata_label">Meal data</string>
<string name="openapsma_result_label">Result</string>
<string name="result">Result</string>
<string name="openapsma_noglucosedata">No glucose data available</string>
<string name="openapsma_noprofile">No profile available</string>
<string name="openapsma_nopump">No pump available</string>