From 4201709e2a453914bda877c6b21cf69c88f933c5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 16 May 2017 11:47:33 +0200
Subject: [PATCH] finish careportal dialog redesign

---
 .../Dialogs/NewNSTreatmentDialog.java         |  40 +-
 .../careportal_newnstreatment_dialog.xml      | 659 +++++++++++-------
 app/src/main/res/values-bg/strings.xml        |   2 +-
 app/src/main/res/values-cs/strings.xml        |   2 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values-ko/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 8 files changed, 437 insertions(+), 274 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index 09b5ec4f07..9c89fdd948 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -21,6 +21,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
+import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -71,16 +72,16 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     NSProfile profile;
     String units;
 
-    LinearLayout layoutBg;
+    RelativeLayout layoutBg;
     LinearLayout layoutBgSource;
-    LinearLayout layoutInsulin;
-    LinearLayout layoutCarbs;
-    LinearLayout layoutSplit;
-    LinearLayout layoutDuration;
-    LinearLayout layoutPercent;
-    LinearLayout layoutAbsolute;
-    LinearLayout layoutCarbTime;
-    LinearLayout layoutProfile;
+    RelativeLayout layoutInsulin;
+    RelativeLayout layoutCarbs;
+    RelativeLayout layoutSplit;
+    RelativeLayout layoutDuration;
+    RelativeLayout layoutPercent;
+    RelativeLayout layoutAbsolute;
+    RelativeLayout layoutCarbTime;
+    RelativeLayout layoutProfile;
     LinearLayout layoutTempTarget;
     Button dateButton;
     Button timeButton;
@@ -143,18 +144,19 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         getDialog().setTitle(getString(options.eventName));
+        setStyle(DialogFragment.STYLE_NORMAL, getTheme());
         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);
-        layoutInsulin = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_insulin_layout);
-        layoutCarbs = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_carbs_layout);
-        layoutSplit = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_split_layout);
-        layoutDuration = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_duration_layout);
-        layoutPercent = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
-        layoutAbsolute = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
-        layoutCarbTime = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_carbtime_layout);
-        layoutProfile = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_profile_layout);
+        layoutInsulin = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_insulin_layout);
+        layoutCarbs = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_carbs_layout);
+        layoutSplit = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_split_layout);
+        layoutDuration = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_duration_layout);
+        layoutPercent = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_percent_layout);
+        layoutAbsolute = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
+        layoutCarbTime = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_carbtime_layout);
+        layoutProfile = (RelativeLayout) view.findViewById(R.id.careportal_newnstreatment_profile_layout);
         layoutTempTarget = (LinearLayout) view.findViewById(R.id.careportal_newnstreatment_temptarget_layout);
 
         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);
         else layout.setVisibility(View.GONE);
     }
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index d6c50a6d71..f907150f1b 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -18,26 +18,25 @@
             android:orientation="vertical">
 
             <RelativeLayout
+                android:id="@+id/careportal_newnstreatment_bg_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_alignParentStart="true"
                     android:layout_marginRight="10dp"
-                    android:layout_toStartOf="@+id/careportal_newnstreatment_bg_layout"
                     android:text="@string/treatments_wizard_bg_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
                 <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_bg_layout"
+                    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"
-                    android:visibility="visible">
+                    android:orientation="horizontal">
 
                     <ImageView
                         android:id="@+id/careportal_newnstreatment_bg_minus"
@@ -77,9 +76,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     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:paddingLeft="5dp"
+                    android:paddingLeft="20dp"
                     android:text="mg/dl"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -87,15 +86,15 @@
 
             <LinearLayout
                 android:id="@+id/careportal_newnstreatment_bgsource_layout"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="visible">
+                android:orientation="vertical">
 
                 <RadioGroup
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
                     android:orientation="horizontal">
 
                     <RadioButton
@@ -118,30 +117,40 @@
                         android:layout_height="wrap_content"
                         android:text="@string/careportal_newnstreatment_other" />
                 </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>
 
             <RelativeLayout
+                android:id="@+id/careportal_newnstreatment_carbs_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_alignParentStart="true"
                     android:layout_marginRight="10dp"
-                    android:layout_toLeftOf="@+id/careportal_newnstreatment_carbs_layout"
-                    android:text="@string/careportal_newnstreatment_carbs_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:text="@string/treatments_wizard_carbs_label"
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
                 <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_carbs_layout"
+                    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:orientation="horizontal"
-                    android:visibility="visible">
+                    android:orientation="horizontal">
 
                     <ImageView
                         android:id="@+id/careportal_newnstreatment_carbs_minus"
@@ -182,30 +191,50 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     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:paddingLeft="5dp"
+                    android:paddingLeft="20dp"
                     android:text="g"
                     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
+                android:id="@+id/careportal_newnstreatment_insulin_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_alignParentStart="true"
                     android:layout_marginRight="10dp"
-                    android:layout_toStartOf="@+id/careportal_newnstreatment_insulin_layout"
                     android:text="@string/careportal_newnstreatment_insulin_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
                 <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_insulin_layout"
+                    android:id="@+id/careportal_newnstreatment_insulin_data_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
@@ -252,35 +281,44 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     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:paddingLeft="5dp"
+                    android:paddingLeft="20dp"
                     android:text="U"
                     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_split_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_alignParentStart="true"
                     android:layout_marginRight="10dp"
-                    android:layout_toStartOf="@+id/careportal_newnstreatment_split_layout"
                     android:text="@string/careportal_newnstreatment_split_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
                 <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_split_layout"
+                    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"
-                    android:visibility="visible">
+                    android:orientation="horizontal">
 
                     <ImageView
                         android:id="@+id/careportal_newnstreatment_split_minus"
@@ -321,32 +359,45 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     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:paddingLeft="5dp"
+                    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">
 
-                <LinearLayout
-                    android:id="@+id/careportal_newnstreatment_duration_layout"
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal">
+                    android:layout_alignParentStart="true"
+                    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"
-                        android:layout_height="wrap_content"
-                        android:width="100dp"
-                        android:padding="10dp"
-                        android:text="@string/careportal_newnstreatment_duration_label"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <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
                         android:id="@+id/careportal_newnstreatment_duration_minus"
@@ -382,341 +433,451 @@
                         android:tint="#ffffff" />
 
                 </LinearLayout>
+
                 <TextView
                     android:id="@+id/careportal_newnstreatment_duration_min"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
                     android:layout_gravity="center_vertical"
+                    android:layout_toEndOf="@+id/careportal_newnstreatment_duration_data_layout"
                     android:gravity="left"
-                    android:minWidth="40dp"
-                    android:paddingLeft="5dp"
-                    android:text="@string/careportal_newnstreatment_duration_min"
+                    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>
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/careportal_newnstreatment_percent_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginRight="10dp"
                     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_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@drawable/circle"
-                    android:backgroundTint="#ffffff"
-                    android:src="@drawable/ic_action_minus"
-                    android:tint="#ffffff" />
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        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
-                    android:id="@+id/careportal_newnstreatment_percentinput"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="80dp"
-                    android:gravity="center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    <EditText
+                        android:id="@+id/careportal_newnstreatment_percentinput"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:width="80dp"
+                        android:gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_percent_plus"
-                    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_add"
-                    android:tint="#ffffff" />
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_percent_plus"
+                        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_add"
+                        android:tint="#ffffff" />
+
+                </LinearLayout>
 
                 <TextView
                     android:layout_width="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:minWidth="40dp"
-                    android:paddingLeft="5dp"
+                    android:paddingLeft="20dp"
                     android:text="%"
                     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:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginRight="10dp"
                     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_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@drawable/circle"
-                    android:backgroundTint="#ffffff"
-                    android:src="@drawable/ic_action_minus"
-                    android:tint="#ffffff" />
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        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
-                    android:id="@+id/careportal_newnstreatment_absoluteinput"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="80dp"
-                    android:gravity="center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    <EditText
+                        android:id="@+id/careportal_newnstreatment_absoluteinput"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:width="80dp"
+                        android:gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_absolute_plus"
-                    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_add"
-                    android:tint="#ffffff" />
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_absolute_plus"
+                        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_add"
+                        android:tint="#ffffff" />
+
+                </LinearLayout>
 
                 <TextView
                     android:layout_width="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:minWidth="40dp"
-                    android:paddingLeft="5dp"
+                    android:paddingLeft="20dp"
                     android:text="U/h"
                     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:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginRight="10dp"
                     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_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@drawable/circle"
-                    android:backgroundTint="#ffffff"
-                    android:src="@drawable/ic_action_minus"
-                    android:tint="#ffffff" />
+                    android:layout_centerInParent="true"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        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
-                    android:id="@+id/careportal_newnstreatment_carbtimeinput"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="80dp"
-                    android:gravity="center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    <EditText
+                        android:id="@+id/careportal_newnstreatment_carbtimeinput"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:width="80dp"
+                        android:gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_carbtime_plus"
-                    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_add"
-                    android:tint="#ffffff" />
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_carbtime_plus"
+                        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_add"
+                        android:tint="#ffffff" />
+
+                </LinearLayout>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
                     android:layout_gravity="center_vertical"
+                    android:layout_toEndOf="@+id/careportal_newnstreatment_carbtime_data_layout"
                     android:gravity="left"
-                    android:minWidth="40dp"
-                    android:paddingLeft="5dp"
-                    android:text="min"
+                    android:paddingLeft="20dp"
+                    android:text="@string/careportal_newnstreatment_minutes"
                     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:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginRight="10dp"
                     android:text="@string/careportal_newnstreatment_profile_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textStyle="bold" />
+
 
                 <Spinner
                     android:id="@+id/careportal_newnstreatment_profile"
                     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
                 android:id="@+id/careportal_newnstreatment_temptarget_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="vertical"
-                android:visibility="visible">
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal">
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:width="100dp"
-                        android:padding="10dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginRight="10dp"
                         android:text="@string/reason"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"
+                        android:textStyle="bold" />
 
                     <Spinner
                         android:id="@+id/careportal_newnstreatment_temptarget_reason"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true" />
 
-                </LinearLayout>
+                </RelativeLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal">
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:width="100dp"
-                        android:padding="10dp"
+                        android:layout_alignParentStart="true"
                         android:text="@string/target_range"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"
+                        android:textStyle="bold" />
 
-                    <EditText
-                        android:id="@+id/careportal_temptarget_low"
-                        android:layout_width="match_parent"
+                    <LinearLayout
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:width="70dp"
-                        android:ems="10"
-                        android:inputType="numberDecimal" />
+                        android:layout_centerHorizontal="true"
+                        android:orientation="horizontal">
 
-                    <EditText
-                        android:id="@+id/careportal_temptarget_high"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:width="70dp"
-                        android:ems="10"
-                        android:inputType="numberDecimal" />
+                        <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>
+                    </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
+            <RelativeLayout
                 android:id="@+id/careportal_newnstreatment_notes_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_alignParentStart="true"
                     android:text="@string/careportal_newnstreatment_notes_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textStyle="bold" />
 
                 <EditText
                     android:id="@+id/careportal_newnstreatment_notes"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
                     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:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <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_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:width="50dp"
-                    android:text="" />
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentStart="true"
+                    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" />
 
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 774d79ce5e..180b24c2be 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -26,7 +26,7 @@
     <string name="careportal_newnstreatment_carbs_label">ВХ</string>
     <string name="careportal_newnstreatment_carbtime_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_eventtime_label">Време</string>
     <string name="careportal_newnstreatment_insulin_label">Инсулин</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 650c27d120..d7818e2c68 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,7 +26,7 @@
     <string name="careportal_newnstreatment_carbs_label">Sacharidy</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_min">min</string>
+    <string name="careportal_newnstreatment_minutes">min</string>
     <string name="careportal_newnstreatment_enteredby_title">Zadal</string>
     <string name="careportal_newnstreatment_eventtime_label">Čas</string>
     <string name="careportal_newnstreatment_insulin_label">Inzulín</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6cbc49804f..8320ef71a5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -33,7 +33,7 @@
     <string name="careportal_cgmsensorstart">CGM Sensor Start</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</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_glucosetype">Glukose-Art</string>
     <string name="careportal_newnstreatment_eventtype">Ereignis-Typ</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ea92edb2a3..99af57983a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -172,7 +172,7 @@
     <string name="careportal_newnstreatment_duration_label">Duración</string>
     <string name="careportal_newnstreatment_percent_label">Dosis</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_eventtime_label">Fecha Hora</string>
     <string name="careportal_newnstreatment_profile_label">Perfil</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 8448d5c7fc..33201d3c24 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -174,7 +174,7 @@
     <string name="careportal_newnstreatment_duration_label">Duration</string>
     <string name="careportal_newnstreatment_percent_label">Percent</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_eventtime_label">Event time</string>
     <string name="careportal_newnstreatment_profile_label">Profile</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3cc46c0ae..bb288926df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -184,7 +184,7 @@
     <string name="careportal_newnstreatment_duration_label">Duration</string>
     <string name="careportal_newnstreatment_percent_label">Percent</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_eventtime_label">Event time</string>
     <string name="careportal_newnstreatment_profile_label">Profile</string>