Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline
This commit is contained in:
commit
44c3303e0e
19 changed files with 780 additions and 584 deletions
|
@ -21,6 +21,7 @@ import android.widget.CompoundButton;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.RadioButton;
|
import android.widget.RadioButton;
|
||||||
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
@ -71,20 +72,21 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
|
||||||
NSProfile profile;
|
NSProfile profile;
|
||||||
String units;
|
String units;
|
||||||
|
|
||||||
LinearLayout layoutBg;
|
RelativeLayout layoutBg;
|
||||||
LinearLayout layoutBgSource;
|
LinearLayout layoutBgSource;
|
||||||
LinearLayout layoutInsulin;
|
RelativeLayout layoutInsulin;
|
||||||
LinearLayout layoutCarbs;
|
RelativeLayout layoutCarbs;
|
||||||
LinearLayout layoutSplit;
|
RelativeLayout layoutSplit;
|
||||||
LinearLayout layoutDuration;
|
RelativeLayout layoutDuration;
|
||||||
LinearLayout layoutPercent;
|
RelativeLayout layoutPercent;
|
||||||
LinearLayout layoutAbsolute;
|
RelativeLayout layoutAbsolute;
|
||||||
LinearLayout layoutCarbTime;
|
RelativeLayout layoutCarbTime;
|
||||||
LinearLayout layoutProfile;
|
RelativeLayout layoutProfile;
|
||||||
LinearLayout layoutTempTarget;
|
LinearLayout layoutTempTarget;
|
||||||
Button dateButton;
|
Button dateButton;
|
||||||
Button timeButton;
|
Button timeButton;
|
||||||
Button okButton;
|
Button okButton;
|
||||||
|
Button cancelButton;
|
||||||
|
|
||||||
TextView bgUnitsView;
|
TextView bgUnitsView;
|
||||||
RadioButton meterRadioButton;
|
RadioButton meterRadioButton;
|
||||||
|
@ -142,18 +144,19 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
getDialog().setTitle(getString(options.eventName));
|
getDialog().setTitle(getString(options.eventName));
|
||||||
|
setStyle(DialogFragment.STYLE_NORMAL, getTheme());
|
||||||
View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);
|
View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);
|
||||||
|
|
||||||
layoutBg = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_bg_layout);
|
layoutBg = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_bg_layout);
|
||||||
layoutBgSource = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_bgsource_layout);
|
layoutBgSource = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_bgsource_layout);
|
||||||
layoutInsulin = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_insulin_layout);
|
layoutInsulin = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_insulin_layout);
|
||||||
layoutCarbs = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_carbs_layout);
|
layoutCarbs = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_carbs_layout);
|
||||||
layoutSplit = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_split_layout);
|
layoutSplit = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_split_layout);
|
||||||
layoutDuration = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_duration_layout);
|
layoutDuration = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_duration_layout);
|
||||||
layoutPercent = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
|
layoutPercent = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
|
||||||
layoutAbsolute = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
|
layoutAbsolute = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
|
||||||
layoutCarbTime = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_carbtime_layout);
|
layoutCarbTime = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_carbtime_layout);
|
||||||
layoutProfile = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_profile_layout);
|
layoutProfile = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_profile_layout);
|
||||||
layoutTempTarget = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_temptarget_layout);
|
layoutTempTarget = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_temptarget_layout);
|
||||||
|
|
||||||
bgUnitsView = (TextView) view.findViewById(R.id.careportal_newnstreatment_bgunits);
|
bgUnitsView = (TextView) view.findViewById(R.id.careportal_newnstreatment_bgunits);
|
||||||
|
@ -218,8 +221,10 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
|
||||||
dateButton.setOnClickListener(this);
|
dateButton.setOnClickListener(this);
|
||||||
timeButton.setOnClickListener(this);
|
timeButton.setOnClickListener(this);
|
||||||
|
|
||||||
okButton = (Button) view.findViewById(R.id.careportal_newnstreatment_ok);
|
okButton = (Button) view.findViewById(R.id.ok);
|
||||||
okButton.setOnClickListener(this);
|
okButton.setOnClickListener(this);
|
||||||
|
cancelButton = (Button) view.findViewById(R.id.cancel);
|
||||||
|
cancelButton.setOnClickListener(this);
|
||||||
|
|
||||||
// profile
|
// profile
|
||||||
profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
|
profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
|
||||||
|
@ -233,8 +238,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
|
||||||
profileList = profile.getProfileList();
|
profileList = profile.getProfileList();
|
||||||
}
|
}
|
||||||
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getContext(),
|
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getContext(),
|
||||||
android.R.layout.simple_spinner_item, profileList);
|
R.layout.spinner_centered, profileList);
|
||||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
profileSpinner.setAdapter(adapter);
|
profileSpinner.setAdapter(adapter);
|
||||||
if (profile != null) {
|
if (profile != null) {
|
||||||
// set selected to actual profile
|
// set selected to actual profile
|
||||||
|
@ -250,8 +254,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
|
||||||
reasonList.add(MainApp.sResources.getString(R.string.activity));
|
reasonList.add(MainApp.sResources.getString(R.string.activity));
|
||||||
reasonList.add(MainApp.sResources.getString(R.string.manual));
|
reasonList.add(MainApp.sResources.getString(R.string.manual));
|
||||||
ArrayAdapter<CharSequence> adapterReason = new ArrayAdapter<CharSequence>(getContext(),
|
ArrayAdapter<CharSequence> adapterReason = new ArrayAdapter<CharSequence>(getContext(),
|
||||||
android.R.layout.simple_spinner_item, reasonList);
|
R.layout.spinner_centered, reasonList);
|
||||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
reasonSpinner.setAdapter(adapterReason);
|
reasonSpinner.setAdapter(adapterReason);
|
||||||
|
|
||||||
// bg
|
// bg
|
||||||
|
@ -361,14 +364,17 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
|
||||||
tpd.dismissOnPause(true);
|
tpd.dismissOnPause(true);
|
||||||
tpd.show(context.getFragmentManager(), "Timepickerdialog");
|
tpd.show(context.getFragmentManager(), "Timepickerdialog");
|
||||||
break;
|
break;
|
||||||
case R.id.careportal_newnstreatment_ok:
|
case R.id.ok:
|
||||||
createNSTreatment();
|
createNSTreatment();
|
||||||
dismiss();
|
dismiss();
|
||||||
break;
|
break;
|
||||||
|
case R.id.cancel:
|
||||||
|
dismiss();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showOrHide(LinearLayout layout, boolean visible) {
|
private void showOrHide(ViewGroup layout, boolean visible) {
|
||||||
if (visible) layout.setVisibility(View.VISIBLE);
|
if (visible) layout.setVisibility(View.VISIBLE);
|
||||||
else layout.setVisibility(View.GONE);
|
else layout.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -412,7 +412,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
|
||||||
//log.debug("Locking detectSensitivity");
|
//log.debug("Locking detectSensitivity");
|
||||||
synchronized (dataLock) {
|
synchronized (dataLock) {
|
||||||
if (autosensDataTable == null || autosensDataTable.size() < 4) {
|
if (autosensDataTable == null || autosensDataTable.size() < 4) {
|
||||||
log.debug("No bucketed data available");
|
log.debug("No autosens data available");
|
||||||
return new AutosensResult();
|
return new AutosensResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -71,8 +71,7 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
|
||||||
timeList.add(DateUtil.timeString(DateUtil.toDate(24 * 60 * 60 - 60)));
|
timeList.add(DateUtil.timeString(DateUtil.toDate(24 * 60 * 60 - 60)));
|
||||||
|
|
||||||
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getContext(),
|
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getContext(),
|
||||||
android.R.layout.simple_spinner_item, timeList);
|
R.layout.spinner_centered, timeList);
|
||||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
fromSpinner.setAdapter(adapter);
|
fromSpinner.setAdapter(adapter);
|
||||||
toSpinner.setAdapter(adapter);
|
toSpinner.setAdapter(adapter);
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,8 @@ import info.nightscout.utils.SafeParse;
|
||||||
|
|
||||||
public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
|
public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
|
||||||
|
|
||||||
Button deliverButton;
|
Button okButton;
|
||||||
|
Button cancelButton;
|
||||||
TextView insulin;
|
TextView insulin;
|
||||||
TextView carbs;
|
TextView carbs;
|
||||||
|
|
||||||
|
@ -52,9 +53,11 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
View view = inflater.inflate(R.layout.overview_newtreatment_dialog, null, false);
|
View view = inflater.inflate(R.layout.overview_newtreatment_dialog, null, false);
|
||||||
|
|
||||||
deliverButton = (Button) view.findViewById(R.id.treatments_newtreatment_deliverbutton);
|
okButton = (Button) view.findViewById(R.id.ok);
|
||||||
|
okButton.setOnClickListener(this);
|
||||||
|
cancelButton = (Button) view.findViewById(R.id.cancel);
|
||||||
|
cancelButton.setOnClickListener(this);
|
||||||
|
|
||||||
deliverButton.setOnClickListener(this);
|
|
||||||
getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
|
getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
|
||||||
getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
|
getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
|
||||||
insulin = (TextView) view.findViewById(R.id.treatments_newtreatment_insulinamount);
|
insulin = (TextView) view.findViewById(R.id.treatments_newtreatment_insulinamount);
|
||||||
|
@ -79,7 +82,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
switch (view.getId()) {
|
switch (view.getId()) {
|
||||||
case R.id.treatments_newtreatment_deliverbutton:
|
case R.id.ok:
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Double insulin = SafeParse.stringToDouble(this.insulin.getText().toString());
|
Double insulin = SafeParse.stringToDouble(this.insulin.getText().toString());
|
||||||
|
@ -131,6 +134,9 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case R.id.cancel:
|
||||||
|
dismiss();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -169,8 +169,7 @@ public class DanaRHistoryActivity extends Activity {
|
||||||
typeList.add(new TypeList(RecordTypes.RECORD_TYPE_REFILL, getString(R.string.danar_history_refill)));
|
typeList.add(new TypeList(RecordTypes.RECORD_TYPE_REFILL, getString(R.string.danar_history_refill)));
|
||||||
typeList.add(new TypeList(RecordTypes.RECORD_TYPE_SUSPEND, getString(R.string.danar_history_syspend)));
|
typeList.add(new TypeList(RecordTypes.RECORD_TYPE_SUSPEND, getString(R.string.danar_history_syspend)));
|
||||||
ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this,
|
ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this,
|
||||||
android.R.layout.simple_spinner_item, typeList);
|
R.layout.spinner_centered, typeList);
|
||||||
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
historyTypeSpinner.setAdapter(spinnerAdapter);
|
historyTypeSpinner.setAdapter(spinnerAdapter);
|
||||||
|
|
||||||
reloadButton.setOnClickListener(new View.OnClickListener() {
|
reloadButton.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
|
@ -168,8 +168,7 @@ public class DanaRHistoryActivity extends Activity {
|
||||||
typeList.add(new TypeList(RecordTypes.RECORD_TYPE_GLUCOSE, getString(R.string.danar_history_glucose)));
|
typeList.add(new TypeList(RecordTypes.RECORD_TYPE_GLUCOSE, getString(R.string.danar_history_glucose)));
|
||||||
|
|
||||||
ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this,
|
ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this,
|
||||||
android.R.layout.simple_spinner_item, typeList);
|
R.layout.spinner_centered, typeList);
|
||||||
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
historyTypeSpinner.setAdapter(spinnerAdapter);
|
historyTypeSpinner.setAdapter(spinnerAdapter);
|
||||||
|
|
||||||
reloadButton.setOnClickListener(new View.OnClickListener() {
|
reloadButton.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
|
@ -229,8 +229,7 @@ public class TimeListEdit {
|
||||||
}
|
}
|
||||||
|
|
||||||
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(context,
|
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(context,
|
||||||
android.R.layout.simple_spinner_item, timeList);
|
R.layout.spinner_centered, timeList);
|
||||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
spinner.setAdapter(adapter);
|
spinner.setAdapter(adapter);
|
||||||
spinner.setSelection(posInList, false);
|
spinner.setSelection(posInList, false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:focusableInTouchMode="true"
|
android:focusableInTouchMode="true"
|
||||||
|
@ -16,22 +17,26 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:id="@+id/careportal_newnstreatment_bg_layout"
|
android:id="@+id/careportal_newnstreatment_bg_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_alignParentStart="true"
|
||||||
android:width="100dp"
|
android:layout_marginRight="10dp"
|
||||||
android:padding="10dp"
|
|
||||||
android:text="@string/treatments_wizard_bg_label"
|
android:text="@string/treatments_wizard_bg_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_bg_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_bg_minus"
|
android:id="@+id/careportal_newnstreatment_bg_minus"
|
||||||
|
@ -64,30 +69,32 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/careportal_newnstreatment_bgunits"
|
android:id="@+id/careportal_newnstreatment_bgunits"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_toEndOf="@+id/careportal_newnstreatment_bg_data_layout"
|
||||||
android:gravity="left"
|
android:gravity="left"
|
||||||
android:minWidth="40dp"
|
android:paddingLeft="20dp"
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="mg/dl"
|
android:text="mg/dl"
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
</LinearLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/careportal_newnstreatment_bgsource_layout"
|
android:id="@+id/careportal_newnstreatment_bgsource_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="center_horizontal"
|
||||||
android:orientation="horizontal"
|
android:orientation="vertical">
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<RadioGroup
|
<RadioGroup
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
|
@ -101,8 +108,8 @@
|
||||||
android:id="@+id/careportal_newnstreatment_sensor"
|
android:id="@+id/careportal_newnstreatment_sensor"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/careportal_newnstreatment_sensor"
|
android:checked="true"
|
||||||
android:checked="true" />
|
android:text="@string/careportal_newnstreatment_sensor" />
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/careportal_newnstreatment_other"
|
android:id="@+id/careportal_newnstreatment_other"
|
||||||
|
@ -110,24 +117,40 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/careportal_newnstreatment_other" />
|
android:text="@string/careportal_newnstreatment_other" />
|
||||||
</RadioGroup>
|
</RadioGroup>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:id="@+id/careportal_newnstreatment_carbs_layout"
|
android:id="@+id/careportal_newnstreatment_carbs_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
android:text="@string/treatments_wizard_carbs_label"
|
||||||
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_carbs_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:width="100dp"
|
android:orientation="horizontal">
|
||||||
android:padding="10dp"
|
|
||||||
android:text="@string/careportal_newnstreatment_carbs_label"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_carbs_minus"
|
android:id="@+id/careportal_newnstreatment_carbs_minus"
|
||||||
|
@ -161,33 +184,52 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
|
android:layout_toRightOf="@+id/careportal_newnstreatment_carbs_data_layout"
|
||||||
android:gravity="left"
|
android:gravity="left"
|
||||||
android:minWidth="40dp"
|
android:paddingLeft="20dp"
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="g"
|
android:text="g"
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
</LinearLayout>
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
<LinearLayout
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
android:id="@+id/careportal_newnstreatment_insulin_layout"
|
android:id="@+id/careportal_newnstreatment_insulin_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_insulin_label"
|
android:text="@string/careportal_newnstreatment_insulin_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_insulin_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_insulin_minus"
|
android:id="@+id/careportal_newnstreatment_insulin_minus"
|
||||||
|
@ -222,33 +264,51 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
|
android:layout_toEndOf="@+id/careportal_newnstreatment_insulin_data_layout"
|
||||||
android:gravity="left"
|
android:gravity="left"
|
||||||
android:minWidth="40dp"
|
android:paddingLeft="20dp"
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="U"
|
android:text="U"
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
</LinearLayout>
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
<LinearLayout
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
android:id="@+id/careportal_newnstreatment_split_layout"
|
android:id="@+id/careportal_newnstreatment_split_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_split_label"
|
android:text="@string/careportal_newnstreatment_split_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_split_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_split_minus"
|
android:id="@+id/careportal_newnstreatment_split_minus"
|
||||||
|
@ -283,32 +343,51 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="left"
|
|
||||||
android:minWidth="40dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="%"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:id="@+id/careportal_newnstreatment_duration_layout"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerVertical="true"
|
||||||
android:orientation="horizontal"
|
android:layout_toEndOf="@+id/careportal_newnstreatment_split_data_layout"
|
||||||
android:visibility="gone">
|
android:gravity="left"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:text="%"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_duration_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_duration_label"
|
android:text="@string/careportal_newnstreatment_duration_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_duration_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_duration_minus"
|
android:id="@+id/careportal_newnstreatment_duration_minus"
|
||||||
|
@ -343,34 +422,53 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/careportal_newnstreatment_duration_min"
|
android:id="@+id/careportal_newnstreatment_duration_min"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
|
android:layout_toEndOf="@+id/careportal_newnstreatment_duration_data_layout"
|
||||||
android:gravity="left"
|
android:gravity="left"
|
||||||
android:minWidth="40dp"
|
android:paddingLeft="20dp"
|
||||||
android:paddingLeft="5dp"
|
android:text="@string/careportal_newnstreatment_minutes"
|
||||||
android:text="@string/careportal_newnstreatment_duration_min"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
<LinearLayout
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
android:id="@+id/careportal_newnstreatment_percent_layout"
|
android:id="@+id/careportal_newnstreatment_percent_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_percent_label"
|
android:text="@string/careportal_newnstreatment_percent_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_percent_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_percent_minus"
|
android:id="@+id/careportal_newnstreatment_percent_minus"
|
||||||
|
@ -405,32 +503,51 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="left"
|
|
||||||
android:minWidth="40dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="%"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:id="@+id/careportal_newnstreatment_absolute_layout"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerVertical="true"
|
||||||
android:orientation="horizontal"
|
android:layout_toEndOf="@+id/careportal_newnstreatment_percent_data_layout"
|
||||||
android:visibility="gone">
|
android:gravity="left"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:text="%"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_absolute_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_absolute_label"
|
android:text="@string/careportal_newnstreatment_absolute_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_absolute_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_absolute_minus"
|
android:id="@+id/careportal_newnstreatment_absolute_minus"
|
||||||
|
@ -465,32 +582,51 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="left"
|
|
||||||
android:minWidth="40dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="U/h"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:id="@+id/careportal_newnstreatment_carbtime_layout"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerVertical="true"
|
||||||
android:orientation="horizontal"
|
android:layout_toEndOf="@+id/careportal_newnstreatment_absolute_data_layout"
|
||||||
android:visibility="gone">
|
android:gravity="left"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:text="U/h"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_carbtime_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_carbtime_label"
|
android:text="@string/careportal_newnstreatment_carbtime_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_carbtime_data_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/careportal_newnstreatment_carbtime_minus"
|
android:id="@+id/careportal_newnstreatment_carbtime_minus"
|
||||||
|
@ -525,143 +661,193 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="left"
|
|
||||||
android:minWidth="40dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:text="min"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/careportal_newnstreatment_profile_layout"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerVertical="true"
|
||||||
android:orientation="horizontal"
|
android:layout_gravity="center_vertical"
|
||||||
android:visibility="gone">
|
android:layout_toEndOf="@+id/careportal_newnstreatment_carbtime_data_layout"
|
||||||
|
android:gravity="left"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:text="@string/careportal_newnstreatment_minutes"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_profile_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/careportal_newnstreatment_profile_label"
|
android:text="@string/careportal_newnstreatment_profile_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/careportal_newnstreatment_profile"
|
android:id="@+id/careportal_newnstreatment_profile"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerInParent="true" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
</LinearLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/careportal_newnstreatment_temptarget_layout"
|
android:id="@+id/careportal_newnstreatment_temptarget_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:orientation="vertical">
|
||||||
android:orientation="vertical"
|
|
||||||
android:visibility="visible">
|
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:text="@string/reason"
|
android:text="@string/reason"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/careportal_newnstreatment_temptarget_reason"
|
android:id="@+id/careportal_newnstreatment_temptarget_reason"
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerHorizontal="true" />
|
||||||
android:orientation="horizontal">
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
|
||||||
android:text="@string/target_range"
|
android:text="@string/target_range"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
<EditText
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:inputType="numberDecimal"
|
|
||||||
android:width="70dp"
|
|
||||||
android:ems="10"
|
|
||||||
android:id="@+id/careportal_temptarget_low" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:inputType="numberDecimal"
|
|
||||||
android:width="70dp"
|
|
||||||
android:ems="10"
|
|
||||||
android:id="@+id/careportal_temptarget_high" />
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/careportal_newnstreatment_notes_layout"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerHorizontal="true"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/careportal_temptarget_low"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:width="70dp"
|
||||||
|
android:ems="10"
|
||||||
|
android:inputType="numberDecimal" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/careportal_temptarget_high"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:width="70dp"
|
||||||
|
android:ems="10"
|
||||||
|
android:inputType="numberDecimal" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/careportal_newnstreatment_notes_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:width="100dp"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
|
||||||
android:text="@string/careportal_newnstreatment_notes_label"
|
android:text="@string/careportal_newnstreatment_notes_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/careportal_newnstreatment_notes"
|
android:id="@+id/careportal_newnstreatment_notes"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
android:width="200dp" />
|
android:width="200dp" />
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
android:id="@+id/careportal_newnstreatment_eventtime_layout"
|
android:id="@+id/careportal_newnstreatment_eventtime_layout"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="85dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_alignParentBottom="true"
|
||||||
android:padding="10dp"
|
android:layout_alignParentStart="true"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:text="@string/careportal_newnstreatment_eventtime_label"
|
android:text="@string/careportal_newnstreatment_eventtime_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_newnstreatment_eventdate"
|
android:id="@+id/careportal_newnstreatment_eventdate"
|
||||||
|
@ -681,29 +867,12 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
</RelativeLayout>
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="right"
|
|
||||||
android:layout_marginLeft="20dp"
|
|
||||||
android:layout_marginRight="20dp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:padding="10dp">
|
|
||||||
|
|
||||||
<Button
|
<include layout="@layout/mdtp_done_button" />
|
||||||
android:id="@+id/careportal_newnstreatment_ok"
|
|
||||||
style="?android:attr/buttonStyle"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:text="@string/ok"
|
|
||||||
android:textAllCaps="false"
|
|
||||||
android:textSize="20sp" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -18,18 +18,23 @@
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="10dp">
|
android:padding="10dp">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
|
||||||
android:text="@string/treatments_newtreatment_insulinamount_label"
|
android:text="@string/treatments_newtreatment_insulinamount_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_centerInParent="true"
|
||||||
|
android:layout_marginTop="50dp"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
@ -47,12 +52,12 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
android:inputType="numberDecimal"
|
android:inputType="numberDecimal"
|
||||||
android:minWidth="200dp"
|
android:minWidth="100dp"
|
||||||
android:padding="10dp"
|
android:padding="10dp"
|
||||||
android:text=""
|
android:text=""
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
android:gravity="center_horizontal" />
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/treatments_newtreatment_insulinamount_plus"
|
android:id="@+id/treatments_newtreatment_insulinamount_plus"
|
||||||
|
@ -65,19 +70,37 @@
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="2dip"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@color/listdelimiter" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_alignParentStart="true"
|
||||||
android:padding="10dp"
|
android:layout_marginTop="5dp"
|
||||||
android:text="@string/treatments_newtreatment_carbsamount_label"
|
android:text="@string/treatments_newtreatment_carbsamount_label"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal"
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_gravity="center_horizontal">
|
android:layout_marginTop="30dp"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/treatments_newtreatment_carbsamount_minus"
|
android:id="@+id/treatments_newtreatment_carbsamount_minus"
|
||||||
|
@ -94,12 +117,12 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
android:inputType="numberDecimal"
|
android:inputType="numberDecimal"
|
||||||
android:minWidth="200dp"
|
android:minWidth="100dp"
|
||||||
android:padding="10dp"
|
android:padding="10dp"
|
||||||
android:text=""
|
android:text=""
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
android:gravity="center_horizontal" />
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/treatments_newtreatment_carbsamount_plus"
|
android:id="@+id/treatments_newtreatment_carbsamount_plus"
|
||||||
|
@ -111,28 +134,11 @@
|
||||||
android:src="@drawable/ic_action_add"
|
android:src="@drawable/ic_action_add"
|
||||||
android:tint="#ffffff" />
|
android:tint="#ffffff" />
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
</RelativeLayout>
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="20dp"
|
|
||||||
android:layout_marginRight="20dp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:padding="10dp">
|
|
||||||
|
|
||||||
<Button
|
<include layout="@layout/mdtp_done_button" />
|
||||||
android:id="@+id/treatments_newtreatment_deliverbutton"
|
|
||||||
style="?android:attr/buttonStyle"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:text="OK"
|
|
||||||
android:textSize="20sp" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<string name="careportal_newnstreatment_carbs_label">ВХ</string>
|
<string name="careportal_newnstreatment_carbs_label">ВХ</string>
|
||||||
<string name="careportal_newnstreatment_carbtime_label">ВХ след</string>
|
<string name="careportal_newnstreatment_carbtime_label">ВХ след</string>
|
||||||
<string name="careportal_newnstreatment_duration_label">Продължителност</string>
|
<string name="careportal_newnstreatment_duration_label">Продължителност</string>
|
||||||
<string name="careportal_newnstreatment_duration_min">min</string>
|
<string name="careportal_newnstreatment_minutes">min</string>
|
||||||
<string name="careportal_newnstreatment_enteredby_title">Въведено от</string>
|
<string name="careportal_newnstreatment_enteredby_title">Въведено от</string>
|
||||||
<string name="careportal_newnstreatment_eventtime_label">Време</string>
|
<string name="careportal_newnstreatment_eventtime_label">Време</string>
|
||||||
<string name="careportal_newnstreatment_insulin_label">Инсулин</string>
|
<string name="careportal_newnstreatment_insulin_label">Инсулин</string>
|
||||||
|
@ -546,4 +546,5 @@
|
||||||
<string name="suspendloopfor3h">Изключи Loop за 3ч.</string>
|
<string name="suspendloopfor3h">Изключи Loop за 3ч.</string>
|
||||||
<string name="treatments_wizard_bgtrend_label">15min trend</string>
|
<string name="treatments_wizard_bgtrend_label">15min trend</string>
|
||||||
<string name="treatments_wizard_cob_label">COB</string>
|
<string name="treatments_wizard_cob_label">COB</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<string name="careportal_newnstreatment_carbs_label">Sacharidy</string>
|
<string name="careportal_newnstreatment_carbs_label">Sacharidy</string>
|
||||||
<string name="careportal_newnstreatment_carbtime_label">Čas jídla</string>
|
<string name="careportal_newnstreatment_carbtime_label">Čas jídla</string>
|
||||||
<string name="careportal_newnstreatment_duration_label">Trvání</string>
|
<string name="careportal_newnstreatment_duration_label">Trvání</string>
|
||||||
<string name="careportal_newnstreatment_duration_min">min</string>
|
<string name="careportal_newnstreatment_minutes">min</string>
|
||||||
<string name="careportal_newnstreatment_enteredby_title">Zadal</string>
|
<string name="careportal_newnstreatment_enteredby_title">Zadal</string>
|
||||||
<string name="careportal_newnstreatment_eventtime_label">Čas</string>
|
<string name="careportal_newnstreatment_eventtime_label">Čas</string>
|
||||||
<string name="careportal_newnstreatment_insulin_label">Inzulín</string>
|
<string name="careportal_newnstreatment_insulin_label">Inzulín</string>
|
||||||
|
@ -545,4 +545,5 @@
|
||||||
<string name="enablesuperbolus_summary">Povolení superbolusu v kalkulátoru. Nepovolujte, dokud se nenaučíte, co to opravdu dělá. MŮŽE ZPŮSOBIT PŘEDÁVKOVÁNÍ INZULÍNEM PŘI NESPRÁVNÉM POUŽITÍ!</string>
|
<string name="enablesuperbolus_summary">Povolení superbolusu v kalkulátoru. Nepovolujte, dokud se nenaučíte, co to opravdu dělá. MŮŽE ZPŮSOBIT PŘEDÁVKOVÁNÍ INZULÍNEM PŘI NESPRÁVNÉM POUŽITÍ!</string>
|
||||||
<string name="nav_about">O aplikaci</string>
|
<string name="nav_about">O aplikaci</string>
|
||||||
<string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
|
<string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<string name="careportal_cgmsensorstart">CGM Sensor Start</string>
|
<string name="careportal_cgmsensorstart">CGM Sensor Start</string>
|
||||||
<string name="careportal_newnstreatment_absolute_label">Absolut</string>
|
<string name="careportal_newnstreatment_absolute_label">Absolut</string>
|
||||||
<string name="careportal_newnstreatment_carbs_label">Kohlehydrate</string>
|
<string name="careportal_newnstreatment_carbs_label">Kohlehydrate</string>
|
||||||
<string name="careportal_newnstreatment_duration_min">min</string>
|
<string name="careportal_newnstreatment_minutes">min</string>
|
||||||
<string name="careportal_newnstreatment_insulin_label">Insulin</string>
|
<string name="careportal_newnstreatment_insulin_label">Insulin</string>
|
||||||
<string name="careportal_newnstreatment_glucosetype">Glukose-Art</string>
|
<string name="careportal_newnstreatment_glucosetype">Glukose-Art</string>
|
||||||
<string name="careportal_newnstreatment_eventtype">Ereignis-Typ</string>
|
<string name="careportal_newnstreatment_eventtype">Ereignis-Typ</string>
|
||||||
|
@ -360,4 +360,5 @@
|
||||||
<string name="wear_detailedIOB_title">Zeige detailliertes IOB</string>
|
<string name="wear_detailedIOB_title">Zeige detailliertes IOB</string>
|
||||||
<string name="wear_detailedIOB_summary">Trenne IOB in Bolus- und Basal-IOB auf dem Watchface</string>
|
<string name="wear_detailedIOB_summary">Trenne IOB in Bolus- und Basal-IOB auf dem Watchface</string>
|
||||||
<string name="wrongpassword">Falsches Passwort</string>
|
<string name="wrongpassword">Falsches Passwort</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">AndroidAPS</string>
|
|
||||||
<string name="actions_shortname">" "</string>
|
<string name="actions_shortname">" "</string>
|
||||||
<string name="wear_shortname">" "</string>
|
<string name="wear_shortname">" "</string>
|
||||||
<string name="virtualpump_shortname">" "</string>
|
<string name="virtualpump_shortname">" "</string>
|
||||||
|
@ -19,4 +18,5 @@
|
||||||
<string name="configbuilder_shortname">" "</string>
|
<string name="configbuilder_shortname">" "</string>
|
||||||
<string name="circadian_percentage_profile_shortname">" "</string>
|
<string name="circadian_percentage_profile_shortname">" "</string>
|
||||||
<string name="careportal_shortname">" "</string>
|
<string name="careportal_shortname">" "</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
</resources>
|
</resources>
|
|
@ -172,7 +172,7 @@
|
||||||
<string name="careportal_newnstreatment_duration_label">Duración</string>
|
<string name="careportal_newnstreatment_duration_label">Duración</string>
|
||||||
<string name="careportal_newnstreatment_percent_label">Dosis</string>
|
<string name="careportal_newnstreatment_percent_label">Dosis</string>
|
||||||
<string name="careportal_newnstreatment_absolute_label">Absoluto</string>
|
<string name="careportal_newnstreatment_absolute_label">Absoluto</string>
|
||||||
<string name="careportal_newnstreatment_duration_min"> min</string>
|
<string name="careportal_newnstreatment_minutes"> min</string>
|
||||||
<string name="careportal_newnstreatment_notes_label">Notas</string>
|
<string name="careportal_newnstreatment_notes_label">Notas</string>
|
||||||
<string name="careportal_newnstreatment_eventtime_label">Fecha Hora</string>
|
<string name="careportal_newnstreatment_eventtime_label">Fecha Hora</string>
|
||||||
<string name="careportal_newnstreatment_profile_label">Perfil</string>
|
<string name="careportal_newnstreatment_profile_label">Perfil</string>
|
||||||
|
@ -405,4 +405,5 @@
|
||||||
<string name="error_field_must_not_be_empty">Este campo no puede estar vacío</string>
|
<string name="error_field_must_not_be_empty">Este campo no puede estar vacío</string>
|
||||||
<string name="error_phone_not_valid">Número de teléfono inválido</string>
|
<string name="error_phone_not_valid">Número de teléfono inválido</string>
|
||||||
<string name="waitingforpump">Esperando bomba</string>
|
<string name="waitingforpump">Esperando bomba</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
5
app/src/main/res/values-it/strings.xml
Normal file
5
app/src/main/res/values-it/strings.xml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="Glimp">Glimp</string>
|
||||||
|
<string name="it_lang">Italiano</string>
|
||||||
|
</resources>
|
|
@ -174,7 +174,7 @@
|
||||||
<string name="careportal_newnstreatment_duration_label">Duration</string>
|
<string name="careportal_newnstreatment_duration_label">Duration</string>
|
||||||
<string name="careportal_newnstreatment_percent_label">Percent</string>
|
<string name="careportal_newnstreatment_percent_label">Percent</string>
|
||||||
<string name="careportal_newnstreatment_absolute_label">Absolute</string>
|
<string name="careportal_newnstreatment_absolute_label">Absolute</string>
|
||||||
<string name="careportal_newnstreatment_duration_min">min</string>
|
<string name="careportal_newnstreatment_minutes">min</string>
|
||||||
<string name="careportal_newnstreatment_notes_label">Notes</string>
|
<string name="careportal_newnstreatment_notes_label">Notes</string>
|
||||||
<string name="careportal_newnstreatment_eventtime_label">Event time</string>
|
<string name="careportal_newnstreatment_eventtime_label">Event time</string>
|
||||||
<string name="careportal_newnstreatment_profile_label">Profile</string>
|
<string name="careportal_newnstreatment_profile_label">Profile</string>
|
||||||
|
@ -521,4 +521,5 @@
|
||||||
<string name="teenage">청소년</string>
|
<string name="teenage">청소년</string>
|
||||||
<string name="adult">성인</string>
|
<string name="adult">성인</string>
|
||||||
<string name="patientage_summary">안전제한을 설정하기 위해 당뇨인의 나이를 선택하세요</string>
|
<string name="patientage_summary">안전제한을 설정하기 위해 당뇨인의 나이를 선택하세요</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -12,21 +12,23 @@
|
||||||
|
|
||||||
<string-array name="languagesArray">
|
<string-array name="languagesArray">
|
||||||
<item>@string/en_lang</item>
|
<item>@string/en_lang</item>
|
||||||
|
<item>@string/bg_lang</item>
|
||||||
<item>@string/cs_lang</item>
|
<item>@string/cs_lang</item>
|
||||||
<item>@string/de_lang</item>
|
<item>@string/de_lang</item>
|
||||||
<item>@string/bg_lang</item>
|
|
||||||
<item>@string/es_lang</item>
|
<item>@string/es_lang</item>
|
||||||
<item>@string/ko_lang</item>
|
|
||||||
<item>@string/el_lang</item>
|
<item>@string/el_lang</item>
|
||||||
|
<item>@string/it_lang</item>
|
||||||
|
<item>@string/ko_lang</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
<string-array name="languagesValues" translatable="false">
|
<string-array name="languagesValues" translatable="false">
|
||||||
<item>en</item>
|
<item>en</item>
|
||||||
|
<item>bg</item>
|
||||||
<item>cs</item>
|
<item>cs</item>
|
||||||
<item>de</item>
|
<item>de</item>
|
||||||
<item>bg</item>
|
|
||||||
<item>es</item>
|
<item>es</item>
|
||||||
<item>ko</item>
|
|
||||||
<item>el</item>
|
<item>el</item>
|
||||||
|
<item>it</item>
|
||||||
|
<item>ko</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<string-array name="ageArray">
|
<string-array name="ageArray">
|
||||||
|
|
|
@ -184,7 +184,7 @@
|
||||||
<string name="careportal_newnstreatment_duration_label">Duration</string>
|
<string name="careportal_newnstreatment_duration_label">Duration</string>
|
||||||
<string name="careportal_newnstreatment_percent_label">Percent</string>
|
<string name="careportal_newnstreatment_percent_label">Percent</string>
|
||||||
<string name="careportal_newnstreatment_absolute_label">Absolute</string>
|
<string name="careportal_newnstreatment_absolute_label">Absolute</string>
|
||||||
<string name="careportal_newnstreatment_duration_min">min</string>
|
<string name="careportal_newnstreatment_minutes">min</string>
|
||||||
<string name="careportal_newnstreatment_notes_label">Notes</string>
|
<string name="careportal_newnstreatment_notes_label">Notes</string>
|
||||||
<string name="careportal_newnstreatment_eventtime_label">Event time</string>
|
<string name="careportal_newnstreatment_eventtime_label">Event time</string>
|
||||||
<string name="careportal_newnstreatment_profile_label">Profile</string>
|
<string name="careportal_newnstreatment_profile_label">Profile</string>
|
||||||
|
@ -210,6 +210,7 @@
|
||||||
<string name="de_lang">German</string>
|
<string name="de_lang">German</string>
|
||||||
<string name="es_lang">Spanish</string>
|
<string name="es_lang">Spanish</string>
|
||||||
<string name="el_lang">Greek</string>
|
<string name="el_lang">Greek</string>
|
||||||
|
<string name="it_lang">Italian</string>
|
||||||
<string name="openapsma_low_summary">The minimum BG value to be in range.</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_high_summary">The maximum BG value to be in range.</string>
|
||||||
<string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>
|
<string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>
|
||||||
|
|
|
@ -5,7 +5,7 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.3.1'
|
classpath 'com.android.tools.build:gradle:2.3.2'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
Loading…
Reference in a new issue