caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

finish careportal dialog redesign

Browse source
This commit is contained in:
Milos Kozak 2017-05-16 11:47:33 +02:00
parent 54758d08d8
commit 4201709e2a
8 changed files with 437 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
View file

@ -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,16 +72,16 @@ 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;
@ -143,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);
@ -372,7 +374,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
} }
} }
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);
} }

659
app/src/main/res/layout/careportal_newnstreatment_dialog.xml
View file

@ -18,26 +18,25 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/careportal_newnstreatment_bg_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> 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_centerVertical="true" android:layout_alignParentStart="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_toStartOf="@+id/careportal_newnstreatment_bg_layout"
android:text="@string/treatments_wizard_bg_label" android:text="@string/treatments_wizard_bg_label"
android:textAppearance="@android:style/TextAppearance.Material.Medium" android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/careportal_newnstreatment_bg_layout" android:id="@+id/careportal_newnstreatment_bg_data_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:orientation="horizontal" android:orientation="horizontal">
android:visibility="visible">
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_bg_minus" android:id="@+id/careportal_newnstreatment_bg_minus"
@ -77,9 +76,9 @@
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_centerVertical="true"
android:layout_toEndOf="@+id/careportal_newnstreatment_bg_layout" android:layout_toEndOf="@+id/careportal_newnstreatment_bg_data_layout"
android:gravity="left" android:gravity="left"
android:paddingLeft="5dp" android:paddingLeft="20dp"
android:text="mg/dl" android:text="mg/dl"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -87,15 +86,15 @@
<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="center_horizontal" android:layout_gravity="center_horizontal"
android:orientation="horizontal" android:orientation="vertical">
android:visibility="visible">
<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
@ -118,30 +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>
<RelativeLayout <RelativeLayout
android:id="@+id/careportal_newnstreatment_carbs_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> 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_centerVertical="true" android:layout_alignParentStart="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/careportal_newnstreatment_carbs_layout" android:text="@string/treatments_wizard_carbs_label"
android:text="@string/careportal_newnstreatment_carbs_label" android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/careportal_newnstreatment_carbs_layout" android:id="@+id/careportal_newnstreatment_carbs_data_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal">
android:visibility="visible">
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_carbs_minus" android:id="@+id/careportal_newnstreatment_carbs_minus"
@ -182,30 +191,50 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_toRightOf="@+id/careportal_newnstreatment_carbs_layout" android:layout_toRightOf="@+id/careportal_newnstreatment_carbs_data_layout"
android:gravity="left" android:gravity="left"
android:paddingLeft="5dp" android:paddingLeft="20dp"
android:text="g" android:text="g"
android:textAppearance="?android:attr/textAppearanceSmall" /> 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" />
<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>
<RelativeLayout <RelativeLayout
android:id="@+id/careportal_newnstreatment_insulin_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> 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_centerVertical="true" android:layout_alignParentStart="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_toStartOf="@+id/careportal_newnstreatment_insulin_layout"
android:text="@string/careportal_newnstreatment_insulin_label" android:text="@string/careportal_newnstreatment_insulin_label"
android:textAppearance="@android:style/TextAppearance.Material.Medium" android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/careportal_newnstreatment_insulin_layout" android:id="@+id/careportal_newnstreatment_insulin_data_layout"
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:layout_centerHorizontal="true"
@ -252,35 +281,44 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_toEndOf="@+id/careportal_newnstreatment_insulin_layout" android:layout_toEndOf="@+id/careportal_newnstreatment_insulin_data_layout"
android:gravity="left" android:gravity="left"
android:paddingLeft="5dp" android:paddingLeft="20dp"
android:text="U" android:text="U"
android:textAppearance="?android:attr/textAppearanceSmall" /> 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>
<RelativeLayout <RelativeLayout
android:id="@+id/careportal_newnstreatment_split_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> 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_centerVertical="true" android:layout_alignParentStart="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_toStartOf="@+id/careportal_newnstreatment_split_layout"
android:text="@string/careportal_newnstreatment_split_label" android:text="@string/careportal_newnstreatment_split_label"
android:textAppearance="@android:style/TextAppearance.Material.Medium" android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/careportal_newnstreatment_split_layout" android:id="@+id/careportal_newnstreatment_split_data_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:orientation="horizontal" android:orientation="horizontal">
android:visibility="visible">
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_split_minus" android:id="@+id/careportal_newnstreatment_split_minus"
@ -321,32 +359,45 @@
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_centerVertical="true"
android:layout_toEndOf="@+id/careportal_newnstreatment_split_layout" android:layout_toEndOf="@+id/careportal_newnstreatment_split_data_layout"
android:gravity="left" android:gravity="left"
android:paddingLeft="5dp" android:paddingLeft="20dp"
android:text="%" android:text="%"
android:textAppearance="?android:attr/textAppearanceSmall" /> 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>
<RelativeLayout <RelativeLayout
android:id="@+id/careportal_newnstreatment_duration_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<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_alignParentStart="true"
android:orientation="horizontal"> android:layout_marginRight="10dp"
android:text="@string/careportal_newnstreatment_duration_label"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content" <LinearLayout
android:layout_height="wrap_content" android:id="@+id/careportal_newnstreatment_duration_data_layout"
android:width="100dp" android:layout_width="wrap_content"
android:padding="10dp" android:layout_height="wrap_content"
android:text="@string/careportal_newnstreatment_duration_label" android:layout_centerInParent="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_duration_minus" android:id="@+id/careportal_newnstreatment_duration_minus"
@ -382,341 +433,451 @@
android:tint="#ffffff" /> android:tint="#ffffff" />
</LinearLayout> </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" />
<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>
<LinearLayout <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" />
<ImageView
android:id="@+id/careportal_newnstreatment_percent_minus" <LinearLayout
android:id="@+id/careportal_newnstreatment_percent_data_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" android:layout_centerInParent="true"
android:background="@drawable/circle" android:orientation="horizontal">
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_minus" <ImageView
android:tint="#ffffff" /> android:id="@+id/careportal_newnstreatment_percent_minus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/circle"
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_minus"
android:tint="#ffffff" />
<EditText <EditText
android:id="@+id/careportal_newnstreatment_percentinput" android:id="@+id/careportal_newnstreatment_percentinput"
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:width="80dp" android:width="80dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:padding="10dp" android:padding="10dp"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_percent_plus" android:id="@+id/careportal_newnstreatment_percent_plus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="#ffffff"
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_gravity="center_vertical" android:layout_centerVertical="true"
android:layout_toEndOf="@+id/careportal_newnstreatment_percent_data_layout"
android:gravity="left" android:gravity="left"
android:minWidth="40dp" android:paddingLeft="20dp"
android:paddingLeft="5dp"
android:text="%" android:text="%"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</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_absolute_layout" android:id="@+id/careportal_newnstreatment_absolute_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_absolute_label" android:text="@string/careportal_newnstreatment_absolute_label"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" />
<ImageView
android:id="@+id/careportal_newnstreatment_absolute_minus" <LinearLayout
android:id="@+id/careportal_newnstreatment_absolute_data_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" android:layout_centerInParent="true"
android:background="@drawable/circle" android:orientation="horizontal">
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_minus" <ImageView
android:tint="#ffffff" /> android:id="@+id/careportal_newnstreatment_absolute_minus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/circle"
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_minus"
android:tint="#ffffff" />
<EditText <EditText
android:id="@+id/careportal_newnstreatment_absoluteinput" android:id="@+id/careportal_newnstreatment_absoluteinput"
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:width="80dp" android:width="80dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:padding="10dp" android:padding="10dp"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_absolute_plus" android:id="@+id/careportal_newnstreatment_absolute_plus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="#ffffff"
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_gravity="center_vertical" android:layout_centerVertical="true"
android:layout_toEndOf="@+id/careportal_newnstreatment_absolute_data_layout"
android:gravity="left" android:gravity="left"
android:minWidth="40dp" android:paddingLeft="20dp"
android:paddingLeft="5dp"
android:text="U/h" android:text="U/h"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</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_carbtime_layout" android:id="@+id/careportal_newnstreatment_carbtime_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_carbtime_label" android:text="@string/careportal_newnstreatment_carbtime_label"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" />
<ImageView
android:id="@+id/careportal_newnstreatment_carbtime_minus" <LinearLayout
android:id="@+id/careportal_newnstreatment_carbtime_data_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" android:layout_centerInParent="true"
android:background="@drawable/circle" android:orientation="horizontal">
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_minus" <ImageView
android:tint="#ffffff" /> android:id="@+id/careportal_newnstreatment_carbtime_minus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/circle"
android:backgroundTint="#ffffff"
android:src="@drawable/ic_action_minus"
android:tint="#ffffff" />
<EditText <EditText
android:id="@+id/careportal_newnstreatment_carbtimeinput" android:id="@+id/careportal_newnstreatment_carbtimeinput"
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:width="80dp" android:width="80dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:padding="10dp" android:padding="10dp"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<ImageView <ImageView
android:id="@+id/careportal_newnstreatment_carbtime_plus" android:id="@+id/careportal_newnstreatment_carbtime_plus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="#ffffff" android:backgroundTint="#ffffff"
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_carbtime_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="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_profile_layout" android:id="@+id/careportal_newnstreatment_profile_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_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_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_centerHorizontal="true" />
</LinearLayout> </RelativeLayout>
<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: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 <LinearLayout
android:id="@+id/careportal_temptarget_low" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:width="70dp" android:layout_centerHorizontal="true"
android:ems="10" android:orientation="horizontal">
android:inputType="numberDecimal" />
<EditText <EditText
android:id="@+id/careportal_temptarget_high" android:id="@+id/careportal_temptarget_low"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:width="70dp" android:width="70dp"
android:ems="10" android:ems="10"
android:inputType="numberDecimal" /> 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> </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> </LinearLayout>
<LinearLayout <RelativeLayout
android:id="@+id/careportal_newnstreatment_notes_layout" android:id="@+id/careportal_newnstreatment_notes_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="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_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="10dp"
android:text="@string/careportal_newnstreatment_eventtime_label"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
android:id="@+id/careportal_newnstreatment_eventdate"
android:layout_width="106dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:width="120dp"
android:text="" />
<Button
android:id="@+id/careportal_newnstreatment_eventtime"
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_alignParentBottom="true"
android:width="50dp" android:layout_alignParentStart="true"
android:text="" /> android:paddingBottom="5dp"
android:text="@string/careportal_newnstreatment_eventtime_label"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="bold" />
</LinearLayout> <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:orientation="horizontal">
<Button
android:id="@+id/careportal_newnstreatment_eventdate"
android:layout_width="106dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:width="120dp"
android:text="" />
<Button
android:id="@+id/careportal_newnstreatment_eventtime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:width="50dp"
android:text="" />
</LinearLayout>
</RelativeLayout>
<include layout="@layout/mdtp_done_button" /> <include layout="@layout/mdtp_done_button" />

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>

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

@ -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>