From 704ad383e9ec87a8c50052205951f582751f3107 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 15 May 2017 21:10:43 +0200
Subject: [PATCH 1/5] careportal layout part1

---
 .../Dialogs/NewNSTreatmentDialog.java         |  10 +-
 .../careportal_newnstreatment_dialog.xml      | 486 +++++++++---------
 2 files changed, 260 insertions(+), 236 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 dc313f994d..09b5ec4f07 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
@@ -85,6 +85,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     Button dateButton;
     Button timeButton;
     Button okButton;
+    Button cancelButton;
 
     TextView bgUnitsView;
     RadioButton meterRadioButton;
@@ -218,8 +219,10 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         dateButton.setOnClickListener(this);
         timeButton.setOnClickListener(this);
 
-        okButton = (Button) view.findViewById(R.id.careportal_newnstreatment_ok);
+        okButton = (Button) view.findViewById(R.id.ok);
         okButton.setOnClickListener(this);
+        cancelButton = (Button) view.findViewById(R.id.cancel);
+        cancelButton.setOnClickListener(this);
 
         // profile
         profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
@@ -359,10 +362,13 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 tpd.dismissOnPause(true);
                 tpd.show(context.getFragmentManager(), "Timepickerdialog");
                 break;
-            case R.id.careportal_newnstreatment_ok:
+            case R.id.ok:
                 createNSTreatment();
                 dismiss();
                 break;
+            case R.id.cancel:
+                dismiss();
+                break;
         }
     }
 
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index 70a4a09eb3..d6c50a6d71 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
@@ -16,74 +17,81 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_bg_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toStartOf="@+id/careportal_newnstreatment_bg_layout"
                     android:text="@string/treatments_wizard_bg_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textStyle="bold" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_bg_minus"
+                <LinearLayout
+                    android:id="@+id/careportal_newnstreatment_bg_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"
+                    android:visibility="visible">
 
-                <EditText
-                    android:id="@+id/careportal_newnstreatment_bginput"
-                    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:textAppearance="?android:attr/textAppearanceLarge" />
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_bg_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" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_bg_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" />
+                    <EditText
+                        android:id="@+id/careportal_newnstreatment_bginput"
+                        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:textAppearance="?android:attr/textAppearanceLarge" />
+
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_bg_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:id="@+id/careportal_newnstreatment_bgunits"
                     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_bg_layout"
                     android:gravity="left"
-                    android:minWidth="40dp"
                     android:paddingLeft="5dp"
                     android:text="mg/dl"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-            </LinearLayout>
+            </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/careportal_newnstreatment_bgsource_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="center_horizontal"
                 android:orientation="horizontal"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <RadioGroup
                     android:layout_width="wrap_content"
@@ -101,8 +109,8 @@
                         android:id="@+id/careportal_newnstreatment_sensor"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/careportal_newnstreatment_sensor"
-                        android:checked="true" />
+                        android:checked="true"
+                        android:text="@string/careportal_newnstreatment_sensor" />
 
                     <RadioButton
                         android:id="@+id/careportal_newnstreatment_other"
@@ -112,237 +120,268 @@
                 </RadioGroup>
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_carbs_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="100dp"
-                    android:padding="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toLeftOf="@+id/careportal_newnstreatment_carbs_layout"
                     android:text="@string/careportal_newnstreatment_carbs_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textStyle="bold" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_carbs_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_carbsinput"
+                <LinearLayout
+                    android:id="@+id/careportal_newnstreatment_carbs_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
                     android:layout_gravity="center_horizontal"
-                    android:width="80dp"
-                    android:gravity="center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:padding="10dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    android:orientation="horizontal"
+                    android:visibility="visible">
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_carbs_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_carbs_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_carbsinput"
+                        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:textAppearance="?android:attr/textAppearanceLarge" />
+
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_carbs_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_toRightOf="@+id/careportal_newnstreatment_carbs_layout"
                     android:gravity="left"
-                    android:minWidth="40dp"
                     android:paddingLeft="5dp"
                     android:text="g"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-            </LinearLayout>
+            </RelativeLayout>
 
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_insulin_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+            <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_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toStartOf="@+id/careportal_newnstreatment_insulin_layout"
                     android:text="@string/careportal_newnstreatment_insulin_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textStyle="bold" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_insulin_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_insulininput"
+                <LinearLayout
+                    android:id="@+id/careportal_newnstreatment_insulin_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
                     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" />
+                    android:orientation="horizontal">
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_insulin_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_insulin_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_insulininput"
+                        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_insulin_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_insulin_layout"
                     android:gravity="left"
-                    android:minWidth="40dp"
                     android:paddingLeft="5dp"
                     android:text="U"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-            </LinearLayout>
+            </RelativeLayout>
 
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_split_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+            <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_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_toStartOf="@+id/careportal_newnstreatment_split_layout"
                     android:text="@string/careportal_newnstreatment_split_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textStyle="bold" />
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_split_minus"
+                <LinearLayout
+                    android:id="@+id/careportal_newnstreatment_split_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"
+                    android:visibility="visible">
+
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_split_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_splitinput"
-                    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_splitinput"
+                        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_split_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_split_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_split_layout"
                     android:gravity="left"
-                    android:minWidth="40dp"
                     android:paddingLeft="5dp"
                     android:text="%"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_duration_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone">
+            </RelativeLayout>
 
-                <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" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_duration_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_durationinput"
+                <LinearLayout
+                    android:id="@+id/careportal_newnstreatment_duration_layout"
                     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" />
+                    android:orientation="horizontal">
 
-                <ImageView
-                    android:id="@+id/careportal_newnstreatment_duration_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" />
+                    <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" />
 
+                    <ImageView
+                        android:id="@+id/careportal_newnstreatment_duration_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_durationinput"
+                        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_duration_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:id="@+id/careportal_newnstreatment_duration_min"
                     android:layout_width="wrap_content"
@@ -353,8 +392,7 @@
                     android:paddingLeft="5dp"
                     android:text="@string/careportal_newnstreatment_duration_min"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
+            </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/careportal_newnstreatment_percent_layout"
@@ -605,21 +643,20 @@
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
                     <EditText
+                        android:id="@+id/careportal_temptarget_low"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:inputType="numberDecimal"
                         android:width="70dp"
                         android:ems="10"
-                        android:id="@+id/careportal_temptarget_low" />
+                        android:inputType="numberDecimal" />
 
                     <EditText
+                        android:id="@+id/careportal_temptarget_high"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:inputType="numberDecimal"
                         android:width="70dp"
                         android:ems="10"
-                        android:id="@+id/careportal_temptarget_high" />
-
+                        android:inputType="numberDecimal" />
 
 
                 </LinearLayout>
@@ -681,29 +718,10 @@
 
             </LinearLayout>
 
-            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <Button
-                    android:id="@+id/careportal_newnstreatment_ok"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="@string/ok"
-                    android:textAllCaps="false"
-                    android:textSize="20sp" />
-
-            </LinearLayout>
+            <include layout="@layout/mdtp_done_button" />
 
         </LinearLayout>
+
     </ScrollView>
 
 </LinearLayout>

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 2/5] 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>

From 6fff6f63a4e8984022d283568b1353d8887d9986 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 16 May 2017 12:09:32 +0200
Subject: [PATCH 3/5] bolus dialog redesign

---
 .../Overview/Dialogs/NewTreatmentDialog.java  |  14 +-
 .../careportal_newnstreatment_dialog.xml      |  10 -
 .../layout/overview_newtreatment_dialog.xml   | 226 +++++++++---------
 3 files changed, 126 insertions(+), 124 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index e97104437d..8144d39ff5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -31,7 +31,8 @@ import info.nightscout.utils.SafeParse;
 
 public class NewTreatmentDialog extends DialogFragment implements OnClickListener {
 
-    Button deliverButton;
+    Button okButton;
+    Button cancelButton;
     TextView insulin;
     TextView carbs;
 
@@ -52,9 +53,11 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.overview_newtreatment_dialog, null, false);
 
-        deliverButton = (Button) view.findViewById(R.id.treatments_newtreatment_deliverbutton);
+        okButton = (Button) view.findViewById(R.id.ok);
+        okButton.setOnClickListener(this);
+        cancelButton = (Button) view.findViewById(R.id.cancel);
+        cancelButton.setOnClickListener(this);
 
-        deliverButton.setOnClickListener(this);
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         insulin = (TextView) view.findViewById(R.id.treatments_newtreatment_insulinamount);
@@ -79,7 +82,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.treatments_newtreatment_deliverbutton:
+            case R.id.ok:
 
                 try {
                     Double insulin = SafeParse.stringToDouble(this.insulin.getText().toString());
@@ -131,6 +134,9 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     e.printStackTrace();
                 }
                 break;
+            case R.id.cancel:
+                dismiss();
+                break;
         }
 
     }
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index f907150f1b..59c43c3cad 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -207,16 +207,6 @@
                     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
diff --git a/app/src/main/res/layout/overview_newtreatment_dialog.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml
index a601f0f425..f0eb7fc4d0 100644
--- a/app/src/main/res/layout/overview_newtreatment_dialog.xml
+++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml
@@ -18,121 +18,127 @@
             android:orientation="vertical"
             android:padding="10dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:padding="10dp"
-                android:text="@string/treatments_newtreatment_insulinamount_label"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/treatments_newtreatment_insulinamount_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/treatments_newtreatment_insulinamount"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:minWidth="200dp"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:gravity="center_horizontal" />
-
-                <ImageView
-                    android:id="@+id/treatments_newtreatment_insulinamount_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_horizontal"
-                android:padding="10dp"
-                android:text="@string/treatments_newtreatment_carbsamount_label"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_gravity="center_horizontal">
-
-                <ImageView
-                    android:id="@+id/treatments_newtreatment_carbsamount_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/treatments_newtreatment_carbsamount"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:minWidth="200dp"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:gravity="center_horizontal" />
-
-                <ImageView
-                    android:id="@+id/treatments_newtreatment_carbsamount_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>
-
-            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:orientation="horizontal"
-                android:padding="10dp">
+                android:layout_height="wrap_content">
 
-                <Button
-                    android:id="@+id/treatments_newtreatment_deliverbutton"
-                    style="?android:attr/buttonStyle"
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="OK"
-                    android:textSize="20sp" />
+                    android:layout_alignParentStart="true"
+                    android:text="@string/treatments_newtreatment_insulinamount_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_centerInParent="true"
+                    android:layout_marginTop="50dp"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/treatments_newtreatment_insulinamount_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/treatments_newtreatment_insulinamount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:minWidth="100dp"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                    <ImageView
+                        android:id="@+id/treatments_newtreatment_insulinamount_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>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/listdelimiter" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/treatments_newtreatment_carbsamount_label"
+                    android:textAppearance="@android:style/TextAppearance.Material.Small"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="30dp"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/treatments_newtreatment_carbsamount_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/treatments_newtreatment_carbsamount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:minWidth="100dp"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                    <ImageView
+                        android:id="@+id/treatments_newtreatment_carbsamount_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>
+
+            </RelativeLayout>
+
+            <include layout="@layout/mdtp_done_button" />
 
 
         </LinearLayout>

From 572e726678d2beb43905b6eb62a08fa8f044b21f Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Tue, 16 May 2017 13:10:02 +0200
Subject: [PATCH 4/5] basal and bolus step in DanaR Fragment

---
 .../plugins/PumpDanaR/DanaRFragment.java      |  7 ++
 .../PumpDanaRKorean/DanaRKoreanFragment.java  |  6 ++
 app/src/main/res/layout/danar_fragment.xml    | 90 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 105 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
index 4aed68baec..c7ae887731 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
@@ -63,6 +63,8 @@ public class DanaRFragment extends Fragment {
     TextView reservoirView;
     TextView iobView;
     TextView firmwareView;
+    TextView basalStepView;
+    TextView bolusStepView;
     Button viewProfileButton;
     Button historyButton;
     Button statsButton;
@@ -109,6 +111,8 @@ public class DanaRFragment extends Fragment {
         viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
         historyButton = (Button) view.findViewById(R.id.danar_history);
         statsButton = (Button) view.findViewById(R.id.danar_stats);
+        basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
+        bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
 
 
         viewProfileButton.setOnClickListener(new View.OnClickListener() {
@@ -239,6 +243,9 @@ public class DanaRFragment extends Fragment {
                     } else {
                         firmwareView.setText("OLD");
                     }
+                    basalStepView.setText("" + pump.basalStep);
+                    bolusStepView.setText("" + pump.bolusStep);
+
                 }
             });
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
index bafe3f63ff..e03fc97b33 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
@@ -60,6 +60,8 @@ public class DanaRKoreanFragment extends Fragment {
     TextView reservoirView;
     TextView iobView;
     TextView firmwareView;
+    TextView basalStepView;
+    TextView bolusStepView;
     Button viewProfileButton;
     Button historyButton;
     Button statsButton;
@@ -106,6 +108,8 @@ public class DanaRKoreanFragment extends Fragment {
         viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
         historyButton = (Button) view.findViewById(R.id.danar_history);
         statsButton = (Button) view.findViewById(R.id.danar_stats);
+        basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
+        bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
 
 
         viewProfileButton.setOnClickListener(new View.OnClickListener() {
@@ -237,6 +241,8 @@ public class DanaRKoreanFragment extends Fragment {
                     } else {
                         firmwareView.setText("OLD");
                     }
+                    basalStepView.setText("" + pump.basalStep);
+                    bolusStepView.setText("" + pump.bolusStep);
                 }
             });
 
diff --git a/app/src/main/res/layout/danar_fragment.xml b/app/src/main/res/layout/danar_fragment.xml
index 6a6b866d0e..82af40b141 100644
--- a/app/src/main/res/layout/danar_fragment.xml
+++ b/app/src/main/res/layout/danar_fragment.xml
@@ -459,6 +459,96 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/basal_step"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/danar_basalstep"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/bolus_step"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/danar_bolusstep"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3cc46c0ae..d6f39ac6d6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -609,4 +609,6 @@
     <string name="ns_noupload_summary">All data sent to NS are dropped. AAPS is connected to NS but no change in NS is done</string>
     <string name="key_ns_upload_only" translatable="false">ns_upload_only</string>
     <string name="key_ns_noupload" translatable="false">ns_noupload</string>
+    <string name="basal_step">Basal Step</string>
+    <string name="bolus_step">Bolus Step</string>
 </resources>

From 86c975e9d6d868c6f3da9bc7c9de75b66d06d87b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 16 May 2017 13:39:24 +0200
Subject: [PATCH 5/5] Add Italian language

---
 app/src/main/res/values-bg/strings.xml |  1 +
 app/src/main/res/values-cs/strings.xml |  1 +
 app/src/main/res/values-de/strings.xml |  1 +
 app/src/main/res/values-el/strings.xml |  2 +-
 app/src/main/res/values-es/strings.xml |  1 +
 app/src/main/res/values-it/strings.xml |  5 +++++
 app/src/main/res/values-ko/strings.xml |  1 +
 app/src/main/res/values/arrays.xml     | 10 ++++++----
 app/src/main/res/values/strings.xml    |  1 +
 9 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/values-it/strings.xml

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 180b24c2be..72c39833b0 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -546,4 +546,5 @@
     <string name="suspendloopfor3h">Изключи Loop за 3ч.</string>
     <string name="treatments_wizard_bgtrend_label">15min trend</string>
     <string name="treatments_wizard_cob_label">COB</string>
+    <string name="it_lang">Italian</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d7818e2c68..09f197227d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -545,4 +545,5 @@
     <string name="enablesuperbolus_summary">Povolení superbolusu v kalkulátoru. Nepovolujte, dokud se nenaučíte, co to opravdu dělá. MŮŽE ZPŮSOBIT PŘEDÁVKOVÁNÍ INZULÍNEM PŘI NESPRÁVNÉM POUŽITÍ!</string>
     <string name="nav_about">O aplikaci</string>
     <string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
+    <string name="it_lang">Italian</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8320ef71a5..7d4cf11f31 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -360,4 +360,5 @@
     <string name="wear_detailedIOB_title">Zeige detailliertes IOB</string>
     <string name="wear_detailedIOB_summary">Trenne IOB in Bolus- und Basal-IOB auf dem Watchface</string>
     <string name="wrongpassword">Falsches Passwort</string>
+    <string name="it_lang">Italian</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e4c953dbf2..e146ba4571 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">AndroidAPS</string>
     <string name="actions_shortname">" "</string>
     <string name="wear_shortname">" "</string>
     <string name="virtualpump_shortname">" "</string>
@@ -19,4 +18,5 @@
     <string name="configbuilder_shortname">" "</string>
     <string name="circadian_percentage_profile_shortname">" "</string>
     <string name="careportal_shortname">" "</string>
+    <string name="it_lang">Italian</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 99af57983a..842c39a0ee 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -405,4 +405,5 @@
     <string name="error_field_must_not_be_empty">Este campo no puede estar vacío</string>
     <string name="error_phone_not_valid">Número de teléfono inválido</string>
     <string name="waitingforpump">Esperando bomba</string>
+    <string name="it_lang">Italian</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000000..110b1565cc
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="Glimp">Glimp</string>
+    <string name="it_lang">Italiano</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 33201d3c24..2db6ee8087 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -521,4 +521,5 @@
     <string name="teenage">청소년</string>
     <string name="adult">성인</string>
     <string name="patientage_summary">안전제한을 설정하기 위해 당뇨인의 나이를 선택하세요</string>
+    <string name="it_lang">Italian</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index bd89f7efc2..96f7dca776 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -12,21 +12,23 @@
 
     <string-array name="languagesArray">
         <item>@string/en_lang</item>
+        <item>@string/bg_lang</item>
         <item>@string/cs_lang</item>
         <item>@string/de_lang</item>
-        <item>@string/bg_lang</item>
         <item>@string/es_lang</item>
-        <item>@string/ko_lang</item>
         <item>@string/el_lang</item>
+        <item>@string/it_lang</item>
+        <item>@string/ko_lang</item>
     </string-array>
     <string-array name="languagesValues" translatable="false">
         <item>en</item>
+        <item>bg</item>
         <item>cs</item>
         <item>de</item>
-        <item>bg</item>
         <item>es</item>
-        <item>ko</item>
         <item>el</item>
+        <item>it</item>
+        <item>ko</item>
     </string-array>
 
     <string-array name="ageArray">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 264775dfc3..a2811f7259 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -210,6 +210,7 @@
     <string name="de_lang">German</string>
     <string name="es_lang">Spanish</string>
     <string name="el_lang">Greek</string>
+    <string name="it_lang">Italian</string>
     <string name="openapsma_low_summary">The minimum BG value to be in range.</string>
     <string name="openapsma_high_summary">The maximum BG value to be in range.</string>
     <string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>